From 381476278542eb4af99e040f85ddb823e64b0087 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 18 May 2017 10:42:05 +0200 Subject: [PATCH] ENH: relocate triSurface classes into surfMesh library (issue #294) - simplifies organization, includes, linkage etc. --- .../solvers/combustion/PDRFoam/Make/options | 4 +-- .../test/dynamicIndexedOctree/Make/options | 6 ++-- applications/test/ensightFile/Make/options | 10 +++---- .../test/momentOfInertia/Make/options | 4 +-- .../mesh/advanced/selectCells/Make/options | 8 ++---- .../advanced/snappyRefineMesh/Make/options | 3 +- .../conversion/ccm/ccmToFoam/Make/options | 4 +-- .../conversion/ccm/foamToCcm/Make/options | 4 +-- .../mesh/conversion/fireToFoam/Make/options | 4 +-- .../conversion/foamToFireMesh/Make/options | 4 +-- .../conversion/foamToStarMesh/Make/options | 4 +-- .../mesh/conversion/star4ToFoam/Make/options | 4 +-- .../mesh/generation/blockMesh/Make/options | 3 +- .../cellSizeAndAlignmentGrid/Make/options | 13 ++++----- .../conformalVoronoiMesh/Make/options | 14 ++++------ .../foamyMesh/foamyHexMesh/Make/options | 14 ++++------ .../foamyHexMeshBackgroundMesh/Make/options | 8 ++---- .../foamyHexMeshSurfaceSimplify/Make/options | 4 +-- .../foamyMesh/foamyQuadMesh/Make/options | 14 ++++------ .../generation/snappyHexMesh/Make/options | 5 +--- .../manipulation/insideCells/Make/options | 6 ++-- .../manipulation/orientFaceZone/Make/options | 7 ++--- .../miscellaneous/foamList/Make/options | 1 - .../dataConversion/foamToEnsight/Make/options | 9 +++--- .../foamToEnsightParts/Make/options | 11 ++++---- .../vtkPVblockMesh/Make/options | 3 +- .../lagrangian/particleTracks/Make/options | 3 +- .../faceAgglomerate/Make/options | 4 +-- .../preProcessing/viewFactorsGen/Make/options | 5 ++-- .../utilities/surface/surfaceAdd/Make/options | 5 ++-- .../surfaceBooleanFeatures/Make/options | 6 +--- .../PolyhedronReader/Make/options | 3 +- .../surface/surfaceCheck/Make/options | 10 +++---- .../surface/surfaceClean/Make/options | 5 ++-- .../surface/surfaceCoarsen/Make/options | 5 ++-- .../surface/surfaceConvert/Make/options | 5 ++-- .../surfaceFeatureExtract/Make/options | 4 +-- .../surface/surfaceHookUp/Make/options | 8 ++---- .../surface/surfaceInertia/Make/options | 7 ++--- .../surface/surfaceInflate/Make/options | 3 -- .../surfaceMeshConvertTesting/Make/options | 4 +-- .../surface/surfaceOrient/Make/options | 5 ++-- .../surface/surfacePatch/Make/options | 4 +-- .../surface/surfacePointMerge/Make/options | 7 ++--- .../surfaceRedistributePar/Make/options | 5 ++-- .../surfaceRefineRedGreen/Make/options | 7 ++--- .../surface/surfaceSplitByPatch/Make/options | 6 ++-- .../surfaceSplitByTopology/Make/options | 6 ++-- .../surfaceSplitNonManifolds/Make/options | 7 ++--- .../surface/surfaceSubset/Make/options | 6 ++-- .../surface/surfaceToPatch/Make/options | 4 +-- src/Allwmake | 1 - src/conversion/Make/options | 3 +- src/conversion/ccm/Make/options | 2 +- src/dynamicFvMesh/Make/options | 3 +- src/dynamicMesh/Make/options | 4 +-- src/finiteVolume/Make/options | 5 ++-- src/functionObjects/forces/Make/options | 5 ++-- .../CMakeLists-Common.txt | 4 +-- src/fvMotionSolver/Make/options | 8 ++---- src/mesh/blockMesh/Make/options | 8 ++---- src/mesh/extrudeModel/Make/options | 2 +- src/mesh/snappyHexMesh/Make/options | 5 +--- src/meshTools/Make/options | 6 ++-- src/parallel/distributed/Make/options | 10 +++---- src/rigidBodyMeshMotion/Make/options | 3 +- src/sampling/Make/options | 14 ++++------ src/sixDoFRigidBodyMotion/Make/options | 5 ++-- src/surfMesh/Make/files | 26 +++++++++++++++++ .../triSurface/fields}/triSurfaceFields.C | 0 .../triSurface/fields}/triSurfaceFields.H | 0 .../triSurface/fields}/triSurfaceFieldsFwd.H | 0 .../triSurface/fields}/triSurfaceGeoMesh.H | 0 .../fields}/triSurfacePointGeoMesh.H | 0 .../triSurface/interfaces/AC3D/readAC.C | 0 .../triSurface/interfaces/AC3D/writeAC.C | 0 .../triSurface/interfaces/GTS/readGTS.C | 0 .../triSurface/interfaces/GTS/writeGTS.C | 0 .../triSurface/interfaces/NAS/readNAS.C | 0 .../triSurface/interfaces/OBJ/readOBJ.C | 0 .../triSurface/interfaces/OBJ/writeOBJ.C | 0 .../triSurface/interfaces/OFF/readOFF.C | 0 .../triSurface/interfaces/OFF/writeOFF.C | 0 .../triSurface/interfaces/SMESH/writeSMESH.C | 0 .../triSurface/interfaces/STL/readSTL.C | 0 .../triSurface/interfaces/STL/writeSTL.C | 0 .../triSurface/interfaces/TRI/readTRI.C | 0 .../triSurface/interfaces/TRI/writeTRI.C | 0 .../triSurface/interfaces/VTK/readVTK.C | 0 .../triSurface/interfaces/VTK/writeVTK.C | 0 .../patches}/geometricSurfacePatch.C | 0 .../patches}/geometricSurfacePatch.H | 0 .../patches}/geometricSurfacePatchList.H | 0 .../triSurface/patches}/surfacePatch.C | 0 .../triSurface/patches}/surfacePatch.H | 0 .../triSurface/patches}/surfacePatchList.H | 0 .../triSurface/stitchTriangles.C | 0 .../triSurface/triSurface.C | 0 .../triSurface/triSurface.H | 0 .../triSurface/triSurfaceAddressing.C | 0 .../radiation/Make/options | 5 ++-- src/triSurface/Make/files | 28 ------------------- src/triSurface/Make/options | 6 ---- 103 files changed, 179 insertions(+), 279 deletions(-) rename src/{triSurface/triSurfaceFields => surfMesh/triSurface/fields}/triSurfaceFields.C (100%) rename src/{triSurface/triSurfaceFields => surfMesh/triSurface/fields}/triSurfaceFields.H (100%) rename src/{triSurface/triSurfaceFields => surfMesh/triSurface/fields}/triSurfaceFieldsFwd.H (100%) rename src/{triSurface/triSurfaceFields => surfMesh/triSurface/fields}/triSurfaceGeoMesh.H (100%) rename src/{triSurface/triSurfaceFields => surfMesh/triSurface/fields}/triSurfacePointGeoMesh.H (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/AC3D/readAC.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/AC3D/writeAC.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/GTS/readGTS.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/GTS/writeGTS.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/NAS/readNAS.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/OBJ/readOBJ.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/OBJ/writeOBJ.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/OFF/readOFF.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/OFF/writeOFF.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/SMESH/writeSMESH.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/STL/readSTL.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/STL/writeSTL.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/TRI/readTRI.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/TRI/writeTRI.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/VTK/readVTK.C (100%) rename src/{triSurface => surfMesh}/triSurface/interfaces/VTK/writeVTK.C (100%) rename src/{triSurface/triSurface/geometricSurfacePatch => surfMesh/triSurface/patches}/geometricSurfacePatch.C (100%) rename src/{triSurface/triSurface/geometricSurfacePatch => surfMesh/triSurface/patches}/geometricSurfacePatch.H (100%) rename src/{triSurface/triSurface/geometricSurfacePatch => surfMesh/triSurface/patches}/geometricSurfacePatchList.H (100%) rename src/{triSurface/triSurface/surfacePatch => surfMesh/triSurface/patches}/surfacePatch.C (100%) rename src/{triSurface/triSurface/surfacePatch => surfMesh/triSurface/patches}/surfacePatch.H (100%) rename src/{triSurface/triSurface/surfacePatch => surfMesh/triSurface/patches}/surfacePatchList.H (100%) rename src/{triSurface => surfMesh}/triSurface/stitchTriangles.C (100%) rename src/{triSurface => surfMesh}/triSurface/triSurface.C (100%) rename src/{triSurface => surfMesh}/triSurface/triSurface.H (100%) rename src/{triSurface => surfMesh}/triSurface/triSurfaceAddressing.C (100%) delete mode 100644 src/triSurface/Make/files delete mode 100644 src/triSurface/Make/options diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index 405f5bcf62..58dfadafd4 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -15,8 +15,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lengine \ diff --git a/applications/test/dynamicIndexedOctree/Make/options b/applications/test/dynamicIndexedOctree/Make/options index a1d2c044e1..54c035b8f5 100644 --- a/applications/test/dynamicIndexedOctree/Make/options +++ b/applications/test/dynamicIndexedOctree/Make/options @@ -1,3 +1,5 @@ -EXE_INC = -I$(LIB_SRC)/meshTools/lnInclude +EXE_INC = \ + -I$(LIB_SRC)/meshTools/lnInclude -EXE_LIBS = -lmeshTools +EXE_LIBS = \ + -lmeshTools diff --git a/applications/test/ensightFile/Make/options b/applications/test/ensightFile/Make/options index a4f7656262..6684cce1e7 100644 --- a/applications/test/ensightFile/Make/options +++ b/applications/test/ensightFile/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude EXE_LIBS = \ - -lconversion \ - -lfileFormats \ - -lmeshTools - + -lmeshTools \ + -lconversion diff --git a/applications/test/momentOfInertia/Make/options b/applications/test/momentOfInertia/Make/options index 0b32f3355b..d5ff5b3e40 100644 --- a/applications/test/momentOfInertia/Make/options +++ b/applications/test/momentOfInertia/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lmeshTools diff --git a/applications/utilities/mesh/advanced/selectCells/Make/options b/applications/utilities/mesh/advanced/selectCells/Make/options index c4020c272c..18a53a8f5e 100644 --- a/applications/utilities/mesh/advanced/selectCells/Make/options +++ b/applications/utilities/mesh/advanced/selectCells/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude - EXE_LIBS = \ - -ldynamicMesh \ -lmeshTools \ - -ltriSurface \ + -ldynamicMesh \ -llagrangian diff --git a/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options index 78df8bbcf4..7abac6e3a5 100644 --- a/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options +++ b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options @@ -1,11 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ -ldynamicMesh \ -lmeshTools \ - -ltriSurface \ -llagrangian diff --git a/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options b/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options index 8b1f005a78..55f161ad82 100644 --- a/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options +++ b/applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options @@ -1,9 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \ - -I$(LIB_SRC)/conversion/ccm/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude + -I$(LIB_SRC)/conversion/ccm/lnInclude EXE_LIBS = \ -lfiniteVolume \ diff --git a/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options b/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options index df1a41bde0..a788d881ee 100644 --- a/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options +++ b/applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options @@ -1,8 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \ - -I$(LIB_SRC)/conversion/ccm/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude + -I$(LIB_SRC)/conversion/ccm/lnInclude EXE_LIBS = \ -lfiniteVolume \ diff --git a/applications/utilities/mesh/conversion/fireToFoam/Make/options b/applications/utilities/mesh/conversion/fireToFoam/Make/options index e3af2fe661..890aee06c8 100644 --- a/applications/utilities/mesh/conversion/fireToFoam/Make/options +++ b/applications/utilities/mesh/conversion/fireToFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/conversion/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude + -I$(LIB_SRC)/conversion/lnInclude EXE_LIBS = \ -lconversion diff --git a/applications/utilities/mesh/conversion/foamToFireMesh/Make/options b/applications/utilities/mesh/conversion/foamToFireMesh/Make/options index e3af2fe661..890aee06c8 100644 --- a/applications/utilities/mesh/conversion/foamToFireMesh/Make/options +++ b/applications/utilities/mesh/conversion/foamToFireMesh/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/conversion/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude + -I$(LIB_SRC)/conversion/lnInclude EXE_LIBS = \ -lconversion diff --git a/applications/utilities/mesh/conversion/foamToStarMesh/Make/options b/applications/utilities/mesh/conversion/foamToStarMesh/Make/options index e3af2fe661..890aee06c8 100644 --- a/applications/utilities/mesh/conversion/foamToStarMesh/Make/options +++ b/applications/utilities/mesh/conversion/foamToStarMesh/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/conversion/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude + -I$(LIB_SRC)/conversion/lnInclude EXE_LIBS = \ -lconversion diff --git a/applications/utilities/mesh/conversion/star4ToFoam/Make/options b/applications/utilities/mesh/conversion/star4ToFoam/Make/options index e3af2fe661..890aee06c8 100644 --- a/applications/utilities/mesh/conversion/star4ToFoam/Make/options +++ b/applications/utilities/mesh/conversion/star4ToFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/conversion/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude + -I$(LIB_SRC)/conversion/lnInclude EXE_LIBS = \ -lconversion diff --git a/applications/utilities/mesh/generation/blockMesh/Make/options b/applications/utilities/mesh/generation/blockMesh/Make/options index 9d13a25de6..3828bbeca1 100644 --- a/applications/utilities/mesh/generation/blockMesh/Make/options +++ b/applications/utilities/mesh/generation/blockMesh/Make/options @@ -1,11 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/blockMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude EXE_LIBS = \ -lblockMesh \ -lmeshTools \ - -lfileFormats \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options index c53403e602..386b669083 100644 --- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options @@ -6,7 +6,6 @@ CGAL_INEXACT = -DCGAL_INEXACT include $(GENERAL_RULES)/CGAL - EXE_INC = \ ${ROUNDING_MATH} \ ${EXE_NDEBUG} \ @@ -14,10 +13,10 @@ EXE_INC = \ ${CGAL_INC} \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I../conformalVoronoiMesh/lnInclude @@ -25,11 +24,9 @@ EXE_INC = \ EXE_LIBS = \ $(CGAL_LIBS) \ -lconformalVoronoiMesh \ - -lfiniteVolume \ + -lfiniteVolume \ -lmeshTools \ + -lsampling \ -ldecompositionMethods \ -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \ - -ltriSurface \ - -ldynamicMesh \ - -lsampling \ - -lfileFormats + -ldynamicMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options index 1baf4fb2f9..89496232cc 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options @@ -14,24 +14,20 @@ EXE_INC = \ ${CGAL_INC} \ ${c++LESSWARN} \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -IPrintTable LIB_LIBS = \ ${CGAL_LIBS} \ -lmeshTools \ - -ldecompose \ - -lfileFormats \ - -ltriSurface \ - -ldynamicMesh \ - -lsurfMesh \ -lsampling \ + -ldecompose \ + -ldynamicMesh \ -lsnappyHexMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options index ce8d65dcc6..40373bec9d 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options @@ -15,12 +15,12 @@ EXE_INC = \ ${c++LESSWARN} \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/lnInclude \ + -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -IvectorTools @@ -28,10 +28,8 @@ EXE_LIBS = \ ${CGAL_LIBS} \ -lconformalVoronoiMesh \ -lmeshTools \ + -lsampling \ -ldecompositionMethods \ -ldecompose \ -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp -lscotchDecomp \ - -lfileFormats \ - -ltriSurface \ - -ldynamicMesh \ - -lsampling + -ldynamicMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options index 293882347b..3fe4af45fb 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/Make/options @@ -11,11 +11,11 @@ EXE_INC = \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I../vectorTools @@ -24,9 +24,7 @@ EXE_LIBS = \ -lconformalVoronoiMesh \ -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \ -ldecompose \ - -ltriSurface \ -lmeshTools \ - -lfileFormats \ -lsampling \ -ldynamicMesh \ -lfiniteVolume diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options index 0a1653a2f3..66ddf81aac 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Make/options @@ -10,7 +10,7 @@ EXE_INC = \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ @@ -19,7 +19,5 @@ EXE_LIBS = \ -lGL \ -lconformalVoronoiMesh \ -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \ - -lfileFormats \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options index 30e411d669..1b509ac9df 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options +++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options @@ -13,13 +13,12 @@ EXE_INC = \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude EXE_LIBS = \ @@ -29,10 +28,7 @@ EXE_LIBS = \ -lcv2DMesh \ -lconformalVoronoiMesh \ -lmeshTools \ - -lsurfMesh \ - -ltriSurface \ + -lsampling \ -ldynamicMesh \ -ldecompositionMethods \ - -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \ - -lsampling \ - -lfileFormats + -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index a01104b387..bb863797fa 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -2,10 +2,9 @@ EXE_INC = \ /* -g -DFULLDEBUG -O0 */ \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \ @@ -18,8 +17,6 @@ EXE_LIBS = \ /* note: scotch < 6.0 does not like both scotch and ptscotch together */ \ -lscotchDecomp \ -lmeshTools \ - -lsurfMesh \ - -lfileFormats \ -ldynamicMesh \ -ldecompose \ -lreconstruct \ diff --git a/applications/utilities/mesh/manipulation/insideCells/Make/options b/applications/utilities/mesh/manipulation/insideCells/Make/options index 07bbf1aab9..d5ff5b3e40 100644 --- a/applications/utilities/mesh/manipulation/insideCells/Make/options +++ b/applications/utilities/mesh/manipulation/insideCells/Make/options @@ -1,8 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude - + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options index 56e8dc4f17..8bec702f89 100644 --- a/applications/utilities/mesh/manipulation/orientFaceZone/Make/options +++ b/applications/utilities/mesh/manipulation/orientFaceZone/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude EXE_LIBS = \ -lmeshTools \ - -lsnappyHexMesh \ - -ltriSurface + -lsnappyHexMesh diff --git a/applications/utilities/miscellaneous/foamList/Make/options b/applications/utilities/miscellaneous/foamList/Make/options index 96e74a80ac..6487208998 100644 --- a/applications/utilities/miscellaneous/foamList/Make/options +++ b/applications/utilities/miscellaneous/foamList/Make/options @@ -89,7 +89,6 @@ EXE_LIBS = \ -lsurfMesh \ -lthermalBaffleModels \ -ltopoChangerFvMesh \ - -ltriSurface \ -lturbulenceModels \ -ltwoPhaseMixture \ -ltwoPhaseMixtureThermo \ diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options index dc8f10f1f1..82fc2ecd28 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/Make/options @@ -1,14 +1,13 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/conversion/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/lnInclude \ + -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ -ldynamicMesh \ - -lfileFormats \ -lgenericPatchFields \ -llagrangian \ -lconversion diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options index 09a58c1559..b975639649 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/Make/options @@ -1,14 +1,13 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/conversion/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ -lfiniteVolume \ -llagrangian \ -lmeshTools \ - -lfileFormats \ - -lgenericPatchFields \ - -lconversion + -lconversion \ + -lgenericPatchFields diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options index 295a695c76..d07c5b2469 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/Make/options @@ -2,8 +2,8 @@ sinclude $(GENERAL_RULES)/paraview EXE_INC = \ ${c++LESSWARN} \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/mesh/blockMesh/lnInclude \ -I$(ParaView_INCLUDE_DIR) \ -I$(ParaView_INCLUDE_DIR)/vtkkwiml \ @@ -12,7 +12,6 @@ EXE_INC = \ LIB_LIBS = \ -lmeshTools \ - -lfileFormats \ -lblockMesh \ -L$(FOAM_LIBBIN) -lfoamPv-pv${ParaView_MAJOR} \ $(GLIBS) diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options index b653926f93..806956cf5f 100644 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options @@ -1,12 +1,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lfileFormats \ -lgenericPatchFields \ -llagrangian diff --git a/applications/utilities/preProcessing/faceAgglomerate/Make/options b/applications/utilities/preProcessing/faceAgglomerate/Make/options index 3facebbe19..df6e1ebb3b 100644 --- a/applications/utilities/preProcessing/faceAgglomerate/Make/options +++ b/applications/utilities/preProcessing/faceAgglomerate/Make/options @@ -5,6 +5,4 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ - -lpairPatchAgglomeration \ - -ltriSurface \ - -lmeshTools + -lpairPatchAgglomeration diff --git a/applications/utilities/preProcessing/viewFactorsGen/Make/options b/applications/utilities/preProcessing/viewFactorsGen/Make/options index b64f44712c..1eeef409c2 100644 --- a/applications/utilities/preProcessing/viewFactorsGen/Make/options +++ b/applications/utilities/preProcessing/viewFactorsGen/Make/options @@ -1,12 +1,11 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/parallel/distributed/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/parallel/distributed/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -ltriSurface \ -ldistributed \ -lradiationModels diff --git a/applications/utilities/surface/surfaceAdd/Make/options b/applications/utilities/surface/surfaceAdd/Make/options index c746f7e0f0..a504dd8617 100644 --- a/applications/utilities/surface/surfaceAdd/Make/options +++ b/applications/utilities/surface/surfaceAdd/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude EXE_LIBS = \ - -ltriSurface \ - -lmeshTools + -lsurfMesh diff --git a/applications/utilities/surface/surfaceBooleanFeatures/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/Make/options index 5a431f7d73..7a1c792e54 100644 --- a/applications/utilities/surface/surfaceBooleanFeatures/Make/options +++ b/applications/utilities/surface/surfaceBooleanFeatures/Make/options @@ -1,7 +1,6 @@ EXE_NDEBUG = -DNDEBUG /* EXE_NDEBUG = -g -O0 -DFULLDEBUG */ - c++CGALWARN = -Wno-old-style-cast /*-- Define NO_CGAL to avoid using CGAL altogether */ @@ -15,12 +14,9 @@ EXE_INC = \ ${CGAL_INC} \ ${c++CGALWARN} \ $(COMP_FLAGS) \ - -I$(FOAM_SRC)/surfMesh/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lsurfMesh \ - -ltriSurface \ -lmeshTools \ $(LINK_FLAGS) diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options index e8940960b9..8ed525de9f 100644 --- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options +++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options @@ -14,11 +14,10 @@ EXE_INC = \ ${c++CGALWARN} \ -I.. \ -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I/usr/include/Qt LIB_LIBS = \ -L$(CGAL_ARCH_PATH)/lib \ -L$(CGAL_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfaceCheck/Make/options b/applications/utilities/surface/surfaceCheck/Make/options index 28fb9f2cce..65185bc7f2 100644 --- a/applications/utilities/surface/surfaceCheck/Make/options +++ b/applications/utilities/surface/surfaceCheck/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lsampling \ - -ltriSurface \ - -lmeshTools + -lmeshTools \ + -lsampling diff --git a/applications/utilities/surface/surfaceClean/Make/options b/applications/utilities/surface/surfaceClean/Make/options index 2db41f545a..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfaceClean/Make/options +++ b/applications/utilities/surface/surfaceClean/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfaceCoarsen/Make/options b/applications/utilities/surface/surfaceCoarsen/Make/options index 965309e4da..2ff4a1f22f 100644 --- a/applications/utilities/surface/surfaceCoarsen/Make/options +++ b/applications/utilities/surface/surfaceCoarsen/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ -Ibunnylod \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude EXE_LIBS = \ - -ltriSurface \ - -lmeshTools + -lsurfMesh diff --git a/applications/utilities/surface/surfaceConvert/Make/options b/applications/utilities/surface/surfaceConvert/Make/options index 4c41bc1a49..a504dd8617 100644 --- a/applications/utilities/surface/surfaceConvert/Make/options +++ b/applications/utilities/surface/surfaceConvert/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface + -lsurfMesh diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/options b/applications/utilities/surface/surfaceFeatureExtract/Make/options index e96fbb3687..e57de43f22 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/Make/options +++ b/applications/utilities/surface/surfaceFeatureExtract/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface \ -lsampling diff --git a/applications/utilities/surface/surfaceHookUp/Make/options b/applications/utilities/surface/surfaceHookUp/Make/options index db53089d48..edc787aeae 100644 --- a/applications/utilities/surface/surfaceHookUp/Make/options +++ b/applications/utilities/surface/surfaceHookUp/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -lfileFormats \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfaceInertia/Make/options b/applications/utilities/surface/surfaceInertia/Make/options index 9f08e8d2a8..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfaceInertia/Make/options +++ b/applications/utilities/surface/surfaceInertia/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfaceInflate/Make/options b/applications/utilities/surface/surfaceInflate/Make/options index dd995740b3..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfaceInflate/Make/options +++ b/applications/utilities/surface/surfaceInflate/Make/options @@ -1,9 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ - -lsurfMesh \ -lmeshTools diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/Make/options b/applications/utilities/surface/surfaceMeshConvertTesting/Make/options index 3b91e457ea..a504dd8617 100644 --- a/applications/utilities/surface/surfaceMeshConvertTesting/Make/options +++ b/applications/utilities/surface/surfaceMeshConvertTesting/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude -EXE_LIBS = -ltriSurface -lsurfMesh +EXE_LIBS = \ + -lsurfMesh diff --git a/applications/utilities/surface/surfaceOrient/Make/options b/applications/utilities/surface/surfaceOrient/Make/options index 2db41f545a..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfaceOrient/Make/options +++ b/applications/utilities/surface/surfaceOrient/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfacePatch/Make/options b/applications/utilities/surface/surfacePatch/Make/options index a8173dc045..5319623bf1 100644 --- a/applications/utilities/surface/surfacePatch/Make/options +++ b/applications/utilities/surface/surfacePatch/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ -IsearchableSurfaceModifier \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude - EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfacePointMerge/Make/options b/applications/utilities/surface/surfacePointMerge/Make/options index 9f08e8d2a8..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfacePointMerge/Make/options +++ b/applications/utilities/surface/surfacePointMerge/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfaceRedistributePar/Make/options b/applications/utilities/surface/surfaceRedistributePar/Make/options index d836881301..452e1e204f 100644 --- a/applications/utilities/surface/surfaceRedistributePar/Make/options +++ b/applications/utilities/surface/surfaceRedistributePar/Make/options @@ -1,12 +1,11 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \ -I$(LIB_SRC)/parallel/distributed/lnInclude EXE_LIBS = \ - -ldistributed \ -lmeshTools \ - -ltriSurface \ + -ldistributed \ -ldecompose diff --git a/applications/utilities/surface/surfaceRefineRedGreen/Make/options b/applications/utilities/surface/surfaceRefineRedGreen/Make/options index 9f08e8d2a8..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfaceRefineRedGreen/Make/options +++ b/applications/utilities/surface/surfaceRefineRedGreen/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfaceSplitByPatch/Make/options b/applications/utilities/surface/surfaceSplitByPatch/Make/options index 717768279d..a504dd8617 100644 --- a/applications/utilities/surface/surfaceSplitByPatch/Make/options +++ b/applications/utilities/surface/surfaceSplitByPatch/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface - + -lsurfMesh diff --git a/applications/utilities/surface/surfaceSplitByTopology/Make/options b/applications/utilities/surface/surfaceSplitByTopology/Make/options index 717768279d..a504dd8617 100644 --- a/applications/utilities/surface/surfaceSplitByTopology/Make/options +++ b/applications/utilities/surface/surfaceSplitByTopology/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface - + -lsurfMesh diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/Make/options b/applications/utilities/surface/surfaceSplitNonManifolds/Make/options index 9f08e8d2a8..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfaceSplitNonManifolds/Make/options +++ b/applications/utilities/surface/surfaceSplitNonManifolds/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface + -lmeshTools diff --git a/applications/utilities/surface/surfaceSubset/Make/options b/applications/utilities/surface/surfaceSubset/Make/options index f535c206fc..d5ff5b3e40 100644 --- a/applications/utilities/surface/surfaceSubset/Make/options +++ b/applications/utilities/surface/surfaceSubset/Make/options @@ -1,8 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lmeshTools \ - -ltriSurface - + -lmeshTools diff --git a/applications/utilities/surface/surfaceToPatch/Make/options b/applications/utilities/surface/surfaceToPatch/Make/options index 6b0ab4880e..87038840ec 100644 --- a/applications/utilities/surface/surfaceToPatch/Make/options +++ b/applications/utilities/surface/surfaceToPatch/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude - EXE_LIBS = \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh diff --git a/src/Allwmake b/src/Allwmake index 4934d5be21..1e71c42e0c 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -28,7 +28,6 @@ wmake $targetType OpenFOAM wmake $targetType fileFormats wmake $targetType surfMesh -wmake $targetType triSurface wmake $targetType meshTools # Decomposition methods needed by dummyThirdParty diff --git a/src/conversion/Make/options b/src/conversion/Make/options index 4ff461186c..22e6c0f6f1 100644 --- a/src/conversion/Make/options +++ b/src/conversion/Make/options @@ -1,9 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lfileFormats \ -lfiniteVolume \ -lmeshTools diff --git a/src/conversion/ccm/Make/options b/src/conversion/ccm/Make/options index ef4b6bb279..3272da3576 100644 --- a/src/conversion/ccm/Make/options +++ b/src/conversion/ccm/Make/options @@ -3,9 +3,9 @@ EXE_INC = \ /* -DDEBUG_BAFFLES */ \ /* -DDEBUG_CCMIOREAD */ \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(CCMIO_ARCH_PATH)/include LIB_LIBS = \ diff --git a/src/dynamicFvMesh/Make/options b/src/dynamicFvMesh/Make/options index 966b56964d..3540c13bfc 100644 --- a/src/dynamicFvMesh/Make/options +++ b/src/dynamicFvMesh/Make/options @@ -1,11 +1,10 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh \ -lfiniteVolume diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options index 0757c29678..45af15fb9c 100644 --- a/src/dynamicMesh/Make/options +++ b/src/dynamicMesh/Make/options @@ -1,10 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/mesh/extrudeModel/lnInclude LIB_LIBS = \ -lfiniteVolume \ - -ltriSurface \ + -lsurfMesh \ -lextrudeModel diff --git a/src/finiteVolume/Make/options b/src/finiteVolume/Make/options index 1c1990e5f3..4ac4139c42 100644 --- a/src/finiteVolume/Make/options +++ b/src/finiteVolume/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lOpenFOAM \ - -ltriSurface \ -lmeshTools diff --git a/src/functionObjects/forces/Make/options b/src/functionObjects/forces/Make/options index 3f85a6262b..219b130f9e 100644 --- a/src/functionObjects/forces/Make/options +++ b/src/functionObjects/forces/Make/options @@ -1,13 +1,13 @@ EXE_INC = \ -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ -lfluidThermophysicalModels \ @@ -17,6 +17,5 @@ LIB_LIBS = \ -lincompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \ -lspecie \ - -lfileFormats \ -lfiniteVolume \ -lmeshTools diff --git a/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt b/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt index b5c3bf0815..9dc15138fd 100644 --- a/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt +++ b/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt @@ -13,7 +13,7 @@ endif() include_directories( $ENV{WM_PROJECT_DIR}/src/OpenFOAM/lnInclude $ENV{WM_PROJECT_DIR}/src/OSspecific/$ENV{WM_OSTYPE}/lnInclude - $ENV{WM_PROJECT_DIR}/src/triSurface/lnInclude + $ENV{WM_PROJECT_DIR}/src/surfMesh/lnInclude $ENV{WM_PROJECT_DIR}/src/finiteVolume/lnInclude ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} @@ -70,7 +70,7 @@ file(GLOB SOURCE_FILES set(OPENFOAM_LIBRARIES OpenFOAM - triSurface + surfMesh finiteVolume ) diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options index c4bc792179..94dc2f7c81 100644 --- a/src/fvMotionSolver/Make/options +++ b/src/fvMotionSolver/Make/options @@ -1,15 +1,13 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \ LIB_LIBS = \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh \ - -lfiniteVolume \ - -lfileFormats + -lfiniteVolume /*-lforces include in controlDict if needed */ diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options index bf6ca71abf..6f44ed6912 100644 --- a/src/mesh/blockMesh/Make/options +++ b/src/mesh/blockMesh/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/surfMesh/lnInclude + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -lmeshTools \ - -lfileFormats \ - -lsurfMesh + -lmeshTools diff --git a/src/mesh/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options index 2dd02e7d86..979289742c 100644 --- a/src/mesh/extrudeModel/Make/options +++ b/src/mesh/extrudeModel/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude LIB_LIBS = \ diff --git a/src/mesh/snappyHexMesh/Make/options b/src/mesh/snappyHexMesh/Make/options index d3db7112b5..9a7fe18cd6 100644 --- a/src/mesh/snappyHexMesh/Make/options +++ b/src/mesh/snappyHexMesh/Make/options @@ -3,17 +3,14 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -ldynamicMesh \ -lfiniteVolume \ -llagrangian \ -lmeshTools \ - -lsurfMesh \ - -ltriSurface \ -lfvMotionSolvers \ -ldistributed diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options index 98853e61fb..210c655896 100644 --- a/src/meshTools/Make/options +++ b/src/meshTools/Make/options @@ -1,8 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude LIB_LIBS = \ - -ltriSurface \ -lsurfMesh diff --git a/src/parallel/distributed/Make/options b/src/parallel/distributed/Make/options index 6753a2306c..232875c504 100644 --- a/src/parallel/distributed/Make/options +++ b/src/parallel/distributed/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude LIB_LIBS = \ - -ltriSurface \ - -ldecompositionMethods \ - -lmeshTools + -lmeshTools \ + -ldecompositionMethods diff --git a/src/rigidBodyMeshMotion/Make/options b/src/rigidBodyMeshMotion/Make/options index 708015aaaf..dd66786ace 100644 --- a/src/rigidBodyMeshMotion/Make/options +++ b/src/rigidBodyMeshMotion/Make/options @@ -1,14 +1,13 @@ EXE_INC = \ -I$(LIB_SRC)/rigidBodyDynamics/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude LIB_LIBS = \ -lrigidBodyDynamics \ -lforces \ -lmeshTools \ - -lfileFormats \ -ldynamicMesh diff --git a/src/sampling/Make/options b/src/sampling/Make/options index 00d418481b..2a3f639795 100644 --- a/src/sampling/Make/options +++ b/src/sampling/Make/options @@ -1,19 +1,15 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/dynamicMesh/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \ + -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude - LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lsurfMesh \ - -ltriSurface \ - -llagrangian \ + -lconversion \ -ldynamicMesh \ - -lconversion + -llagrangian diff --git a/src/sixDoFRigidBodyMotion/Make/options b/src/sixDoFRigidBodyMotion/Make/options index 11834cbddf..cad98a1c41 100644 --- a/src/sixDoFRigidBodyMotion/Make/options +++ b/src/sixDoFRigidBodyMotion/Make/options @@ -1,12 +1,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/functionObjects/forces/lnInclude \ - -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude LIB_LIBS = \ - -lforces \ -lmeshTools \ - -lfileFormats \ + -lforces \ -ldynamicMesh diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files index e0a2b486e4..10d6171c20 100644 --- a/src/surfMesh/Make/files +++ b/src/surfMesh/Make/files @@ -40,4 +40,30 @@ $(surfaceFormats)/vtk/VTKsurfaceFormatRunTime.C $(surfaceFormats)/x3d/X3DsurfaceFormatCore.C $(surfaceFormats)/x3d/X3DsurfaceFormatRunTime.C +triSurface/triSurface.C +triSurface/triSurfaceAddressing.C +triSurface/stitchTriangles.C + +triSurface/fields/triSurfaceFields.C +triSurface/patches/geometricSurfacePatch.C +triSurface/patches/surfacePatch.C + +interfaces = triSurface/interfaces +$(interfaces)/STL/writeSTL.C +$(interfaces)/STL/readSTL.C +$(interfaces)/GTS/writeGTS.C +$(interfaces)/GTS/readGTS.C +$(interfaces)/OBJ/readOBJ.C +$(interfaces)/OBJ/writeOBJ.C +$(interfaces)/SMESH/writeSMESH.C +$(interfaces)/OFF/readOFF.C +$(interfaces)/OFF/writeOFF.C +$(interfaces)/TRI/writeTRI.C +$(interfaces)/TRI/readTRI.C +$(interfaces)/AC3D/readAC.C +$(interfaces)/AC3D/writeAC.C +$(interfaces)/VTK/readVTK.C +$(interfaces)/VTK/writeVTK.C +$(interfaces)/NAS/readNAS.C + LIB = $(FOAM_LIBBIN)/libsurfMesh diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.C b/src/surfMesh/triSurface/fields/triSurfaceFields.C similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceFields.C rename to src/surfMesh/triSurface/fields/triSurfaceFields.C diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.H b/src/surfMesh/triSurface/fields/triSurfaceFields.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceFields.H rename to src/surfMesh/triSurface/fields/triSurfaceFields.H diff --git a/src/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H b/src/surfMesh/triSurface/fields/triSurfaceFieldsFwd.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H rename to src/surfMesh/triSurface/fields/triSurfaceFieldsFwd.H diff --git a/src/triSurface/triSurfaceFields/triSurfaceGeoMesh.H b/src/surfMesh/triSurface/fields/triSurfaceGeoMesh.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceGeoMesh.H rename to src/surfMesh/triSurface/fields/triSurfaceGeoMesh.H diff --git a/src/triSurface/triSurfaceFields/triSurfacePointGeoMesh.H b/src/surfMesh/triSurface/fields/triSurfacePointGeoMesh.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfacePointGeoMesh.H rename to src/surfMesh/triSurface/fields/triSurfacePointGeoMesh.H diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/surfMesh/triSurface/interfaces/AC3D/readAC.C similarity index 100% rename from src/triSurface/triSurface/interfaces/AC3D/readAC.C rename to src/surfMesh/triSurface/interfaces/AC3D/readAC.C diff --git a/src/triSurface/triSurface/interfaces/AC3D/writeAC.C b/src/surfMesh/triSurface/interfaces/AC3D/writeAC.C similarity index 100% rename from src/triSurface/triSurface/interfaces/AC3D/writeAC.C rename to src/surfMesh/triSurface/interfaces/AC3D/writeAC.C diff --git a/src/triSurface/triSurface/interfaces/GTS/readGTS.C b/src/surfMesh/triSurface/interfaces/GTS/readGTS.C similarity index 100% rename from src/triSurface/triSurface/interfaces/GTS/readGTS.C rename to src/surfMesh/triSurface/interfaces/GTS/readGTS.C diff --git a/src/triSurface/triSurface/interfaces/GTS/writeGTS.C b/src/surfMesh/triSurface/interfaces/GTS/writeGTS.C similarity index 100% rename from src/triSurface/triSurface/interfaces/GTS/writeGTS.C rename to src/surfMesh/triSurface/interfaces/GTS/writeGTS.C diff --git a/src/triSurface/triSurface/interfaces/NAS/readNAS.C b/src/surfMesh/triSurface/interfaces/NAS/readNAS.C similarity index 100% rename from src/triSurface/triSurface/interfaces/NAS/readNAS.C rename to src/surfMesh/triSurface/interfaces/NAS/readNAS.C diff --git a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C b/src/surfMesh/triSurface/interfaces/OBJ/readOBJ.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OBJ/readOBJ.C rename to src/surfMesh/triSurface/interfaces/OBJ/readOBJ.C diff --git a/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C b/src/surfMesh/triSurface/interfaces/OBJ/writeOBJ.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C rename to src/surfMesh/triSurface/interfaces/OBJ/writeOBJ.C diff --git a/src/triSurface/triSurface/interfaces/OFF/readOFF.C b/src/surfMesh/triSurface/interfaces/OFF/readOFF.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OFF/readOFF.C rename to src/surfMesh/triSurface/interfaces/OFF/readOFF.C diff --git a/src/triSurface/triSurface/interfaces/OFF/writeOFF.C b/src/surfMesh/triSurface/interfaces/OFF/writeOFF.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OFF/writeOFF.C rename to src/surfMesh/triSurface/interfaces/OFF/writeOFF.C diff --git a/src/triSurface/triSurface/interfaces/SMESH/writeSMESH.C b/src/surfMesh/triSurface/interfaces/SMESH/writeSMESH.C similarity index 100% rename from src/triSurface/triSurface/interfaces/SMESH/writeSMESH.C rename to src/surfMesh/triSurface/interfaces/SMESH/writeSMESH.C diff --git a/src/triSurface/triSurface/interfaces/STL/readSTL.C b/src/surfMesh/triSurface/interfaces/STL/readSTL.C similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/readSTL.C rename to src/surfMesh/triSurface/interfaces/STL/readSTL.C diff --git a/src/triSurface/triSurface/interfaces/STL/writeSTL.C b/src/surfMesh/triSurface/interfaces/STL/writeSTL.C similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/writeSTL.C rename to src/surfMesh/triSurface/interfaces/STL/writeSTL.C diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/surfMesh/triSurface/interfaces/TRI/readTRI.C similarity index 100% rename from src/triSurface/triSurface/interfaces/TRI/readTRI.C rename to src/surfMesh/triSurface/interfaces/TRI/readTRI.C diff --git a/src/triSurface/triSurface/interfaces/TRI/writeTRI.C b/src/surfMesh/triSurface/interfaces/TRI/writeTRI.C similarity index 100% rename from src/triSurface/triSurface/interfaces/TRI/writeTRI.C rename to src/surfMesh/triSurface/interfaces/TRI/writeTRI.C diff --git a/src/triSurface/triSurface/interfaces/VTK/readVTK.C b/src/surfMesh/triSurface/interfaces/VTK/readVTK.C similarity index 100% rename from src/triSurface/triSurface/interfaces/VTK/readVTK.C rename to src/surfMesh/triSurface/interfaces/VTK/readVTK.C diff --git a/src/triSurface/triSurface/interfaces/VTK/writeVTK.C b/src/surfMesh/triSurface/interfaces/VTK/writeVTK.C similarity index 100% rename from src/triSurface/triSurface/interfaces/VTK/writeVTK.C rename to src/surfMesh/triSurface/interfaces/VTK/writeVTK.C diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C b/src/surfMesh/triSurface/patches/geometricSurfacePatch.C similarity index 100% rename from src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C rename to src/surfMesh/triSurface/patches/geometricSurfacePatch.C diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H b/src/surfMesh/triSurface/patches/geometricSurfacePatch.H similarity index 100% rename from src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H rename to src/surfMesh/triSurface/patches/geometricSurfacePatch.H diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H b/src/surfMesh/triSurface/patches/geometricSurfacePatchList.H similarity index 100% rename from src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H rename to src/surfMesh/triSurface/patches/geometricSurfacePatchList.H diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.C b/src/surfMesh/triSurface/patches/surfacePatch.C similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatch.C rename to src/surfMesh/triSurface/patches/surfacePatch.C diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.H b/src/surfMesh/triSurface/patches/surfacePatch.H similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatch.H rename to src/surfMesh/triSurface/patches/surfacePatch.H diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchList.H b/src/surfMesh/triSurface/patches/surfacePatchList.H similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatchList.H rename to src/surfMesh/triSurface/patches/surfacePatchList.H diff --git a/src/triSurface/triSurface/stitchTriangles.C b/src/surfMesh/triSurface/stitchTriangles.C similarity index 100% rename from src/triSurface/triSurface/stitchTriangles.C rename to src/surfMesh/triSurface/stitchTriangles.C diff --git a/src/triSurface/triSurface/triSurface.C b/src/surfMesh/triSurface/triSurface.C similarity index 100% rename from src/triSurface/triSurface/triSurface.C rename to src/surfMesh/triSurface/triSurface.C diff --git a/src/triSurface/triSurface/triSurface.H b/src/surfMesh/triSurface/triSurface.H similarity index 100% rename from src/triSurface/triSurface/triSurface.H rename to src/surfMesh/triSurface/triSurface.H diff --git a/src/triSurface/triSurface/triSurfaceAddressing.C b/src/surfMesh/triSurface/triSurfaceAddressing.C similarity index 100% rename from src/triSurface/triSurface/triSurfaceAddressing.C rename to src/surfMesh/triSurface/triSurfaceAddressing.C diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options index 07c8dcf770..f514104f33 100644 --- a/src/thermophysicalModels/radiation/Make/options +++ b/src/thermophysicalModels/radiation/Make/options @@ -7,8 +7,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/parallel/distributed/lnInclude LIB_LIBS = \ @@ -20,5 +20,4 @@ LIB_LIBS = \ -lthermophysicalProperties \ -lfiniteVolume \ -lmeshTools \ - -ldistributed \ - -ltriSurface + -ldistributed diff --git a/src/triSurface/Make/files b/src/triSurface/Make/files deleted file mode 100644 index ba9df9c53d..0000000000 --- a/src/triSurface/Make/files +++ /dev/null @@ -1,28 +0,0 @@ -triSurface/triSurface.C -triSurface/triSurfaceAddressing.C -triSurface/stitchTriangles.C - -interfaces = triSurface/interfaces -$(interfaces)/STL/writeSTL.C -$(interfaces)/STL/readSTL.C -$(interfaces)/GTS/writeGTS.C -$(interfaces)/GTS/readGTS.C -$(interfaces)/OBJ/readOBJ.C -$(interfaces)/OBJ/writeOBJ.C -$(interfaces)/SMESH/writeSMESH.C -$(interfaces)/OFF/readOFF.C -$(interfaces)/OFF/writeOFF.C -$(interfaces)/TRI/writeTRI.C -$(interfaces)/TRI/readTRI.C -$(interfaces)/AC3D/readAC.C -$(interfaces)/AC3D/writeAC.C -$(interfaces)/VTK/readVTK.C -$(interfaces)/VTK/writeVTK.C -$(interfaces)/NAS/readNAS.C - -triSurface/geometricSurfacePatch/geometricSurfacePatch.C -triSurface/surfacePatch/surfacePatch.C - -triSurfaceFields/triSurfaceFields.C - -LIB = $(FOAM_LIBBIN)/libtriSurface diff --git a/src/triSurface/Make/options b/src/triSurface/Make/options deleted file mode 100644 index 210c655896..0000000000 --- a/src/triSurface/Make/options +++ /dev/null @@ -1,6 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/fileFormats/lnInclude \ - -I$(LIB_SRC)/surfMesh/lnInclude - -LIB_LIBS = \ - -lsurfMesh