From c712abad092cbd41ce50b44403e35a2e5f4cc281 Mon Sep 17 00:00:00 2001
From: sergio <s.ferraris@opencfd.co.uk>
Date: Thu, 11 Jun 2020 11:01:50 -0700
Subject: [PATCH] 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 | 1 -
src/sampling/Make/options | 6 ++----
src/transportModels/geometricVoF/Make/files | 2 ++
src/transportModels/geometricVoF/Make/options | 4 +++-
.../geometricVoF}/sampledInterface/sampledInterface.C | 0
.../geometricVoF}/sampledInterface/sampledInterface.H | 0
.../sampledInterface/sampledInterfaceTemplates.C | 0
7 files changed, 7 insertions(+), 6 deletions(-)
rename src/{sampling/sampledSurface => transportModels/geometricVoF}/sampledInterface/sampledInterface.C (100%)
rename src/{sampling/sampledSurface => transportModels/geometricVoF}/sampledInterface/sampledInterface.H (100%)
rename src/{sampling/sampledSurface => transportModels/geometricVoF}/sampledInterface/sampledInterfaceTemplates.C (100%)
diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index b3bd62acc9a..2d2796dcca5 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 e0aa051f152..6a8180f0ff1 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 a2c382a1ed7..e51c961b181 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 31ded987a14..00fc27d7cff 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
--
GitLab