BUG: Separated surface film wall functions into a separate library to remove...

BUG: Separated surface film wall functions into a separate library to remove duplication messages when using new turbulent structure

applications/solvers/combustion/fireFoam/Make/options

@@ -49,6 +49,7 @@ EXE_LIBS = \
     -lregionModels \
     -lradiationModels \
     -lsurfaceFilmModels \
+    -lsurfaceFilmDerivedFvPatchFields \
     -lpyrolysisModels \
     -lregionCoupling \
     -llagrangianIntermediate \

applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options

@@ -43,6 +43,7 @@ EXE_LIBS = \
     -lregionModels \
     -lradiationModels \
     -lsurfaceFilmModels \
+    -lsurfaceFilmDerivedFvPatchFields \
     -llagrangianIntermediate \
     -llagrangianTurbulence \
     -lODE \

src/lagrangian/coalCombustion/Make/options

@@ -24,6 +24,7 @@ LIB_LIBS = \
     -lmeshTools \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -ldistributionModels \
     -lspecie \
     -lfluidThermophysicalModels \

src/lagrangian/spray/Make/options

@@ -25,6 +25,7 @@ LIB_LIBS = \
     -lmeshTools \
     -llagrangian \
     -llagrangianIntermediate \
+    -llagrangianTurbulence \
     -ldistributionModels \
     -lspecie \
     -lfluidThermophysicalModels \

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
 

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

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

src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/files

+alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
+
+
+LIB = $(FOAM_LIBBIN)/libsurfaceFilmDerivedFvPatchFields

src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/Make/options

+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