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

- simplifies organization, includes, linkage etc.

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 \

applications/test/dynamicIndexedOctree/Make/options

-EXE_INC = -I$(LIB_SRC)/meshTools/lnInclude
+EXE_INC = \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = -lmeshTools
+EXE_LIBS = \
+    -lmeshTools

applications/test/ensightFile/Make/options

 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

applications/test/momentOfInertia/Make/options

 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

applications/utilities/mesh/advanced/selectCells/Make/options

 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

applications/utilities/mesh/advanced/snappyRefineMesh/Make/options

 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

applications/utilities/mesh/conversion/ccm/ccmToFoam/Make/options

 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 \

applications/utilities/mesh/conversion/ccm/foamToCcm/Make/options

 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 \

applications/utilities/mesh/conversion/fireToFoam/Make/options

 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

applications/utilities/mesh/conversion/foamToFireMesh/Make/options

 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

applications/utilities/mesh/conversion/foamToStarMesh/Make/options

 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

applications/utilities/mesh/conversion/star4ToFoam/Make/options

 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

applications/utilities/mesh/generation/blockMesh/Make/options

 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

applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options

@@ -6,7 +6,6 @@ CGAL_INEXACT = -DCGAL_INEXACT
 
 include $(GENERAL_RULES)/CGAL
 
-
 EXE_INC =  \
     ${ROUNDING_MATH} \
     ${EXE_NDEBUG} \
@@ -14,10 +13,10 @@ EXE_INC =  \
     ${CGAL_INC} \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
     -I../conformalVoronoiMesh/lnInclude
@@ -25,11 +24,9 @@ EXE_INC =  \
 EXE_LIBS =  \
     $(CGAL_LIBS) \
     -lconformalVoronoiMesh \
-    -lfiniteVolume    \
+    -lfiniteVolume \
     -lmeshTools \
+    -lsampling \
     -ldecompositionMethods \
     -L$(FOAM_LIBBIN)/dummy -lscotchDecomp -lptscotchDecomp \
-    -ltriSurface \
-    -ldynamicMesh \
-    -lsampling \
-    -lfileFormats
+    -ldynamicMesh

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 \
+    -lsampling \
     -ldecompose \
-    -lfileFormats \
-    -ltriSurface \
     -ldynamicMesh \
-    -lsurfMesh \
-    -lsampling \
     -lsnappyHexMesh

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

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

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

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

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 \