Updated options files in the utilities folder

utilities/FLMAToSurface/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/FMSToSurface/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/FMSToVTK/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/checkSurfaceMesh/Make/options

@@ -8,16 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
-    endif
-endif
-
-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -35,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/copySurfaceParts/Make/options

@@ -8,11 +8,10 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
-
 ifeq ($(WM_PROJECT), foam)
     VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
     ifeq ($(VER), 1)
@@ -27,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/extrudeEdgesInto2DSurface/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/generateBoundaryLayers/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/importSurfaceAsSubset/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/improveMeshQuality/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/improveSymmetryPlanes/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/mergeSurfacePatches/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/meshToFPMA/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/patchesToSubsets/Make/options

@@ -8,11 +8,10 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
-
 ifeq ($(WM_PROJECT), foam)
     VER := $(shell expr `echo $(WM_PROJECT_VERSION)` \>= 3.2)
     ifeq ($(VER), 1)
@@ -27,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/preparePar/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/removeSurfaceFacets/Make/options

 ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
     ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
         CFMESH_MACROS = -DNoSizeType
     else
         CFMESH_MACROS =
     endif
+
+    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
+        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
+    else
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
+    endif
 endif
 
 ifeq ($(WM_PROJECT), foam)
@@ -21,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/scaleMesh/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/scaleSurfaceMesh/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/subsetToPatch/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/surfaceFeatureEdges/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/surfaceGenerateBoundingBox/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \

utilities/surfaceToFMS/Make/options

@@ -8,7 +8,7 @@ ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
     ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
         CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume 
     else
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume -ledgeMesh
+        CFMESH_LIBS = -lmeshTools -lfiniteVolume
     endif
 endif
 
@@ -26,6 +26,7 @@ endif
 EXE_INC = \
     $(CFMESH_MACROS) \
     -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \