diff --git a/src/sampling/Make/files b/src/sampling/Make/files index b3bd62acc9a9770decd1f542f3a7218ca8b27c8a..2d2796dcca52bc16d6a55b397d4a345b5350d1a2 100644 --- a/src/sampling/Make/files +++ b/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 diff --git a/src/sampling/Make/options b/src/sampling/Make/options index e0aa051f1526822c1c0308c14539cbead0f881c5..6a8180f0ff1f90ef461bb00f52dcf69a1440a4b7 100644 --- a/src/sampling/Make/options +++ b/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)/transportModels/geometricVoF/lnInclude + -I$(LIB_SRC)/lagrangian/basic/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -13,5 +12,4 @@ LIB_LIBS = \ -lsurfMesh \ -lmeshTools \ -ldynamicMesh \ - -llagrangian \ - -lgeometricVoF + -llagrangian diff --git a/src/transportModels/geometricVoF/Make/files b/src/transportModels/geometricVoF/Make/files index a2c382a1ed7105d3c1fcc5c6ce8d9e964665c540..e51c961b1810823a9bfdfa74a7fd2a37419782cc 100644 --- a/src/transportModels/geometricVoF/Make/files +++ b/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 diff --git a/src/transportModels/geometricVoF/Make/options b/src/transportModels/geometricVoF/Make/options index 31ded987a140d92d9bfcf61c4f142c11e2c6d380..00fc27d7cff0a5b189328637b475c807b40c8f92 100644 --- a/src/transportModels/geometricVoF/Make/options +++ b/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 \ diff --git a/src/sampling/sampledSurface/sampledInterface/sampledInterface.C b/src/transportModels/geometricVoF/sampledInterface/sampledInterface.C similarity index 100% rename from src/sampling/sampledSurface/sampledInterface/sampledInterface.C rename to src/transportModels/geometricVoF/sampledInterface/sampledInterface.C diff --git a/src/sampling/sampledSurface/sampledInterface/sampledInterface.H b/src/transportModels/geometricVoF/sampledInterface/sampledInterface.H similarity index 100% rename from src/sampling/sampledSurface/sampledInterface/sampledInterface.H rename to src/transportModels/geometricVoF/sampledInterface/sampledInterface.H diff --git a/src/sampling/sampledSurface/sampledInterface/sampledInterfaceTemplates.C b/src/transportModels/geometricVoF/sampledInterface/sampledInterfaceTemplates.C similarity index 100% rename from src/sampling/sampledSurface/sampledInterface/sampledInterfaceTemplates.C rename to src/transportModels/geometricVoF/sampledInterface/sampledInterfaceTemplates.C