Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
b52ac3b0
Commit
b52ac3b0
authored
Dec 20, 2016
by
Browse files
tweak mesh object
parent
4db0a1f9
Changes
5
Hide whitespace changes
Inline
Side-by-side
library/NekMeshUtils/CADSystem/ProcessLoadCAD.cpp
View file @
b52ac3b0
...
...
@@ -59,18 +59,16 @@ ProcessLoadCAD::~ProcessLoadCAD()
void
ProcessLoadCAD
::
Process
()
{
m_mesh
->
m_CADId
=
m_config
[
"filename"
].
as
<
string
>
();
string
name
=
m_config
[
"filename"
].
as
<
string
>
();
if
(
m_mesh
->
m_verbose
)
{
cout
<<
"Loading CAD for "
<<
m_mesh
->
m_CADId
<<
endl
;
cout
<<
"Loading CAD for "
<<
name
<<
endl
;
}
m_mesh
->
m_cad
=
GetEngineFactory
().
CreateInstance
(
"oce"
,
m_mesh
->
m_CADId
);
m_mesh
->
m_cad
=
GetEngineFactory
().
CreateInstance
(
"oce"
,
name
);
ASSERTL0
(
m_mesh
->
m_cad
->
LoadCAD
(),
"Failed to load CAD"
);
m_mesh
->
m_hasCAD
=
true
;
if
(
m_mesh
->
m_verbose
)
{
m_mesh
->
m_cad
->
Report
();
...
...
library/NekMeshUtils/MeshElements/Mesh.h
View file @
b52ac3b0
...
...
@@ -38,7 +38,7 @@
#include <NekMeshUtils/NekMeshUtilsDeclspec.h>
#include <NekMeshUtils/MeshElements/Element.h>
#include <NekMeshUtils/MeshElements/Composite.h>
#include <NekMeshUtils/MeshElements/Composite.h>
namespace
Nektar
{
...
...
@@ -127,12 +127,9 @@ public:
std
::
set
<
std
::
pair
<
int
,
int
>
>
m_spherigonSurfs
;
/// List of face labels for composite annotation
std
::
map
<
int
,
std
::
string
>
m_faceLabels
;
/// Whether the mesh has CAD
bool
m_hasCAD
;
/// CAD file ID
std
::
string
m_CADId
;
/// CAD system pointer, if there is no cad its empty
CADSystemSharedPtr
m_cad
;
/// Octree system pointer, if there is no octree its empty
OctreeSharedPtr
m_octree
;
...
...
utilities/NekMesh/InputModules/InputGmsh.cpp
View file @
b52ac3b0
...
...
@@ -720,7 +720,6 @@ void InputGmsh::Process()
// Open the file stream.
OpenStream
();
m_mesh
->
m_hasCAD
=
false
;
m_mesh
->
m_expDim
=
0
;
m_mesh
->
m_spaceDim
=
0
;
string
line
;
...
...
utilities/NekMesh/InputModules/InputNekpp.cpp
View file @
b52ac3b0
...
...
@@ -346,13 +346,11 @@ void InputNekpp::Process()
// set up composite labels if they exist
m_mesh
->
m_faceLabels
=
graph
->
GetCompositesLabels
();
ProcessEdges
(
false
);
ProcessFaces
(
false
);
ProcessComposites
();
m_mesh
->
m_hasCAD
=
false
;
}
}
}
utilities/NekMesh/ProcessModules/ProcessVarOpti/PreProcessing.cpp
View file @
b52ac3b0
...
...
@@ -176,7 +176,7 @@ vector<vector<NodeSharedPtr> > ProcessVarOpti::GetColouredNodes(vector<ElUtilSha
//this figures out the dirclet nodes and colors the others into paralell sets
NodeSet
boundaryNodes
;
if
(
!
m_mesh
->
m_
hasCAD
)
if
(
!
m_mesh
->
m_
cad
)
{
switch
(
m_mesh
->
m_spaceDim
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment