From 4d7ab99f995eb2d400b73ee8be0648fefa29ec9d Mon Sep 17 00:00:00 2001
From: william <william>
Date: Wed, 18 Dec 2013 16:53:41 +0000
Subject: [PATCH] BUG: Separated surface film wall functions into a separate
library to remove duplication messages when using new turbulent structure
---
.../solvers/combustion/fireFoam/Make/options | 1 +
.../reactingParcelFilmFoam/Make/options | 1 +
src/lagrangian/coalCombustion/Make/options | 1 +
src/lagrangian/spray/Make/options | 1 +
src/regionModels/Allwmake | 1 +
src/regionModels/surfaceFilmModels/Make/files | 5 ---
.../surfaceFilmModels/Make/options | 7 ----
.../wallFunctions/Make/files | 5 +++
.../wallFunctions/Make/options | 34 +++++++++++++++++++
9 files changed, 44 insertions(+), 12 deletions(-)
create mode 100644 src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files
create mode 100644 src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index d4d30a98d46..93bda979269 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -49,6 +49,7 @@ EXE_LIBS = \
-lregionModels \
-lradiationModels \
-lsurfaceFilmModels \
+ -lsurfaceFilmDerivedFvPatchFields \
-lpyrolysisModels \
-lregionCoupling \
-llagrangianIntermediate \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index 64d1d962ba4..1520f13fcb7 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -43,6 +43,7 @@ EXE_LIBS = \
-lregionModels \
-lradiationModels \
-lsurfaceFilmModels \
+ -lsurfaceFilmDerivedFvPatchFields \
-llagrangianIntermediate \
-llagrangianTurbulence \
-lODE \
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
index 0d7eb0e13ba..b69da4c94fc 100644
--- a/src/lagrangian/coalCombustion/Make/options
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -24,6 +24,7 @@ LIB_LIBS = \
-lmeshTools \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-ldistributionModels \
-lspecie \
-lfluidThermophysicalModels \
diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options
index 34a2babd735..d1deb55ae68 100644
--- a/src/lagrangian/spray/Make/options
+++ b/src/lagrangian/spray/Make/options
@@ -25,6 +25,7 @@ LIB_LIBS = \
-lmeshTools \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-ldistributionModels \
-lspecie \
-lfluidThermophysicalModels \
diff --git a/src/regionModels/Allwmake b/src/regionModels/Allwmake
index 0ca6e6338a9..669b701e81d 100755
--- a/src/regionModels/Allwmake
+++ b/src/regionModels/Allwmake
@@ -6,6 +6,7 @@ set -x
wmake $makeType regionModel
wmake $makeType pyrolysisModels
wmake $makeType surfaceFilmModels
+wmake $makeType surfaceFilmModels/derivedFvPatchFields/wallFunctions
wmake $makeType thermalBaffleModels
wmake $makeType regionCoupling
diff --git a/src/regionModels/surfaceFilmModels/Make/files b/src/regionModels/surfaceFilmModels/Make/files
index 5fe7e8c5e81..5c535dbf6d2 100644
--- a/src/regionModels/surfaceFilmModels/Make/files
+++ b/src/regionModels/surfaceFilmModels/Make/files
@@ -64,10 +64,5 @@ $(PATCHFIELDS)/filmHeightInletVelocity/filmHeightInletVelocityFvPatchVectorField
$(PATCHFIELDS)/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
$(PATCHFIELDS)/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
-/* Wall functions for primary region */
-WALLFUNCS=$(PATCHFIELDS)/wallFunctions
-$(WALLFUNCS)/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
-$(WALLFUNCS)/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
-
LIB = $(FOAM_LIBBIN)/libsurfaceFilmModels
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index fc580a43f80..88daf40fd4a 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -10,10 +10,6 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
- -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
- -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude
LIB_LIBS = \
@@ -28,7 +24,4 @@ LIB_LIBS = \
-lreactionThermophysicalModels \
-lSLGThermo \
-ldistributionModels \
- -lcompressibleTurbulenceModel \
- -lcompressibleRASModels \
- -lcompressibleLESModels \
-lregionModels
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files
new file mode 100644
index 00000000000..6f150005fd8
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files
@@ -0,0 +1,5 @@
+alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
+
+
+LIB = $(FOAM_LIBBIN)/libsurfaceFilmDerivedFvPatchFields
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
new file mode 100644
index 00000000000..e894e6d69c7
--- /dev/null
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options
@@ -0,0 +1,34 @@
+EXE_INC = \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels \
+ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \
+ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
+ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
+
+LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lfluidThermophysicalModels \
+ -lspecie \
+ -lliquidProperties \
+ -lliquidMixtureProperties \
+ -lsolidProperties \
+ -lsolidMixtureProperties \
+ -lreactionThermophysicalModels \
+ -lSLGThermo \
+ -lcompressibleTurbulenceModel \
+ -lcompressibleRASModels \
+ -lcompressibleLESModels \
+ -lregionModels \
+ -lsurfaceFilmModels
--
GitLab