Commit b52ac3b0 authored by Michael Turner's avatar Michael Turner

tweak mesh object

parent 4db0a1f9
......@@ -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();
......
......@@ -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;
......
......@@ -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;
......
......@@ -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;
}
}
}
......@@ -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)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment