Commit 7e46cc56 authored by Michael Turner's avatar Michael Turner
Browse files

disable cadio becasue it doesnt work anyway

parent dd73223c
......@@ -40,10 +40,6 @@
#include <NekMeshUtils/MeshElements/Element.h>
#include <NekMeshUtils/MeshElements/Composite.h>
#ifdef NEKTAR_USE_MESHGEN
#include <NekMeshUtils/CADSystem/CADSystem.h>
#endif
namespace Nektar
{
namespace NekMeshUtils
......
......@@ -194,14 +194,7 @@ void Module::ProcessEdges(bool ReprocessEdges)
}
}
#ifdef NEKTAR_USE_MESHGEN
if(ed->onCurve)
{
e2->onCurve = ed->onCurve;
e2->CADCurveId = ed->CADCurveId;
e2->CADCurve = ed->CADCurve;
}
#endif
e2->m_parentCAD = ed->m_parentCAD;
// Update edge to element map.
e2->m_elLink.push_back(
......@@ -323,15 +316,13 @@ void Module::ProcessFaces(bool ReprocessFaces)
elmt->SetFaceLink(*it);
//Im not sure why but this little bit of code breaks the high-order
//surface generator. M.T 31/8/16
// Set edges/vertices
/*for (int j = 0; j < elmt->GetVertexCount(); ++j)
for (int j = 0; j < elmt->GetVertexCount(); ++j)
{
elmt->SetVertex(j, (*it)->m_vertexList[j], false);
//elmt->SetEdge(j, (*it)->m_edgeList[j], false);
elmt->SetEdge(j, (*it)->m_edgeList[j], false);
}
#ifdef NEKTAR_USE_MESHGEN
EdgeSet tmp(edgeList.begin(),edgeList.end());
for (int j = 0; j < elmt->GetEdgeCount(); ++j)
......@@ -340,26 +331,20 @@ void Module::ProcessFaces(bool ReprocessFaces)
EdgeSet::iterator f = tmp.find(e);
if(f != tmp.end())
{
if((*f)->onCurve)
{
e->onCurve = (*f)->onCurve;
e->CADCurveId = (*f)->CADCurveId;
e->CADCurve = (*f)->CADCurve;
}
e->m_parentCAD = (*f)->m_parentCAD;
}
}
#endif
// Update 3D element boundary map.
pair<ElementSharedPtr, int> eMap = (*it)->m_elLink.at(0);
eMap.first->SetBoundaryLink(eMap.second, i);
// Copy face curvature
/*if ((*it)->m_faceNodes.size() > 0)
if ((*it)->m_faceNodes.size() > 0)
{
elmt->SetVolumeNodes((*it)->m_faceNodes);
elmt->SetCurveType((*it)->m_curveType);
}*/
}
}
}
......
......@@ -40,10 +40,6 @@ using namespace std;
#include <tinyxml.h>
#include <boost/algorithm/string.hpp>
#ifdef NEKTAR_USE_MESHGEN
#include <NekMeshUtils/CADSystem/CADSystem.h>
#endif
#include <SpatialDomains/MeshGraph.h>
#include <NekMeshUtils/MeshElements/Element.h>
#include "InputNekpp.h"
......@@ -354,9 +350,7 @@ void InputNekpp::Process()
m_mesh->m_hasCAD = false;
#ifdef NEKTAR_USE_MESHGEN
if(pSession->DefinesElement("NEKTAR/GEOMETRY/CADID") && !(m_config["nocad"].beenSet))
/*if(pSession->DefinesElement("NEKTAR/GEOMETRY/CADID") && !(m_config["nocad"].beenSet))
{
m_mesh->m_hasCAD = true;
TiXmlElement* id = pSession->GetElement("NEKTAR/GEOMETRY/CADID");
......@@ -544,13 +538,10 @@ void InputNekpp::Process()
}
}
#endif
ProcessEdges(false);
ProcessFaces(false);
ProcessComposites();
#ifdef NEKTAR_USE_MESHGEN
map<int, vector<cadVar> >::iterator vsit;
map<int, pair<int,map<int,vector<cadVar> > > >::iterator esit;
......@@ -602,9 +593,7 @@ void InputNekpp::Process()
{
if(esit->second.first != 0)
{
(*it)->onCurve = true;
(*it)->CADCurveId = esit->second.first;
(*it)->CADCurve = m_mesh->m_cad->GetCurve(esit->second.first);
(*it)->m_parentCAD = m_mesh->m_cad->GetCurve(esit->second.first);
}
int surf = 0;
......@@ -639,13 +628,10 @@ void InputNekpp::Process()
}
if(surf > 0 && esit->second.first == 0)
{
(*it)->onSurf = true;
(*it)->CADSurfId = surf;
(*it)->CADSurf = m_mesh->m_cad->GetSurf(surf);
(*it)->m_parentCAD = m_mesh->m_cad->GetSurf(surf);
}
ASSERTL0((*it)->onSurf || (*it)->onCurve,"must be part of some cad enity");
ASSERTL0(!((*it)->onSurf && (*it)->onCurve),"cant be part of both");
ASSERTL0((*it)->m_parentCAD,"must be part of some cad enity");
}
}
}
......@@ -658,9 +644,7 @@ void InputNekpp::Process()
fsit = faceToString.find((*it)->m_id);
if(fsit != faceToString.end())
{
(*it)->onSurf = true;
(*it)->CADSurfId = fsit->second.first;
(*it)->CADSurf = m_mesh->m_cad->GetSurf(fsit->second.first);
(*it)->m_parentCAD = m_mesh->m_cad->GetSurf(fsit->second.first);
for(int j = 0; j < (*it)->m_faceNodes.size(); j++)
{
......@@ -676,8 +660,7 @@ void InputNekpp::Process()
}
}
}
}
#endif
}*/
}
}
}
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