Commit 524a0de2 authored by Dave Moxey's avatar Dave Moxey
Browse files

Fix a few lingering issues

parent 084597d5
......@@ -330,7 +330,7 @@ Array<OneD, NekDouble> CADSurf::D2(Array<OneD, NekDouble> uv)
void CADSurf::Test(Array<OneD, NekDouble> uv)
{
/*stringstream error;
stringstream error;
error << "Point not within parameter plane: ";
......@@ -374,8 +374,10 @@ void CADSurf::Test(Array<OneD, NekDouble> uv)
}
error << " On Surface: " << GetId();
ASSERTL0(passed, error.str());*/
if (!passed)
{
cout << "Warning: " << error.str() << endl;
}
}
}
}
......@@ -133,8 +133,6 @@ vector<int> CADSystem::GetBoundarySurfs()
}
}
cout << endl;
set<int>::iterator it;
for(it = surfs.begin(); it != surfs.end(); it++)
{
......@@ -374,7 +372,6 @@ bool CADSystem::LoadCAD()
TopoDS_Shape edge = localEdges.FindKey(j);
if (BRep_Tool::Degenerated(TopoDS::Edge(edge)))
{
cout << "degen edge on face " << i << endl;
gp_Pnt2d p1, p2;
BRep_Tool::UVPoints(TopoDS::Edge(edge), TopoDS::Face(face), p1,
......
......@@ -85,12 +85,11 @@ TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC LocalRegions)
IF(NEKTAR_USE_MESHGEN)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${LIB_ANN})
ENDIF()
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC ${OCC_LIBS})
IF(NEKTAR_USE_MESHGEN)
SET(OCC_DEF LIN LININTEL HAVE_WOK_CONFIG_H HAVE_CONFIG_H CSFDB)
SET_TARGET_PROPERTIES(NekMeshUtils PROPERTIES COMPILE_DEFINITIONS "${OCC_DEF}")
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC ${OCC_LIBS})
SET_PROPERTY(TARGET NekMeshUtils APPEND PROPERTY COMPILE_DEFINITIONS ${OCC_DEF})
ADD_DEPENDENCIES(NekMeshUtils opencascade-6.8 tetgen-1.5)
ENDIF()
INSTALL(DIRECTORY ./
......
......@@ -64,11 +64,6 @@ void TetGenInterface::InitialMesh(map<int, NodeSharedPtr> tgidton,
{
Array<OneD, NekDouble> loc = it->second->GetLoc();
if(it->first == 2950)
{
cout << loc[0] << " " << loc[1] << " " << loc[2] << endl;
}
surface.pointlist[it->first * 3 + 0] = loc[0];
surface.pointlist[it->first * 3 + 1] = loc[1];
surface.pointlist[it->first * 3 + 2] = loc[2];
......@@ -94,7 +89,7 @@ void TetGenInterface::InitialMesh(map<int, NodeSharedPtr> tgidton,
surface.facetmarkerlist[i] = 0;
}
tetrahedralize("pYz", &surface, &output);
tetrahedralize("pYzqQ", &surface, &output);
}
void TetGenInterface::GetNewPoints(int num,
......
////////////////////////////////////////////////////////////////////////////////
//
// File: Curavturepoint.hpp
// File: SourcePoint.hpp
//
// For more information, please see: http://www.nektar.info/
//
......
......@@ -75,9 +75,6 @@ void SurfaceMesh::Mesh()
// linear mesh all surfaces
for (int i = 1; i <= m_cad->GetNumSurf(); i++)
{
//if(i == 1200 || i == 2206)
// continue;
if (m_mesh->m_verbose)
{
LibUtilities::PrintProgressbar(
......
......@@ -623,8 +623,11 @@ void SurfaceMesh::HOSurf()
Array<OneD, NekDouble> uv(2);
s->ProjectTo(xyz,uv);
uvi[ctr++] = uv;
}/*
}
/// TODO: face nodes should be optmised but will probably be done via
/// variational optimisation.
/*
OptiFaceSharedPtr opti = MemoryManager<OptiFace>::
AllocateSharedPtr(uvi, z, springs, s);
......
......@@ -72,7 +72,7 @@ ENDIF (NEKTAR_USE_MESHGEN)
# LocalRegions.
ADD_EXECUTABLE(NekMesh ${NekMeshSources})
SET_COMMON_PROPERTIES(NekMesh)
TARGET_LINK_LIBRARIES(NekMesh NekMeshUtils MultiRegions)
TARGET_LINK_LIBRARIES(NekMesh NekMeshUtils LocalRegions)
SET_PROPERTY(TARGET NekMesh PROPERTY FOLDER util)
INSTALL(TARGETS NekMesh
RUNTIME DESTINATION ${NEKTAR_BIN_DIR} COMPONENT util)
......
......@@ -127,8 +127,6 @@ void InputCAD::Process()
vector<int> bs = m_cad->GetBoundarySurfs();
cout << bs.size() << endl;
vector<unsigned int> symsurfs;
vector<unsigned int> blsurfs, blsurfst;
if (m_makeBL)
......@@ -196,15 +194,11 @@ void InputCAD::Process()
file.open(pSession->GetSolverInfo("SourcePoints").c_str());
string line;
while ( getline (file,line) )
while (getline(file, line))
{
vector<NekDouble> point;
vector<NekDouble> point(3);
stringstream s(line);
NekDouble x,y,z;
s >> x >> y >> z;
point.push_back(x);
point.push_back(y);
point.push_back(z);
s >> point[0] >> point[1] >> point[2];
points.push_back(point);
}
NekDouble sp;
......@@ -271,8 +265,6 @@ void InputCAD::Process()
m_surfacemesh->Report();
//m_mesh->m_nummode = 2;
EdgeSet::iterator eit;
int count = 0;
for(eit = m_mesh->m_edgeSet.begin(); eit != m_mesh->m_edgeSet.end(); eit++)
......@@ -282,7 +274,13 @@ void InputCAD::Process()
count++;
}
}
cout << "not linked " << count << endl;
if (count > 0)
{
cerr << "Error: mesh contains unconnected edges and is not valid"
<< endl;
abort();
}
map<int, FaceSharedPtr> surftopriface;
// map of surface element id to opposite prism
......
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