Commit f909553b authored by Michael Turner's avatar Michael Turner

renaming of meshconvert to nekmesh

parent b28e51ed
SET(LibrarySubDirs LibUtilities LocalRegions Collections
MultiRegions SpatialDomains StdRegions SolverUtils MeshUtils)
MultiRegions SpatialDomains StdRegions SolverUtils NekMeshUtils)
SET(UnitTestSubDirs UnitTests)
SET(DemoSubDirs Demos)
SET(TimingsSubDirs Timings)
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/CADSystem/CADCurve.h>
#include <NekMeshUtils/CADSystem/CADCurve.h>
using namespace std;
......
......@@ -41,10 +41,10 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/CADSystem/CADVert.h>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/CADSystem/CADVert.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
namespace Nektar
{
......
......@@ -35,7 +35,7 @@
#include <sstream>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
using namespace std;
......
......@@ -41,9 +41,9 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/CADSystem/CADVert.h>
#include <NekMeshUtils/CADSystem/CADVert.h>
namespace Nektar
{
......
......@@ -40,7 +40,7 @@
#include <boost/algorithm/string.hpp>
#include <boost/filesystem.hpp>
#include <MeshUtils/CADSystem/CADSystem.h>
#include <NekMeshUtils/CADSystem/CADSystem.h>
using namespace std;
......
......@@ -43,10 +43,10 @@
#include <Standard_Macro.hxx>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/CADSystem/CADVert.h>
#include <MeshUtils/CADSystem/CADCurve.h>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/CADVert.h>
#include <NekMeshUtils/CADSystem/CADCurve.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
namespace Nektar
{
......
......@@ -41,9 +41,9 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/CADSystem/OpenCascade.h>
#include <NekMeshUtils/CADSystem/OpenCascade.h>
#include <MeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
namespace Nektar
{
......
SET(MESHUTILS_SOURCES
SET(NEKMESHUTILS_SOURCES
MeshElements/Mesh.cpp
MeshElements/Element.cpp
MeshElements/BooleanOperators.cpp
......@@ -12,7 +12,7 @@ SET(MESHUTILS_SOURCES
MeshElements/Hexahedron.cpp
)
IF(NEKTAR_USE_MESH)
SET(MESHUTILS_SOURCES ${MESHUTILS_SOURCES}
SET(MESHUTILS_SOURCES ${NEKMESHUTILS_SOURCES}
SurfaceMeshing/CurveMesh.cpp
Octree/Octant.cpp
Octree/Octree.cpp
......@@ -27,7 +27,7 @@ IF(NEKTAR_USE_MESH)
)
ENDIF()
SET(MESHUTILS_HEADERS
SET(NEKMESHUTILS_HEADERS
MeshElements/MeshElements.h
MeshElements/Node.h
MeshElements/Edge.h
......@@ -45,7 +45,7 @@ SET(MESHUTILS_HEADERS
MeshElements/Hexahedron.h
)
IF(NEKTAR_USE_MESH)
SET(MESHUTILS_HEADERS ${MESHUTILS_HEADERS}
SET(NEKMESHUTILS_HEADERS ${NEKMESHUTILS_HEADERS}
Octree/CurvaturePoint.hpp
SurfaceMeshing/CurveMesh.h
Octree/Octant.h
......@@ -59,13 +59,13 @@ IF(NEKTAR_USE_MESH)
ENDIF()
IF(NEKTAR_USE_OCC)
SET(MESHUTILS_SOURCES ${MESHUTILS_SOURCES}
SET(NEKMESHUTILS_SOURCES ${NEKMESHUTILS_SOURCES}
CADSystem/CADSystem.cpp
CADSystem/CADCurve.cpp
CADSystem/CADSurf.cpp
)
SET(MESHUTILS_HEADERS ${MESHUTILS_HEADERS}
SET(NEKMESHUTILS_HEADERS ${NEKMESHUTILS_HEADERS}
CADSystem/CADSystem.h
CADSystem/CADVert.h
CADSystem/CADCurve.h
......@@ -75,23 +75,23 @@ IF(NEKTAR_USE_OCC)
ENDIF(NEKTAR_USE_OCC)
ADD_NEKTAR_LIBRARY(MeshUtils lib ${NEKTAR_LIBRARY_TYPE}
${MESHUTILS_SOURCES} ${MESHUTILS_HEADERS})
TARGET_LINK_LIBRARIES(MeshUtils LINK_PUBLIC SolverUtils)
ADD_NEKTAR_LIBRARY(NekMeshUtils lib ${NEKTAR_LIBRARY_TYPE}
${NEKMESHUTILS_SOURCES} ${NEKMESHUTILS_HEADERS})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PUBLIC SolverUtils)
IF(NEKTAR_USE_MESH)
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TRIANGLE_LIBRARY})
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${TETGEN_LIBRARY})
ENDIF()
IF(NEKTAR_USE_OCC)
SET(OCC_DEF LIN LININTEL HAVE_WOK_CONFIG_H HAVE_CONFIG_H CSFDB)
SET_TARGET_PROPERTIES(MeshUtils PROPERTIES COMPILE_DEFINITIONS "${OCC_DEF}")
TARGET_LINK_LIBRARIES(MeshUtils LINK_PRIVATE ${OCC_LIBS})
ADD_DEPENDENCIES(MeshUtils opencascade-6.8)
SET_TARGET_PROPERTIES(NekMeshUtils PROPERTIES COMPILE_DEFINITIONS "${OCC_DEF}")
TARGET_LINK_LIBRARIES(NekMeshUtils LINK_PRIVATE ${OCC_LIBS})
ADD_DEPENDENCIES(NekMeshUtils opencascade-6.8)
ENDIF(NEKTAR_USE_OCC)
INSTALL(DIRECTORY ./
DESTINATION ${NEKTAR_INCLUDE_DIR}/MeshUtils
DESTINATION ${NEKTAR_INCLUDE_DIR}/NekMeshUtils
COMPONENT dev
FILES_MATCHING PATTERN "*.h" PATTERN "*.hpp")
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/ExtLibInterface/TetGenInterface.h>
#include <NekMeshUtils/ExtLibInterface/TetGenInterface.h>
using namespace std;
namespace Nektar{
......
......@@ -44,7 +44,7 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/ExtLibInterface/TriangleInterface.h>
#include <NekMeshUtils/ExtLibInterface/TriangleInterface.h>
#include <sstream>
......
......@@ -49,7 +49,7 @@ extern "C"{
#include <triangle.h>
}
#include <MeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
......
......@@ -35,7 +35,7 @@
#include <limits>
#include <MeshUtils/Octree/Octant.h>
#include <NekMeshUtils/Octree/Octant.h>
using namespace std;
namespace Nektar
......
......@@ -37,7 +37,7 @@
#ifndef NEKTAR_MESHUTILS_OCTREE_OCTANT_H
#define NEKTAR_MESHUTILS_OCTREE_OCTANT_H
#include <MeshUtils/Octree/CurvaturePoint.hpp>
#include <NekMeshUtils/Octree/CurvaturePoint.hpp>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
......
......@@ -38,8 +38,8 @@
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <MeshUtils/Octree/Octree.h>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/Octree/Octree.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
using namespace std;
namespace Nektar
......
......@@ -39,9 +39,9 @@
#include <boost/shared_ptr.hpp>
#include <MeshUtils/CADSystem/CADSystem.h>
#include <MeshUtils/Octree/CurvaturePoint.hpp>
#include <MeshUtils/Octree/Octant.h>
#include <NekMeshUtils/CADSystem/CADSystem.h>
#include <NekMeshUtils/Octree/CurvaturePoint.hpp>
#include <NekMeshUtils/Octree/Octant.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/SurfaceMeshing/CurveMesh.h>
#include <NekMeshUtils/SurfaceMeshing/CurveMesh.h>
using namespace std;
namespace Nektar
......
......@@ -39,10 +39,10 @@
#include <boost/shared_ptr.hpp>
#include <MeshUtils/MeshElements/MeshElements.h>
#include <MeshUtils/CADSystem/CADVert.h>
#include <MeshUtils/CADSystem/CADCurve.h>
#include <MeshUtils/Octree/Octree.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/CADSystem/CADVert.h>
#include <NekMeshUtils/CADSystem/CADCurve.h>
#include <NekMeshUtils/Octree/Octree.h>
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
......
......@@ -34,8 +34,8 @@
////////////////////////////////////////////////////////////////////////////////
#include <limits>
#include <MeshUtils/SurfaceMeshing/FaceMesh.h>
#include <MeshUtils/ExtLibInterface/TriangleInterface.h>
#include <NekMeshUtils/SurfaceMeshing/FaceMesh.h>
#include <NekMeshUtils/ExtLibInterface/TriangleInterface.h>
#include <LocalRegions/MatrixKey.h>
#include <LibUtilities/Foundations/ManagerAccess.h>
......
......@@ -37,10 +37,10 @@
#ifndef MESHUTILS_SURFACEMESHING_FACEMESH
#define MESHUTILS_SURFACEMESHING_FACEMESH
#include <MeshUtils/MeshElements/MeshElements.h>
#include <MeshUtils/CADSystem/CADSurf.h>
#include <MeshUtils/Octree/Octree.h>
#include <MeshUtils/SurfaceMeshing/CurveMesh.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/CADSystem/CADSurf.h>
#include <NekMeshUtils/Octree/Octree.h>
#include <NekMeshUtils/SurfaceMeshing/CurveMesh.h>
namespace Nektar
{
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <NekMeshUtils/SurfaceMeshing/SurfaceMesh.h>
using namespace std;
namespace Nektar
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <NekMeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <limits>
using namespace std;
......
......@@ -33,7 +33,7 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <NekMeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <LocalRegions/MatrixKey.h>
......
......@@ -37,11 +37,11 @@
#ifndef MESHUTILS_SURFACEMESHING_SURFACEMESH
#define MESHUTILS_SURFACEMESHING_SURFACEMESH
#include <MeshUtils/MeshElements/MeshElements.h>
#include <MeshUtils/CADSystem/CADSystem.h>
#include <MeshUtils/Octree/Octree.h>
#include <MeshUtils/SurfaceMeshing/FaceMesh.h>
#include <MeshUtils/SurfaceMeshing/CurveMesh.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/CADSystem/CADSystem.h>
#include <NekMeshUtils/Octree/Octree.h>
#include <NekMeshUtils/SurfaceMeshing/FaceMesh.h>
#include <NekMeshUtils/SurfaceMeshing/CurveMesh.h>
namespace Nektar
......
......@@ -35,7 +35,7 @@
#include <list>
#include <algorithm>
#include <MeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <NekMeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <LibUtilities/BasicUtils/Progressbar.hpp>
#include <LocalRegions/MatrixKey.h>
......
......@@ -33,8 +33,8 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/TetMeshing/TetMesh.h>
#include <MeshUtils/ExtLibInterface/TetGenInterface.h>
#include <NekMeshUtils/TetMeshing/TetMesh.h>
#include <NekMeshUtils/ExtLibInterface/TetGenInterface.h>
using namespace std;
namespace Nektar
......
......@@ -41,10 +41,10 @@
#include <LibUtilities/BasicUtils/SharedArray.hpp>
#include <LibUtilities/Memory/NekMemoryManager.hpp>
#include <MeshUtils/MeshElements/MeshElements.h>
#include <MeshUtils/CADSystem/CADSystem.h>
#include <MeshUtils/Octree/Octree.h>
#include <MeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/CADSystem/CADSystem.h>
#include <NekMeshUtils/Octree/Octree.h>
#include <NekMeshUtils/SurfaceMeshing/SurfaceMesh.h>
namespace Nektar{
namespace MeshUtils{
......
......@@ -4,7 +4,7 @@ MACRO(ADD_UTILITIES_EXECUTABLE name component source)
SET_COMMON_PROPERTIES(${name})
TARGET_LINK_LIBRARIES(${name} MeshUtils)
TARGET_LINK_LIBRARIES(${name} NekMeshUtils)
IF( ${CMAKE_SYSTEM} MATCHES "Darwin-*")
SET_TARGET_PROPERTIES(${name}
......@@ -28,7 +28,7 @@ ADD_UTILITIES_EXECUTABLE(XmlToTecplot util XmlToTecplot.cpp)
ADD_UTILITIES_EXECUTABLE(XmlToTecplotWireFrame util XmlToTecplotWireFrame.cpp)
ADD_UTILITIES_EXECUTABLE(XmlToVtk util XmlToVtk.cpp)
#SUBDIRS(PostProcessing FieldConvert MeshConvert SimpleMeshGen Extras)
#SUBDIRS(PostProcessing FieldConvert NekMesh SimpleMeshGen Extras)
# Generate list of available utilities
FILE(GLOB dir_list "*")
......
SET(MeshConvertHeaders
SET(NekMeshHeaders
InputModules/InputGmsh.h
InputModules/InputNek.h
InputModules/InputNekpp.h
......@@ -23,7 +23,7 @@ SET(MeshConvertHeaders
ProcessModules/ProcessOptiExtract.h
)
SET(MeshConvertSources
SET(NekMeshSources
InputModules/InputGmsh.cpp
InputModules/InputNek.cpp
InputModules/InputNekpp.cpp
......@@ -31,7 +31,7 @@ SET(MeshConvertSources
InputModules/InputSem.cpp
InputModules/InputSwan.cpp
InputModules/InputStarTec.cpp
MeshConvert.cpp
NekMesh.cpp
Module.cpp
OutputModules/OutputGmsh.cpp
OutputModules/OutputNekpp.cpp
......@@ -50,36 +50,36 @@ SET(MeshConvertSources
)
IF (NEKTAR_USE_CCM)
SET(MeshConvertHeaders ${MeshConvertHeaders} InputModules/InputStar.h)
SET(MeshConvertSources ${MeshConvertSources} InputModules/InputStar.cpp)
SET(NekMeshHeaders ${NekMeshHeaders} InputModules/InputStar.h)
SET(NekMeshSources ${NekMeshSources} InputModules/InputStar.cpp)
ENDIF (NEKTAR_USE_CCM)
IF (NEKTAR_USE_VTK)
SET(MeshConvertHeaders ${MeshConvertHeaders} InputModules/InputVtk.h OutputModules/OutputVtk.h)
SET(MeshConvertSources ${MeshConvertSources} InputModules/InputVtk.cpp OutputModules/OutputVtk.cpp)
SET(NekMeshHeaders ${NekMeshHeaders} InputModules/InputVtk.h OutputModules/OutputVtk.h)
SET(NekMeshSources ${NekMeshSources} InputModules/InputVtk.cpp OutputModules/OutputVtk.cpp)
ENDIF (NEKTAR_USE_VTK)
IF (NEKTAR_USE_MESH)
SET(MeshConvertHeaders ${MeshConvertHeaders} InputModules/InputCAD.h)
SET(MeshConvertSources ${MeshConvertSources} InputModules/InputCAD.cpp)
SET(NekMeshHeaders ${NekMeshHeaders} InputModules/InputCAD.h)
SET(NekMeshSources ${NekMeshSources} InputModules/InputCAD.cpp)
ENDIF (NEKTAR_USE_MESH)
ADD_UTILITIES_EXECUTABLE(MeshConvert util ${MeshConvertSources} ${MeshConvertHeaders})
ADD_UTILITIES_EXECUTABLE(NekMesh util ${NekMeshSources} ${NekMeshHeaders})
IF (NEKTAR_USE_CCM)
TARGET_LINK_LIBRARIES(MeshConvert ccmio adf)
SET_TARGET_PROPERTIES(MeshConvert PROPERTIES
TARGET_LINK_LIBRARIES(NekMesh ccmio adf)
SET_TARGET_PROPERTIES(NekMesh PROPERTIES
IMPORTED_LOCATION ${CCMIO_LIBRARY_PATH}/libccmio.a)
INCLUDE_DIRECTORIES(MeshConvert ${CCMIO_INCLUDE_DIR})
INCLUDE_DIRECTORIES(NekMesh ${CCMIO_INCLUDE_DIR})
LINK_DIRECTORIES(${CCMIO_LIBRARY_PATH})
ENDIF (NEKTAR_USE_CCM)
IF (NEKTAR_USE_VTK)
IF (VTK_MAJOR_VERSION LESS 6)
TARGET_LINK_LIBRARIES(MeshConvert vtkCommon vtkIO vtkGraphics)
TARGET_LINK_LIBRARIES(NekMesh vtkCommon vtkIO vtkGraphics)
ELSE ()
TARGET_LINK_LIBRARIES(MeshConvert vtkCommonCore vtkIOLegacy)
TARGET_LINK_LIBRARIES(NekMesh vtkCommonCore vtkIOLegacy)
ENDIF ()
ENDIF (NEKTAR_USE_VTK)
......
......@@ -33,13 +33,13 @@
//
////////////////////////////////////////////////////////////////////////////////
#include <MeshUtils/MeshElements/MeshElements.h>
#include <NekMeshUtils/MeshElements/MeshElements.h>
#include <MeshUtils/CADSystem/CADSystem.h>
#include <MeshUtils/Octree/Octree.h>
#include <MeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <MeshUtils/TetMeshing/TetMesh.h>
//#include <MeshUtils/MeshElem.hpp>
#include <NekMeshUtils/CADSystem/CADSystem.h>
#include <NekMeshUtils/Octree/Octree.h>
#include <NekMeshUtils/SurfaceMeshing/SurfaceMesh.h>
#include <NekMeshUtils/TetMeshing/TetMesh.h>
//#include <NekMeshUtils/MeshElem.hpp>
#include <LibUtilities/BasicUtils/SessionReader.h>
......
......@@ -37,7 +37,7 @@
#include <iostream>
using namespace std;
#include <MeshUtils/MeshElements/MeshElements.h>
#include <N