Commit b364bbc5 authored by Michael Turner's avatar Michael Turner

tests pass

parent b18a3803
......@@ -245,6 +245,7 @@ INCLUDE (ThirdPartyArpack)
INCLUDE (ThirdPartyMPI)
INCLUDE (ThirdPartyVTK)
INCLUDE (ThirdPartyOCE)
INCLUDE (ThirdPartyTriangle)
INCLUDE (ThirdPartyTetGen)
INCLUDE (ThirdPartyCCM)
INCLUDE (FindCFI)
......
......@@ -36,7 +36,6 @@ IF(NEKTAR_USE_MESHGEN)
VolumeMeshing/TetMeshing/TetMesh.cpp
VolumeMeshing/BLMeshing/BLMesh.cpp
Optimisation/BGFS-B.cpp
Triangle/Triangle.cpp
CADSystem/OCE/CADSystemOCE.cpp
CADSystem/OCE/CADVertOCE.cpp
CADSystem/OCE/CADCurveOCE.cpp
......@@ -95,7 +94,6 @@ IF(NEKTAR_USE_MESHGEN)
CADSystem/OCE/CADSurfOCE.h
Optimisation/BGFS-B.h
Optimisation/OptimiseObj.h
Triangle/Triangle.h
# 2DGenerator/2DGenerator.h
)
ENDIF()
......@@ -128,13 +126,14 @@ ADD_NEKTAR_LIBRARY(NekMeshUtils
IF(NEKTAR_USE_MESHGEN)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${OCC_LIBRARIES})
ADD_DEPENDENCIES(NekMeshUtils oce-0.17 tetgen-1.5)
ENDIF()
ADD_DEPENDENCIES(NekMeshUtils oce-0.17 tetgen-1.5 triangle-1.6)
IF(NEKTAR_USE_CFI)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${CFI_LIBRARIES})
IF(NEKTAR_USE_CFI)
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${CFI_LIBRARIES})
ENDIF()
ENDIF()
INSTALL(DIRECTORY ./
......
......@@ -116,16 +116,16 @@ void TriangleInterface::Mesh(bool Quality)
string cmd;
if (Quality)
{
cmd = "pqY";
cmd = "pqzQY";
}
else if (!Quality)
{
cmd = "pY";
cmd = "pzQY";
}
char *cstr = new char[cmd.length() + 1];
strcpy(cstr, cmd.c_str());
dt.triangulate(cstr);
dt.Run(cstr);
}
void TriangleInterface::SetUp()
......
......@@ -42,7 +42,13 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <NekMeshUtils/Triangle/Triangle.h>
#define ANSI_DECLARATORS
#define REAL double
#define VOID void
extern "C"
{
#include <triangle.h>
}
namespace Nektar
{
......@@ -97,6 +103,16 @@ private:
*/
void SetUp();
struct DelaunayTriangle
{
public:
void Run(char* cmd)
{
triangulate(cmd, &in, &out, NULL);
}
struct triangulateio in, out;
};
/// List of bounding nodes to the surface
std::vector<std::vector<NodeSharedPtr> > m_boundingloops;
/// List of additional nodes
......
......@@ -420,7 +420,7 @@ void HOSurfaceMesh::Process()
}
// just add the face interior nodes through interp and project
/*vector<NodeSharedPtr> vertices = f->m_vertexList;
vector<NodeSharedPtr> vertices = f->m_vertexList;
SpatialDomains::GeometrySharedPtr geom = f->GetGeom(3);
geom->FillGeom();
......@@ -452,10 +452,8 @@ void HOSurfaceMesh::Process()
loc[1] = xmap->PhysEvaluate(xp, yc);
loc[2] = xmap->PhysEvaluate(xp, zc);
Array<OneD, NekDouble> uv(2);
s->locuv(loc,uv);
Array<OneD, NekDouble> uv = s->locuv(loc);
uvi.push_back(uv);
}
vector<NodeSharedPtr> honodes;
......@@ -489,10 +487,8 @@ void HOSurfaceMesh::Process()
loc[1] = xmap->PhysEvaluate(xp, yc);
loc[2] = xmap->PhysEvaluate(xp, zc);
Array<OneD, NekDouble> uv(2);
s->locuv(loc,uv);
Array<OneD, NekDouble> uv = s->locuv(loc);
uvi.push_back(uv);
}
}
......@@ -509,7 +505,7 @@ void HOSurfaceMesh::Process()
f->m_faceNodes = honodes;
f->m_curveType = LibUtilities::eGaussLobattoLegendre;
}*/
}
}
if (m_mesh->m_verbose)
......
This diff is collapsed.
This diff is collapsed.
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