From bd927880b78d71a0d3b13ab7826846c09e341066 Mon Sep 17 00:00:00 2001 From: Dominik Christ Date: Thu, 30 Jul 2015 16:20:18 +0100 Subject: [PATCH] merged triSurface and meshTools --- .../immersedBoundary/icoIbFoam/Make/options | 2 -- .../immersedBoundary/interIbFoam/Make/options | 2 -- .../porousSimpleIbFoam/Make/options | 2 -- .../potentialIbFoam/Make/options | 2 -- .../simpleIbFoam/Make/options | 2 -- .../createFaMeshFromStl/Make/options | 5 ++- .../ibContinuityError/Make/options | 1 - .../makeTriSurfaceMesh/Make/options | 2 -- .../refineImmersedBoundaryMesh/Make/options | 2 -- .../surfaceInvertNormal/Make/options | 2 -- .../surfaceNormal/Make/options | 2 -- .../writeIbMasks/Make/options | 2 -- .../mesh/advanced/autoRefineMesh/Make/options | 2 -- .../mesh/advanced/modifyMesh/Make/options | 2 -- .../mesh/advanced/selectCells/Make/options | 2 -- .../mesh/advanced/splitCells/Make/options | 2 -- .../conversion/ideasUnvToFoam/Make/options | 2 -- .../cfMesh/FLMAToSurface/Make/options | 4 +-- .../cfMesh/FMSToSurface/Make/options | 2 -- .../generation/cfMesh/FMSToVTK/Make/options | 2 -- .../cfMesh/cartesian2DMesh/Make/options | 2 -- .../cfMesh/cartesianMesh/Make/options | 2 -- .../cfMesh/copySurfaceParts/Make/options | 5 +-- .../extrudeEdgesInto2DSurface/Make/options | 4 +-- .../cfMesh/importSurfaceAsSubset/Make/options | 2 -- .../cfMesh/mergeSurfacePatches/Make/options | 2 -- .../cfMesh/patchesToSubsets/Make/options | 4 +-- .../generation/cfMesh/preparePar/Make/options | 2 -- .../cfMesh/removeSurfaceFacets/Make/options | 4 +-- .../cfMesh/subsetToPatch/Make/options | 6 ++-- .../cfMesh/surfaceFeatureEdges/Make/options | 8 +++-- .../surfaceGenerateBoundingBox/Make/options | 5 +-- .../cfMesh/surfaceToFMS/Make/options | 2 -- .../generation/cfMesh/tetMesh/Make/options | 2 -- .../mesh/manipulation/autoPatch/Make/options | 2 -- .../manipulation/insideCells/Make/options | 2 -- .../mesh/manipulation/objToVTK/Make/options | 2 -- .../sampling/probeLocations/Make/options | 2 -- .../sampling/sample/Make/options | 2 -- .../utilities/surface/surfaceAdd/Make/options | 3 +- .../surface/surfaceAutoPatch/Make/options | 2 -- .../surface/surfaceCheck/Make/options | 2 -- .../surface/surfaceClean/Make/options | 2 -- .../surface/surfaceCoarsen/Make/options | 3 +- .../surface/surfaceConvert/Make/options | 3 +- .../surfaceFeatureConvert/Make/options | 2 -- .../surfaceFeatureExtract/Make/options | 2 -- .../surface/surfaceFind/Make/options | 3 +- .../surfaceMeshConvertTesting/Make/options | 2 -- .../surfaceMeshTriangulate/Make/options | 2 -- .../surface/surfaceOrient/Make/options | 2 -- .../surface/surfacePointMerge/Make/options | 2 -- .../surfaceRedistributePar/Make/options | 2 -- .../surfaceRefineRedGreen/Make/options | 2 -- .../surface/surfaceSmooth/Make/options | 3 +- .../surface/surfaceSplitByPatch/Make/options | 3 +- .../surfaceSplitNonManifolds/Make/options | 2 -- .../surface/surfaceSubset/Make/options | 2 -- .../surface/surfaceToPatch/Make/options | 2 -- .../surfaceTransformPoints/Make/options | 3 +- src/Allwmake | 1 - src/dynamicMesh/dynamicFvMesh/Make/options | 2 -- src/dynamicMesh/dynamicMesh/Make/options | 2 -- .../meshMotion/RBFMotionSolver/Make/options | 2 -- .../meshMotion/fvMotionSolver/Make/options | 2 -- src/finiteVolume/Make/options | 2 -- .../immersedBoundary/Make/options | 2 -- .../immersedBoundaryForce/Make/options | 2 -- .../immersedBoundaryTurbulence/Make/options | 2 -- src/mesh/autoMesh/Make/options | 2 -- src/meshTools/Make/files | 32 +++++++++++++++++++ src/meshTools/Make/options | 13 ++++++-- .../faceTriangulation/faceTriangulation.C | 0 .../faceTriangulation/faceTriangulation.H | 0 .../meshTriangulation/meshTriangulation.C | 0 .../meshTriangulation/meshTriangulation.H | 0 .../tools/hashSignedLabel/hashSignedLabel.H | 0 .../tools/labelPair/labelPairLookup.H | 0 .../tools/labelledTri/labelledTri.H | 0 .../tools/labelledTri/labelledTriI.H | 0 .../tools/labelledTri/sortLabelledTri.C | 0 .../tools/labelledTri/sortLabelledTri.H | 0 .../geometricSurfacePatch.C | 0 .../geometricSurfacePatch.H | 0 .../geometricSurfacePatchList.H | 0 .../triSurface/interfaces/AC3D/readAC.C | 0 .../triSurface/interfaces/AC3D/writeAC.C | 0 .../triSurface/interfaces/DX/writeDX.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/STLpoint.H | 0 .../triSurface/interfaces/STL/STLpointI.H | 0 .../triSurface/interfaces/STL/STLtriangle.H | 0 .../triSurface/interfaces/STL/STLtriangleI.H | 0 .../triSurface/interfaces/STL/readSTL.C | 0 .../triSurface/interfaces/STL/readSTLASCII.L | 0 .../triSurface/interfaces/STL/readSTLBINARY.C | 0 .../triSurface/interfaces/STL/writeSTL.C | 0 .../triSurface/interfaces/TRI/readTRI.C | 0 .../triSurface/interfaces/TRI/writeTRI.C | 0 .../triSurface/interfaces/VTK/writeVTK.C | 0 .../triSurface/triSurface/stitchTriangles.C | 0 .../triSurface/surfacePatch/surfacePatch.C | 0 .../triSurface/surfacePatch/surfacePatch.H | 0 .../surfacePatch/surfacePatchIOList.C | 0 .../surfacePatch/surfacePatchIOList.H | 0 .../surfacePatch/surfacePatchList.H | 0 .../treeDataTriSurface/treeDataTriSurface.C | 0 .../treeDataTriSurface/treeDataTriSurface.H | 0 .../triSurface/triSurface/triSurface.C | 0 .../triSurface/triSurface/triSurface.H | 0 .../triSurface/triSurfaceAddressing.C | 0 .../triSurfaceFields/triSurfaceFields.C | 0 .../triSurfaceFields/triSurfaceFields.H | 0 .../triSurfaceFields/triSurfaceFieldsFwd.H | 0 .../triSurfaceFields/triSurfaceGeoMesh.H | 0 .../triSurfacePointFields.C | 0 .../triSurfacePointFields.H | 0 .../triSurfacePointFieldsFwd.H | 0 .../triSurfacePointMesh.H | 0 src/sampling/Make/options | 2 -- src/solidModels/Make/options | 2 -- .../refineSphereMesh/Make/options | 2 -- .../refineThickPlateMesh/Make/options | 2 -- .../RBFMotionFunction/Make/options | 2 -- 131 files changed, 74 insertions(+), 153 deletions(-) rename src/{ => meshTools}/triSurface/faceTriangulation/faceTriangulation.C (100%) rename src/{ => meshTools}/triSurface/faceTriangulation/faceTriangulation.H (100%) rename src/{ => meshTools}/triSurface/meshTriangulation/meshTriangulation.C (100%) rename src/{ => meshTools}/triSurface/meshTriangulation/meshTriangulation.H (100%) rename src/{ => meshTools}/triSurface/tools/hashSignedLabel/hashSignedLabel.H (100%) rename src/{ => meshTools}/triSurface/tools/labelPair/labelPairLookup.H (100%) rename src/{ => meshTools}/triSurface/tools/labelledTri/labelledTri.H (100%) rename src/{ => meshTools}/triSurface/tools/labelledTri/labelledTriI.H (100%) rename src/{ => meshTools}/triSurface/tools/labelledTri/sortLabelledTri.C (100%) rename src/{ => meshTools}/triSurface/tools/labelledTri/sortLabelledTri.H (100%) rename src/{ => meshTools}/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C (100%) rename src/{ => meshTools}/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H (100%) rename src/{ => meshTools}/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/AC3D/readAC.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/AC3D/writeAC.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/DX/writeDX.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/GTS/readGTS.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/GTS/writeGTS.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/NAS/readNAS.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/OBJ/readOBJ.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/OBJ/writeOBJ.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/OFF/readOFF.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/OFF/writeOFF.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/SMESH/writeSMESH.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/STLpoint.H (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/STLpointI.H (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/STLtriangle.H (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/STLtriangleI.H (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/readSTL.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/readSTLASCII.L (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/readSTLBINARY.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/STL/writeSTL.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/TRI/readTRI.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/TRI/writeTRI.C (100%) rename src/{ => meshTools}/triSurface/triSurface/interfaces/VTK/writeVTK.C (100%) rename src/{ => meshTools}/triSurface/triSurface/stitchTriangles.C (100%) rename src/{ => meshTools}/triSurface/triSurface/surfacePatch/surfacePatch.C (100%) rename src/{ => meshTools}/triSurface/triSurface/surfacePatch/surfacePatch.H (100%) rename src/{ => meshTools}/triSurface/triSurface/surfacePatch/surfacePatchIOList.C (100%) rename src/{ => meshTools}/triSurface/triSurface/surfacePatch/surfacePatchIOList.H (100%) rename src/{ => meshTools}/triSurface/triSurface/surfacePatch/surfacePatchList.H (100%) rename src/{ => meshTools}/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C (100%) rename src/{ => meshTools}/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H (100%) rename src/{ => meshTools}/triSurface/triSurface/triSurface.C (100%) rename src/{ => meshTools}/triSurface/triSurface/triSurface.H (100%) rename src/{ => meshTools}/triSurface/triSurface/triSurfaceAddressing.C (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfaceFields.C (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfaceFields.H (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfaceGeoMesh.H (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.C (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.H (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFieldsFwd.H (100%) rename src/{ => meshTools}/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointMesh.H (100%) diff --git a/applications/solvers/immersedBoundary/icoIbFoam/Make/options b/applications/solvers/immersedBoundary/icoIbFoam/Make/options index 8b88922bf..b2ecef30a 100644 --- a/applications/solvers/immersedBoundary/icoIbFoam/Make/options +++ b/applications/solvers/immersedBoundary/icoIbFoam/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/solvers/immersedBoundary/interIbFoam/Make/options b/applications/solvers/immersedBoundary/interIbFoam/Make/options index 7e6f08025..41ed9d472 100644 --- a/applications/solvers/immersedBoundary/interIbFoam/Make/options +++ b/applications/solvers/immersedBoundary/interIbFoam/Make/options @@ -4,7 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude @@ -15,7 +14,6 @@ EXE_LIBS = \ -lincompressibleRASModels \ -lincompressibleLESModels \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/options b/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/options index 74bed7bf7..0d53c03a0 100644 --- a/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/options +++ b/applications/solvers/immersedBoundary/porousSimpleIbFoam/Make/options @@ -4,7 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude @@ -12,7 +11,6 @@ EXE_LIBS = \ -lincompressibleRASModels \ -lincompressibleTransportModels \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/solvers/immersedBoundary/potentialIbFoam/Make/options b/applications/solvers/immersedBoundary/potentialIbFoam/Make/options index 8b88922bf..b2ecef30a 100644 --- a/applications/solvers/immersedBoundary/potentialIbFoam/Make/options +++ b/applications/solvers/immersedBoundary/potentialIbFoam/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/solvers/immersedBoundary/simpleIbFoam/Make/options b/applications/solvers/immersedBoundary/simpleIbFoam/Make/options index 74bed7bf7..0d53c03a0 100644 --- a/applications/solvers/immersedBoundary/simpleIbFoam/Make/options +++ b/applications/solvers/immersedBoundary/simpleIbFoam/Make/options @@ -4,7 +4,6 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude @@ -12,7 +11,6 @@ EXE_LIBS = \ -lincompressibleRASModels \ -lincompressibleTransportModels \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/utilities/finiteArea/createFaMeshFromStl/Make/options b/applications/utilities/finiteArea/createFaMeshFromStl/Make/options index e6d06285d..c2995150b 100644 --- a/applications/utilities/finiteArea/createFaMeshFromStl/Make/options +++ b/applications/utilities/finiteArea/createFaMeshFromStl/Make/options @@ -1,8 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/finiteArea/lnInclude + -I$(LIB_SRC)/finiteArea/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools \ -lfiniteArea diff --git a/applications/utilities/immersedBoundary/ibContinuityError/Make/options b/applications/utilities/immersedBoundary/ibContinuityError/Make/options index 052f05906..6e3331b21 100644 --- a/applications/utilities/immersedBoundary/ibContinuityError/Make/options +++ b/applications/utilities/immersedBoundary/ibContinuityError/Make/options @@ -6,7 +6,6 @@ EXE_INC = \ EXE_LIBS = \ $(FOAM_LIBBIN)/postCalc.o \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/utilities/immersedBoundary/makeTriSurfaceMesh/Make/options b/applications/utilities/immersedBoundary/makeTriSurfaceMesh/Make/options index d68847ac5..530b042bd 100644 --- a/applications/utilities/immersedBoundary/makeTriSurfaceMesh/Make/options +++ b/applications/utilities/immersedBoundary/makeTriSurfaceMesh/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/cfdTools/general/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/Make/options b/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/Make/options index 7e7db4b58..7b542448e 100644 --- a/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/Make/options +++ b/applications/utilities/immersedBoundary/refineImmersedBoundaryMesh/Make/options @@ -2,12 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/utilities/immersedBoundary/surfaceInvertNormal/Make/options b/applications/utilities/immersedBoundary/surfaceInvertNormal/Make/options index 70a8e7108..54c035b8f 100644 --- a/applications/utilities/immersedBoundary/surfaceInvertNormal/Make/options +++ b/applications/utilities/immersedBoundary/surfaceInvertNormal/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/immersedBoundary/surfaceNormal/Make/options b/applications/utilities/immersedBoundary/surfaceNormal/Make/options index 70a8e7108..54c035b8f 100644 --- a/applications/utilities/immersedBoundary/surfaceNormal/Make/options +++ b/applications/utilities/immersedBoundary/surfaceNormal/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/immersedBoundary/writeIbMasks/Make/options b/applications/utilities/immersedBoundary/writeIbMasks/Make/options index 8b88922bf..b2ecef30a 100644 --- a/applications/utilities/immersedBoundary/writeIbMasks/Make/options +++ b/applications/utilities/immersedBoundary/writeIbMasks/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/Make/options b/applications/utilities/mesh/advanced/autoRefineMesh/Make/options index e72670a12..162ee6bdc 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/Make/options +++ b/applications/utilities/mesh/advanced/autoRefineMesh/Make/options @@ -1,11 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/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/advanced/modifyMesh/Make/options b/applications/utilities/mesh/advanced/modifyMesh/Make/options index e73018aa7..ea59d1158 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/Make/options +++ b/applications/utilities/mesh/advanced/modifyMesh/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh diff --git a/applications/utilities/mesh/advanced/selectCells/Make/options b/applications/utilities/mesh/advanced/selectCells/Make/options index 5e3dc0001..3da3b2f84 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/dynamicMesh/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/advanced/splitCells/Make/options b/applications/utilities/mesh/advanced/splitCells/Make/options index 3b4040c37..056572c84 100644 --- a/applications/utilities/mesh/advanced/splitCells/Make/options +++ b/applications/utilities/mesh/advanced/splitCells/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude EXE_LIBS = \ -ldynamicMesh \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options b/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options index aa5ea1d71..db87a0611 100755 --- a/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options +++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/options b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/options index 66a5c1fcb..96088bfed 100644 --- a/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/FLMAToSurface/Make/options @@ -1,6 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lcfMesh -lmeshTools + -lcfMesh -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/options b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/options index f1a680fcc..ddee8d1b1 100644 --- a/applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/FMSToSurface/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools \ -lcfMesh diff --git a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/options b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/options index 6a63c3f1e..f47b3f2b1 100644 --- a/applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/FMSToVTK/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface \ -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/options b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/options index ebf5f659f..d7c491015 100644 --- a/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/cartesian2DMesh/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface \ -lcfMesh diff --git a/applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/options b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/options index ebf5f659f..d7c491015 100644 --- a/applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/cartesianMesh/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface \ -lcfMesh diff --git a/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/options b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/options index e5b075d77..b19b9239e 100644 --- a/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/copySurfaceParts/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude -EXE_LIBS = -ltriSurface -lcfMesh -lmeshTools +EXE_LIBS = \ + -lcfMesh \ + -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/options b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/options index 829de7b96..b19b9239e 100644 --- a/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/extrudeEdgesInto2DSurface/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lcfMesh -lmeshTools + -lcfMesh \ + -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/options b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/options index 9f62277a5..4e89bc169 100644 --- a/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/importSurfaceAsSubset/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/options b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/options index 6a63c3f1e..f47b3f2b1 100644 --- a/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/mergeSurfacePatches/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface \ -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/options b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/options index 829de7b96..b19b9239e 100644 --- a/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/patchesToSubsets/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lcfMesh -lmeshTools + -lcfMesh \ + -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/preparePar/Make/options b/applications/utilities/mesh/generation/cfMesh/preparePar/Make/options index 49829e06f..86a33da29 100644 --- a/applications/utilities/mesh/generation/cfMesh/preparePar/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/preparePar/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(FOAM_SRC)/meshTools/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface -lmeshTools -lcfMesh diff --git a/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/options b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/options index 829de7b96..b19b9239e 100644 --- a/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/removeSurfaceFacets/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lcfMesh -lmeshTools + -lcfMesh \ + -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/options b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/options index 49829e06f..832e3e4df 100644 --- a/applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/subsetToPatch/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(FOAM_SRC)/meshTools/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude + -I$(FOAM_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface -lmeshTools -lcfMesh + -lmeshTools \ + -lcfMesh diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/options b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/options index c50af6d81..b19b9239e 100644 --- a/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/surfaceFeatureEdges/Make/options @@ -1,5 +1,7 @@ -EXE_INC = -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ +EXE_INC = \ + -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude -EXE_LIBS = -ltriSurface -lcfMesh -lmeshTools +EXE_LIBS = \ + -lcfMesh \ + -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/options b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/options index e5b075d77..c81bae87e 100644 --- a/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/surfaceGenerateBoundingBox/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude -EXE_LIBS = -ltriSurface -lcfMesh -lmeshTools +EXE_LIBS = \ + -lcfMesh \ + -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/options b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/options index 9f62277a5..4e89bc169 100644 --- a/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/surfaceToFMS/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(FOAM_SRC)/mesh/cfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lcfMesh \ -lmeshTools diff --git a/applications/utilities/mesh/generation/cfMesh/tetMesh/Make/options b/applications/utilities/mesh/generation/cfMesh/tetMesh/Make/options index ebf5f659f..d7c491015 100644 --- a/applications/utilities/mesh/generation/cfMesh/tetMesh/Make/options +++ b/applications/utilities/mesh/generation/cfMesh/tetMesh/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/mesh/cfMesh/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface \ -lcfMesh diff --git a/applications/utilities/mesh/manipulation/autoPatch/Make/options b/applications/utilities/mesh/manipulation/autoPatch/Make/options index a6d80c2b7..12efd0846 100644 --- a/applications/utilities/mesh/manipulation/autoPatch/Make/options +++ b/applications/utilities/mesh/manipulation/autoPatch/Make/options @@ -1,10 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude EXE_LIBS = \ - -ltriSurface \ -ldynamicMesh \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/insideCells/Make/options b/applications/utilities/mesh/manipulation/insideCells/Make/options index 07bbf1aab..62fb20df1 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 EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/mesh/manipulation/objToVTK/Make/options b/applications/utilities/mesh/manipulation/objToVTK/Make/options index 0548bdd02..21b580ee6 100644 --- a/applications/utilities/mesh/manipulation/objToVTK/Make/options +++ b/applications/utilities/mesh/manipulation/objToVTK/Make/options @@ -1,8 +1,6 @@ /* EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface */ diff --git a/applications/utilities/postProcessing/sampling/probeLocations/Make/options b/applications/utilities/postProcessing/sampling/probeLocations/Make/options index 04b22c08a..773667f55 100644 --- a/applications/utilities/postProcessing/sampling/probeLocations/Make/options +++ b/applications/utilities/postProcessing/sampling/probeLocations/Make/options @@ -2,12 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lsampling \ - -ltriSurface \ -llagrangian diff --git a/applications/utilities/postProcessing/sampling/sample/Make/options b/applications/utilities/postProcessing/sampling/sample/Make/options index ae583f338..408171bfe 100644 --- a/applications/utilities/postProcessing/sampling/sample/Make/options +++ b/applications/utilities/postProcessing/sampling/sample/Make/options @@ -3,7 +3,6 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ @@ -11,5 +10,4 @@ EXE_LIBS = \ -lmeshTools \ -lsampling \ -lsurfMesh \ - -ltriSurface \ -llagrangian diff --git a/applications/utilities/surface/surfaceAdd/Make/options b/applications/utilities/surface/surfaceAdd/Make/options index c746f7e0f..54c035b8f 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)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceAutoPatch/Make/options b/applications/utilities/surface/surfaceAutoPatch/Make/options index 9f08e8d2a..b83e5e8ab 100644 --- a/applications/utilities/surface/surfaceAutoPatch/Make/options +++ b/applications/utilities/surface/surfaceAutoPatch/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceCheck/Make/options b/applications/utilities/surface/surfaceCheck/Make/options index 9c7d90788..f63a1a87c 100644 --- a/applications/utilities/surface/surfaceCheck/Make/options +++ b/applications/utilities/surface/surfaceCheck/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceClean/Make/options b/applications/utilities/surface/surfaceClean/Make/options index 2db41f545..18ff94699 100644 --- a/applications/utilities/surface/surfaceClean/Make/options +++ b/applications/utilities/surface/surfaceClean/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceCoarsen/Make/options b/applications/utilities/surface/surfaceCoarsen/Make/options index 965309e4d..34178cb7b 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)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceConvert/Make/options b/applications/utilities/surface/surfaceConvert/Make/options index c746f7e0f..54c035b8f 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)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceFeatureConvert/Make/options b/applications/utilities/surface/surfaceFeatureConvert/Make/options index f87dafaa5..c2415625a 100644 --- a/applications/utilities/surface/surfaceFeatureConvert/Make/options +++ b/applications/utilities/surface/surfaceFeatureConvert/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ -ledgeMesh \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceFeatureExtract/Make/options b/applications/utilities/surface/surfaceFeatureExtract/Make/options index 02e49d32c..45ebbd803 100644 --- a/applications/utilities/surface/surfaceFeatureExtract/Make/options +++ b/applications/utilities/surface/surfaceFeatureExtract/Make/options @@ -1,8 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/cfdTools/general/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceFind/Make/options b/applications/utilities/surface/surfaceFind/Make/options index c746f7e0f..54c035b8f 100644 --- a/applications/utilities/surface/surfaceFind/Make/options +++ b/applications/utilities/surface/surfaceFind/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceMeshConvertTesting/Make/options b/applications/utilities/surface/surfaceMeshConvertTesting/Make/options index d51d01848..02c293cee 100644 --- a/applications/utilities/surface/surfaceMeshConvertTesting/Make/options +++ b/applications/utilities/surface/surfaceMeshConvertTesting/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools \ -lsurfMesh diff --git a/applications/utilities/surface/surfaceMeshTriangulate/Make/options b/applications/utilities/surface/surfaceMeshTriangulate/Make/options index f4095bdf0..990b27070 100644 --- a/applications/utilities/surface/surfaceMeshTriangulate/Make/options +++ b/applications/utilities/surface/surfaceMeshTriangulate/Make/options @@ -1,8 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceOrient/Make/options b/applications/utilities/surface/surfaceOrient/Make/options index 2db41f545..18ff94699 100644 --- a/applications/utilities/surface/surfaceOrient/Make/options +++ b/applications/utilities/surface/surfaceOrient/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfacePointMerge/Make/options b/applications/utilities/surface/surfacePointMerge/Make/options index 9f08e8d2a..b83e5e8ab 100644 --- a/applications/utilities/surface/surfacePointMerge/Make/options +++ b/applications/utilities/surface/surfacePointMerge/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceRedistributePar/Make/options b/applications/utilities/surface/surfaceRedistributePar/Make/options index 2db41f545..18ff94699 100644 --- a/applications/utilities/surface/surfaceRedistributePar/Make/options +++ b/applications/utilities/surface/surfaceRedistributePar/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceRefineRedGreen/Make/options b/applications/utilities/surface/surfaceRefineRedGreen/Make/options index 9f08e8d2a..b83e5e8ab 100644 --- a/applications/utilities/surface/surfaceRefineRedGreen/Make/options +++ b/applications/utilities/surface/surfaceRefineRedGreen/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceSmooth/Make/options b/applications/utilities/surface/surfaceSmooth/Make/options index c746f7e0f..54c035b8f 100644 --- a/applications/utilities/surface/surfaceSmooth/Make/options +++ b/applications/utilities/surface/surfaceSmooth/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceSplitByPatch/Make/options b/applications/utilities/surface/surfaceSplitByPatch/Make/options index 03154265d..8940e1ec4 100644 --- a/applications/utilities/surface/surfaceSplitByPatch/Make/options +++ b/applications/utilities/surface/surfaceSplitByPatch/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceSplitNonManifolds/Make/options b/applications/utilities/surface/surfaceSplitNonManifolds/Make/options index 9f08e8d2a..b83e5e8ab 100644 --- a/applications/utilities/surface/surfaceSplitNonManifolds/Make/options +++ b/applications/utilities/surface/surfaceSplitNonManifolds/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude EXE_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/applications/utilities/surface/surfaceSubset/Make/options b/applications/utilities/surface/surfaceSubset/Make/options index 278947b56..8940e1ec4 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)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/applications/utilities/surface/surfaceToPatch/Make/options b/applications/utilities/surface/surfaceToPatch/Make/options index c988be760..21a8a6580 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)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh diff --git a/applications/utilities/surface/surfaceTransformPoints/Make/options b/applications/utilities/surface/surfaceTransformPoints/Make/options index c746f7e0f..54c035b8f 100644 --- a/applications/utilities/surface/surfaceTransformPoints/Make/options +++ b/applications/utilities/surface/surfaceTransformPoints/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/src/Allwmake b/src/Allwmake index d77033182..b3a191dd7 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -32,7 +32,6 @@ decompositionMethods/Allwmake wmake libso lagrangian/basic -wmake libso triSurface wmake libso edgeMesh wmake libso surfMesh diff --git a/src/dynamicMesh/dynamicFvMesh/Make/options b/src/dynamicMesh/dynamicFvMesh/Make/options index 55c654e27..aec1454fa 100644 --- a/src/dynamicMesh/dynamicFvMesh/Make/options +++ b/src/dynamicMesh/dynamicFvMesh/Make/options @@ -1,5 +1,4 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ @@ -12,7 +11,6 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/meshMotion/mesquiteMotionSolver/lnInclude LIB_LIBS = \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh \ -lfiniteVolume \ diff --git a/src/dynamicMesh/dynamicMesh/Make/options b/src/dynamicMesh/dynamicMesh/Make/options index e6dffb360..ac77b8044 100644 --- a/src/dynamicMesh/dynamicMesh/Make/options +++ b/src/dynamicMesh/dynamicMesh/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude LIB_LIBS = \ -lmeshTools \ - -ltriSurface diff --git a/src/dynamicMesh/meshMotion/RBFMotionSolver/Make/options b/src/dynamicMesh/meshMotion/RBFMotionSolver/Make/options index 19447700c..6dd336706 100644 --- a/src/dynamicMesh/meshMotion/RBFMotionSolver/Make/options +++ b/src/dynamicMesh/meshMotion/RBFMotionSolver/Make/options @@ -2,9 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude LIB_LIBS = \ -lfiniteVolume \ -ldynamicMesh \ - -ltriSurface diff --git a/src/dynamicMesh/meshMotion/fvMotionSolver/Make/options b/src/dynamicMesh/meshMotion/fvMotionSolver/Make/options index 1c7e886b7..55637b2ef 100644 --- a/src/dynamicMesh/meshMotion/fvMotionSolver/Make/options +++ b/src/dynamicMesh/meshMotion/fvMotionSolver/Make/options @@ -1,12 +1,10 @@ EXE_INC = \ -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -ltriSurface \ -lmeshTools \ -ldynamicMesh \ -lfiniteVolume diff --git a/src/finiteVolume/Make/options b/src/finiteVolume/Make/options index b8402e2b9..4b2f0a059 100644 --- a/src/finiteVolume/Make/options +++ b/src/finiteVolume/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ - -ltriSurface \ -lmeshTools diff --git a/src/immersedBoundary/immersedBoundary/Make/options b/src/immersedBoundary/immersedBoundary/Make/options index 2005599b4..5efa63e86 100644 --- a/src/immersedBoundary/immersedBoundary/Make/options +++ b/src/immersedBoundary/immersedBoundary/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -8,7 +7,6 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/src/immersedBoundary/immersedBoundaryForce/Make/options b/src/immersedBoundary/immersedBoundaryForce/Make/options index 707ea8d23..e73518d14 100644 --- a/src/immersedBoundary/immersedBoundaryForce/Make/options +++ b/src/immersedBoundary/immersedBoundaryForce/Make/options @@ -2,7 +2,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I../immersedBoundary/lnInclude \ @@ -18,7 +17,6 @@ LIB_LIBS = \ -lcompressibleRASModels \ -lcompressibleLESModels \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/src/immersedBoundary/immersedBoundaryTurbulence/Make/options b/src/immersedBoundary/immersedBoundaryTurbulence/Make/options index e254982e0..fd05812e8 100644 --- a/src/immersedBoundary/immersedBoundaryTurbulence/Make/options +++ b/src/immersedBoundary/immersedBoundaryTurbulence/Make/options @@ -6,7 +6,6 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ @@ -19,7 +18,6 @@ LIB_LIBS = \ -lincompressibleRASModels \ -lincompressibleLESModels \ -lincompressibleTransportModels \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options index 289c78c99..d29e43b74 100644 --- a/src/mesh/autoMesh/Make/options +++ b/src/mesh/autoMesh/Make/options @@ -6,7 +6,6 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude LIB_LIBS = \ -ldecompositionMethods \ @@ -16,4 +15,3 @@ LIB_LIBS = \ -llagrangian \ -lmeshTools \ -ledgeMesh \ - -ltriSurface diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files index e2c3f74bf..fcd0d492c 100644 --- a/src/meshTools/Make/files +++ b/src/meshTools/Make/files @@ -87,8 +87,40 @@ $(pointSources)/nearestToPoint/nearestToPoint.C surfaceSets/surfaceSets.C +triSurfaceInterfaces = triSurface/triSurface/interfaces +triSurface/triSurface/triSurface.C +triSurface/triSurface/triSurfaceAddressing.C +triSurface/triSurface/stitchTriangles.C +triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C +triSurface/faceTriangulation/faceTriangulation.C +triSurface/meshTriangulation/meshTriangulation.C +triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C +triSurface/triSurface/surfacePatch/surfacePatch.C +triSurface/triSurface/surfacePatch/surfacePatchIOList.C +triSurface/tools/labelledTri/sortLabelledTri.C +triSurface/triSurfaceFields/triSurfaceFields.C +triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.C triSurface/orientedSurface/orientedSurface.C triSurface/surfaceLocation/surfaceLocation.C +$(triSurfaceInterfaces)/STL/writeSTL.C +$(triSurfaceInterfaces)/STL/readSTL.C +$(triSurfaceInterfaces)/STL/readSTLASCII.L +$(triSurfaceInterfaces)/STL/readSTLBINARY.C +$(triSurfaceInterfaces)/GTS/writeGTS.C +$(triSurfaceInterfaces)/GTS/readGTS.C +$(triSurfaceInterfaces)/OBJ/readOBJ.C +$(triSurfaceInterfaces)/OBJ/writeOBJ.C +$(triSurfaceInterfaces)/SMESH/writeSMESH.C +$(triSurfaceInterfaces)/OFF/readOFF.C +$(triSurfaceInterfaces)/OFF/writeOFF.C +$(triSurfaceInterfaces)/TRI/writeTRI.C +$(triSurfaceInterfaces)/TRI/readTRI.C +$(triSurfaceInterfaces)/DX/writeDX.C +$(triSurfaceInterfaces)/AC3D/readAC.C +$(triSurfaceInterfaces)/AC3D/writeAC.C +$(triSurfaceInterfaces)/VTK/writeVTK.C +$(triSurfaceInterfaces)/NAS/readNAS.C + booleanOps = triSurface/booleanOps diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options index 1d1560eb5..7a1c509ca 100644 --- a/src/meshTools/Make/options +++ b/src/meshTools/Make/options @@ -1,9 +1,18 @@ +ifneq ($(FLEX_DIR), "") +EXE_INC = \ + -I$(FLEX_DIR)/include \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(WM_THIRD_PARTY_DIR)/zlib-1.2.3 +else +EXE_INC = \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(WM_THIRD_PARTY_DIR)/zlib-1.2.3 +endif + EXE_INC = \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/decompositionMethods/decompositionMethods/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude LIB_LIBS = \ - -ltriSurface \ -ldecompositionMethods \ -llagrangian diff --git a/src/triSurface/faceTriangulation/faceTriangulation.C b/src/meshTools/triSurface/faceTriangulation/faceTriangulation.C similarity index 100% rename from src/triSurface/faceTriangulation/faceTriangulation.C rename to src/meshTools/triSurface/faceTriangulation/faceTriangulation.C diff --git a/src/triSurface/faceTriangulation/faceTriangulation.H b/src/meshTools/triSurface/faceTriangulation/faceTriangulation.H similarity index 100% rename from src/triSurface/faceTriangulation/faceTriangulation.H rename to src/meshTools/triSurface/faceTriangulation/faceTriangulation.H diff --git a/src/triSurface/meshTriangulation/meshTriangulation.C b/src/meshTools/triSurface/meshTriangulation/meshTriangulation.C similarity index 100% rename from src/triSurface/meshTriangulation/meshTriangulation.C rename to src/meshTools/triSurface/meshTriangulation/meshTriangulation.C diff --git a/src/triSurface/meshTriangulation/meshTriangulation.H b/src/meshTools/triSurface/meshTriangulation/meshTriangulation.H similarity index 100% rename from src/triSurface/meshTriangulation/meshTriangulation.H rename to src/meshTools/triSurface/meshTriangulation/meshTriangulation.H diff --git a/src/triSurface/tools/hashSignedLabel/hashSignedLabel.H b/src/meshTools/triSurface/tools/hashSignedLabel/hashSignedLabel.H similarity index 100% rename from src/triSurface/tools/hashSignedLabel/hashSignedLabel.H rename to src/meshTools/triSurface/tools/hashSignedLabel/hashSignedLabel.H diff --git a/src/triSurface/tools/labelPair/labelPairLookup.H b/src/meshTools/triSurface/tools/labelPair/labelPairLookup.H similarity index 100% rename from src/triSurface/tools/labelPair/labelPairLookup.H rename to src/meshTools/triSurface/tools/labelPair/labelPairLookup.H diff --git a/src/triSurface/tools/labelledTri/labelledTri.H b/src/meshTools/triSurface/tools/labelledTri/labelledTri.H similarity index 100% rename from src/triSurface/tools/labelledTri/labelledTri.H rename to src/meshTools/triSurface/tools/labelledTri/labelledTri.H diff --git a/src/triSurface/tools/labelledTri/labelledTriI.H b/src/meshTools/triSurface/tools/labelledTri/labelledTriI.H similarity index 100% rename from src/triSurface/tools/labelledTri/labelledTriI.H rename to src/meshTools/triSurface/tools/labelledTri/labelledTriI.H diff --git a/src/triSurface/tools/labelledTri/sortLabelledTri.C b/src/meshTools/triSurface/tools/labelledTri/sortLabelledTri.C similarity index 100% rename from src/triSurface/tools/labelledTri/sortLabelledTri.C rename to src/meshTools/triSurface/tools/labelledTri/sortLabelledTri.C diff --git a/src/triSurface/tools/labelledTri/sortLabelledTri.H b/src/meshTools/triSurface/tools/labelledTri/sortLabelledTri.H similarity index 100% rename from src/triSurface/tools/labelledTri/sortLabelledTri.H rename to src/meshTools/triSurface/tools/labelledTri/sortLabelledTri.H diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C b/src/meshTools/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C similarity index 100% rename from src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C rename to src/meshTools/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H b/src/meshTools/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H similarity index 100% rename from src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H rename to src/meshTools/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H diff --git a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H b/src/meshTools/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H similarity index 100% rename from src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H rename to src/meshTools/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/meshTools/triSurface/triSurface/interfaces/AC3D/readAC.C similarity index 100% rename from src/triSurface/triSurface/interfaces/AC3D/readAC.C rename to src/meshTools/triSurface/triSurface/interfaces/AC3D/readAC.C diff --git a/src/triSurface/triSurface/interfaces/AC3D/writeAC.C b/src/meshTools/triSurface/triSurface/interfaces/AC3D/writeAC.C similarity index 100% rename from src/triSurface/triSurface/interfaces/AC3D/writeAC.C rename to src/meshTools/triSurface/triSurface/interfaces/AC3D/writeAC.C diff --git a/src/triSurface/triSurface/interfaces/DX/writeDX.C b/src/meshTools/triSurface/triSurface/interfaces/DX/writeDX.C similarity index 100% rename from src/triSurface/triSurface/interfaces/DX/writeDX.C rename to src/meshTools/triSurface/triSurface/interfaces/DX/writeDX.C diff --git a/src/triSurface/triSurface/interfaces/GTS/readGTS.C b/src/meshTools/triSurface/triSurface/interfaces/GTS/readGTS.C similarity index 100% rename from src/triSurface/triSurface/interfaces/GTS/readGTS.C rename to src/meshTools/triSurface/triSurface/interfaces/GTS/readGTS.C diff --git a/src/triSurface/triSurface/interfaces/GTS/writeGTS.C b/src/meshTools/triSurface/triSurface/interfaces/GTS/writeGTS.C similarity index 100% rename from src/triSurface/triSurface/interfaces/GTS/writeGTS.C rename to src/meshTools/triSurface/triSurface/interfaces/GTS/writeGTS.C diff --git a/src/triSurface/triSurface/interfaces/NAS/readNAS.C b/src/meshTools/triSurface/triSurface/interfaces/NAS/readNAS.C similarity index 100% rename from src/triSurface/triSurface/interfaces/NAS/readNAS.C rename to src/meshTools/triSurface/triSurface/interfaces/NAS/readNAS.C diff --git a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C b/src/meshTools/triSurface/triSurface/interfaces/OBJ/readOBJ.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OBJ/readOBJ.C rename to src/meshTools/triSurface/triSurface/interfaces/OBJ/readOBJ.C diff --git a/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C b/src/meshTools/triSurface/triSurface/interfaces/OBJ/writeOBJ.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C rename to src/meshTools/triSurface/triSurface/interfaces/OBJ/writeOBJ.C diff --git a/src/triSurface/triSurface/interfaces/OFF/readOFF.C b/src/meshTools/triSurface/triSurface/interfaces/OFF/readOFF.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OFF/readOFF.C rename to src/meshTools/triSurface/triSurface/interfaces/OFF/readOFF.C diff --git a/src/triSurface/triSurface/interfaces/OFF/writeOFF.C b/src/meshTools/triSurface/triSurface/interfaces/OFF/writeOFF.C similarity index 100% rename from src/triSurface/triSurface/interfaces/OFF/writeOFF.C rename to src/meshTools/triSurface/triSurface/interfaces/OFF/writeOFF.C diff --git a/src/triSurface/triSurface/interfaces/SMESH/writeSMESH.C b/src/meshTools/triSurface/triSurface/interfaces/SMESH/writeSMESH.C similarity index 100% rename from src/triSurface/triSurface/interfaces/SMESH/writeSMESH.C rename to src/meshTools/triSurface/triSurface/interfaces/SMESH/writeSMESH.C diff --git a/src/triSurface/triSurface/interfaces/STL/STLpoint.H b/src/meshTools/triSurface/triSurface/interfaces/STL/STLpoint.H similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/STLpoint.H rename to src/meshTools/triSurface/triSurface/interfaces/STL/STLpoint.H diff --git a/src/triSurface/triSurface/interfaces/STL/STLpointI.H b/src/meshTools/triSurface/triSurface/interfaces/STL/STLpointI.H similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/STLpointI.H rename to src/meshTools/triSurface/triSurface/interfaces/STL/STLpointI.H diff --git a/src/triSurface/triSurface/interfaces/STL/STLtriangle.H b/src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangle.H similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/STLtriangle.H rename to src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangle.H diff --git a/src/triSurface/triSurface/interfaces/STL/STLtriangleI.H b/src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangleI.H similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/STLtriangleI.H rename to src/meshTools/triSurface/triSurface/interfaces/STL/STLtriangleI.H diff --git a/src/triSurface/triSurface/interfaces/STL/readSTL.C b/src/meshTools/triSurface/triSurface/interfaces/STL/readSTL.C similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/readSTL.C rename to src/meshTools/triSurface/triSurface/interfaces/STL/readSTL.C diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/meshTools/triSurface/triSurface/interfaces/STL/readSTLASCII.L similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/readSTLASCII.L rename to src/meshTools/triSurface/triSurface/interfaces/STL/readSTLASCII.L diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C b/src/meshTools/triSurface/triSurface/interfaces/STL/readSTLBINARY.C similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C rename to src/meshTools/triSurface/triSurface/interfaces/STL/readSTLBINARY.C diff --git a/src/triSurface/triSurface/interfaces/STL/writeSTL.C b/src/meshTools/triSurface/triSurface/interfaces/STL/writeSTL.C similarity index 100% rename from src/triSurface/triSurface/interfaces/STL/writeSTL.C rename to src/meshTools/triSurface/triSurface/interfaces/STL/writeSTL.C diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/meshTools/triSurface/triSurface/interfaces/TRI/readTRI.C similarity index 100% rename from src/triSurface/triSurface/interfaces/TRI/readTRI.C rename to src/meshTools/triSurface/triSurface/interfaces/TRI/readTRI.C diff --git a/src/triSurface/triSurface/interfaces/TRI/writeTRI.C b/src/meshTools/triSurface/triSurface/interfaces/TRI/writeTRI.C similarity index 100% rename from src/triSurface/triSurface/interfaces/TRI/writeTRI.C rename to src/meshTools/triSurface/triSurface/interfaces/TRI/writeTRI.C diff --git a/src/triSurface/triSurface/interfaces/VTK/writeVTK.C b/src/meshTools/triSurface/triSurface/interfaces/VTK/writeVTK.C similarity index 100% rename from src/triSurface/triSurface/interfaces/VTK/writeVTK.C rename to src/meshTools/triSurface/triSurface/interfaces/VTK/writeVTK.C diff --git a/src/triSurface/triSurface/stitchTriangles.C b/src/meshTools/triSurface/triSurface/stitchTriangles.C similarity index 100% rename from src/triSurface/triSurface/stitchTriangles.C rename to src/meshTools/triSurface/triSurface/stitchTriangles.C diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.C b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.C similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatch.C rename to src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.C diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatch.H b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.H similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatch.H rename to src/meshTools/triSurface/triSurface/surfacePatch/surfacePatch.H diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.C similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatchIOList.C rename to src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.C diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.H similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatchIOList.H rename to src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchIOList.H diff --git a/src/triSurface/triSurface/surfacePatch/surfacePatchList.H b/src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchList.H similarity index 100% rename from src/triSurface/triSurface/surfacePatch/surfacePatchList.H rename to src/meshTools/triSurface/triSurface/surfacePatch/surfacePatchList.H diff --git a/src/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C b/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C similarity index 100% rename from src/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C rename to src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.C diff --git a/src/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H b/src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H similarity index 100% rename from src/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H rename to src/meshTools/triSurface/triSurface/treeDataTriSurface/treeDataTriSurface.H diff --git a/src/triSurface/triSurface/triSurface.C b/src/meshTools/triSurface/triSurface/triSurface.C similarity index 100% rename from src/triSurface/triSurface/triSurface.C rename to src/meshTools/triSurface/triSurface/triSurface.C diff --git a/src/triSurface/triSurface/triSurface.H b/src/meshTools/triSurface/triSurface/triSurface.H similarity index 100% rename from src/triSurface/triSurface/triSurface.H rename to src/meshTools/triSurface/triSurface/triSurface.H diff --git a/src/triSurface/triSurface/triSurfaceAddressing.C b/src/meshTools/triSurface/triSurface/triSurfaceAddressing.C similarity index 100% rename from src/triSurface/triSurface/triSurfaceAddressing.C rename to src/meshTools/triSurface/triSurface/triSurfaceAddressing.C diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.C b/src/meshTools/triSurface/triSurfaceFields/triSurfaceFields.C similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceFields.C rename to src/meshTools/triSurface/triSurfaceFields/triSurfaceFields.C diff --git a/src/triSurface/triSurfaceFields/triSurfaceFields.H b/src/meshTools/triSurface/triSurfaceFields/triSurfaceFields.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceFields.H rename to src/meshTools/triSurface/triSurfaceFields/triSurfaceFields.H diff --git a/src/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H b/src/meshTools/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H rename to src/meshTools/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H diff --git a/src/triSurface/triSurfaceFields/triSurfaceGeoMesh.H b/src/meshTools/triSurface/triSurfaceFields/triSurfaceGeoMesh.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfaceGeoMesh.H rename to src/meshTools/triSurface/triSurfaceFields/triSurfaceGeoMesh.H diff --git a/src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.C b/src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.C similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.C rename to src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.C diff --git a/src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.H b/src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.H rename to src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFields.H diff --git a/src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFieldsFwd.H b/src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFieldsFwd.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFieldsFwd.H rename to src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointFieldsFwd.H diff --git a/src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointMesh.H b/src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointMesh.H similarity index 100% rename from src/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointMesh.H rename to src/meshTools/triSurface/triSurfaceFields/triSurfacePointFields/triSurfacePointMesh.H diff --git a/src/sampling/Make/options b/src/sampling/Make/options index 6629b3652..b305e8fea 100644 --- a/src/sampling/Make/options +++ b/src/sampling/Make/options @@ -2,11 +2,9 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lsurfMesh \ - -ltriSurface diff --git a/src/solidModels/Make/options b/src/solidModels/Make/options index aefe8cbfa..95481d075 100644 --- a/src/solidModels/Make/options +++ b/src/solidModels/Make/options @@ -1,7 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(FOAM_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/finiteArea/lnInclude \ -I$(LIB_SRC)/lagrangian/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ @@ -12,7 +11,6 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -ltriSurface \ -lfiniteArea \ -ldynamicFvMesh \ -ldynamicMesh \ diff --git a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options b/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options index 7e7db4b58..7b542448e 100644 --- a/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options +++ b/tutorials/immersedBoundary/sphereInChannel/refineSphereMesh/Make/options @@ -2,12 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options b/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options index 7e7db4b58..7b542448e 100644 --- a/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options +++ b/tutorials/immersedBoundary/thickPlateRefinedMesh/refineThickPlateMesh/Make/options @@ -2,12 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/immersedBoundary/immersedBoundary/lnInclude \ -I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -ltriSurface \ -lmeshTools \ -lsurfMesh \ -lsampling \ diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options index 632ec8263..888aa6373 100644 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options +++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/Make/options @@ -3,10 +3,8 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicMesh/meshMotion/RBFMotionSolver/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/triSurface/lnInclude LIB_LIBS = \ -ldynamicMesh \ -lfiniteVolume \ -lmeshTools \ - -ltriSurface