COMP: Taking out sampledInterface FO from sampling lib and adding it

to geometricVoF

sampledInterface was linked to interfaceProperties thorugh geometricVoF,
and interfaceProperties created a conflict on surfaceTension table
when linked in the reactingEuler solvers by the sampling lib

src/sampling/Make/files

@@ -50,7 +50,6 @@ sampledSurface/sampledSurface/sampledSurface.C
 sampledSurface/sampledSurface/sampledSurfaceRegister.C
 sampledSurface/sampledSurfaces/sampledSurfaces.C
 sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
-sampledSurface/sampledInterface/sampledInterface.C
 
 readers = sampledSurface/readers
 

src/sampling/Make/options

@@ -4,8 +4,7 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude
-    -I$(LIB_SRC)/transportModels/geometricVoF/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume \
@@ -13,5 +12,4 @@ LIB_LIBS = \
     -lsurfMesh \
     -lmeshTools \
     -ldynamicMesh \
-    -llagrangian \
+    -llagrangian
-    -lgeometricVoF

src/transportModels/geometricVoF/Make/files

@@ -19,4 +19,6 @@ reconstructionSchemes/plicSchemes/plicRDF/plicRDF.C
 
 advectionSchemes/isoAdvection/isoAdvection.C
 
+sampledInterface/sampledInterface.C
+
 LIB = $(FOAM_LIBBIN)/libgeometricVoF

src/transportModels/geometricVoF/Make/options

@@ -4,7 +4,9 @@ EXE_INC = \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-    -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude
+    -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
 
 LIB_LIBS = \
     -lfiniteVolume \