ENH: relocate triSurface classes into surfMesh library (issue #294)

- simplifies organization, includes, linkage etc.
2025-11-28 03:28:01 +00:00 · 2017-05-18 10:42:05 +02:00
parent abe6121311
commit 3814762785
103 changed files with 179 additions and 279 deletions
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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 \
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
@ -27,9 +26,7 @@ EXE_LIBS =  \
    -lconformalVoronoiMesh \
    -lfiniteVolume \
    -lmeshTools \
+    -lsampling \
    -ldecompositionMethods \
    -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
-    -ltriSurface \
-    -ldynamicMesh \
-    -lsampling \
-    -lfileFormats
+    -ldynamicMesh
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 \
--- 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
--- 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
--- 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 \
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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)
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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 = \
--- 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
--- 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
--- 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
--- 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
--- 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
 )

--- 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 */
--- 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
--- 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 = \
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- a/src/triSurface/triSurfaceFields/triSurfaceFields.C
+++ b/src/triSurface/triSurfaceFields/triSurfaceFields.C
--- a/src/triSurface/triSurfaceFields/triSurfaceFields.H
+++ b/src/triSurface/triSurfaceFields/triSurfaceFields.H
--- a/src/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H
+++ b/src/triSurface/triSurfaceFields/triSurfaceFieldsFwd.H
--- a/src/triSurface/triSurfaceFields/triSurfaceGeoMesh.H
+++ b/src/triSurface/triSurfaceFields/triSurfaceGeoMesh.H
--- a/src/triSurface/triSurfaceFields/triSurfacePointGeoMesh.H
+++ b/src/triSurface/triSurfaceFields/triSurfacePointGeoMesh.H
--- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
--- a/src/triSurface/triSurface/interfaces/AC3D/writeAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/writeAC.C
--- a/src/triSurface/triSurface/interfaces/GTS/readGTS.C
+++ b/src/triSurface/triSurface/interfaces/GTS/readGTS.C
--- a/src/triSurface/triSurface/interfaces/GTS/writeGTS.C
+++ b/src/triSurface/triSurface/interfaces/GTS/writeGTS.C
--- a/src/triSurface/triSurface/interfaces/NAS/readNAS.C
+++ b/src/triSurface/triSurface/interfaces/NAS/readNAS.C
--- a/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
--- a/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C
+++ b/src/triSurface/triSurface/interfaces/OBJ/writeOBJ.C
--- a/src/triSurface/triSurface/interfaces/OFF/readOFF.C
+++ b/src/triSurface/triSurface/interfaces/OFF/readOFF.C
--- a/src/triSurface/triSurface/interfaces/OFF/writeOFF.C
+++ b/src/triSurface/triSurface/interfaces/OFF/writeOFF.C
--- a/src/triSurface/triSurface/interfaces/SMESH/writeSMESH.C
+++ b/src/triSurface/triSurface/interfaces/SMESH/writeSMESH.C
--- a/src/triSurface/triSurface/interfaces/STL/readSTL.C
+++ b/src/triSurface/triSurface/interfaces/STL/readSTL.C
--- a/src/triSurface/triSurface/interfaces/STL/writeSTL.C
+++ b/src/triSurface/triSurface/interfaces/STL/writeSTL.C
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
--- a/src/triSurface/triSurface/interfaces/TRI/writeTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/writeTRI.C
--- a/src/triSurface/triSurface/interfaces/VTK/readVTK.C
+++ b/src/triSurface/triSurface/interfaces/VTK/readVTK.C
--- a/src/triSurface/triSurface/interfaces/VTK/writeVTK.C
+++ b/src/triSurface/triSurface/interfaces/VTK/writeVTK.C
--- a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
+++ b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.C
--- a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H
+++ b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatch.H
--- a/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H
+++ b/src/triSurface/triSurface/geometricSurfacePatch/geometricSurfacePatchList.H
--- a/src/triSurface/triSurface/surfacePatch/surfacePatch.C
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.C
--- a/src/triSurface/triSurface/surfacePatch/surfacePatch.H
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatch.H
--- a/src/triSurface/triSurface/surfacePatch/surfacePatchList.H
+++ b/src/triSurface/triSurface/surfacePatch/surfacePatchList.H
--- a/src/triSurface/triSurface/stitchTriangles.C
+++ b/src/triSurface/triSurface/stitchTriangles.C
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
--- a/src/triSurface/triSurface/triSurface.H
+++ b/src/triSurface/triSurface/triSurface.H
--- a/src/triSurface/triSurface/triSurfaceAddressing.C
+++ b/src/triSurface/triSurface/triSurfaceAddressing.C
--- a/Show More
+++ b/Show More