From 9916da0252260c4a610f9658d788deb0ebca1573 Mon Sep 17 00:00:00 2001
From: william <william>
Date: Tue, 17 Dec 2013 15:04:05 +0000
Subject: [PATCH] BUG: Added lagrangianTurbulence library to solvers: error
messages still showing due to surfaceFilm library
---
applications/solvers/combustion/fireFoam/Make/options | 1 +
applications/solvers/lagrangian/DPMFoam/Make/options | 2 +-
.../solvers/lagrangian/coalChemistryFoam/Make/options | 1 +
.../icoUncoupledKinematicParcelFoam/Make/options | 1 +
.../icoUncoupledKinematicParcelDyMFoam/Make/options | 1 +
.../lagrangian/reactingParcelFilmFoam/Make/options | 1 +
.../reactingParcelFoam/LTSReactingParcelFoam/Make/options | 1 +
.../solvers/lagrangian/reactingParcelFoam/Make/options | 1 +
.../simpleReactingParcelFoam/Make/options | 1 +
applications/solvers/lagrangian/sprayFoam/Make/options | 1 +
.../lagrangian/sprayFoam/sprayEngineFoam/Make/options | 1 +
.../lagrangian/uncoupledKinematicParcelFoam/Make/options | 1 +
src/lagrangian/intermediate/Make/options | 8 --------
.../makeBasicKinematicCollidingParcelSubmodels.C | 4 ++--
.../makeBasicKinematicParcelSubmodels.C | 4 ++--
.../makeBasicReactingMultiphaseParcelSubmodels.C | 4 ++--
.../makeBasicReactingParcelSubmodels.C | 4 ++--
.../basicThermoParcel/makeBasicThermoParcelSubmodels.C | 4 ++--
18 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options
index c243c07e3d6..d4d30a98d46 100644
--- a/applications/solvers/combustion/fireFoam/Make/options
+++ b/applications/solvers/combustion/fireFoam/Make/options
@@ -52,4 +52,5 @@ EXE_LIBS = \
-lpyrolysisModels \
-lregionCoupling \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lODE
diff --git a/applications/solvers/lagrangian/DPMFoam/Make/options b/applications/solvers/lagrangian/DPMFoam/Make/options
index 8a4d6cc23b9..e9524dfc2be 100644
--- a/applications/solvers/lagrangian/DPMFoam/Make/options
+++ b/applications/solvers/lagrangian/DPMFoam/Make/options
@@ -14,7 +14,7 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
- -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
+ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
index 85cd3a4713a..4f85279a697 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options
+++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options
@@ -35,6 +35,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lcoalCombustion\
-lspecie \
-lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
index cb0f90524a5..13f3b20206e 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options
@@ -16,6 +16,7 @@ EXE_INC = \
EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lthermophysicalFunctions \
-lfluidThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
index 942c217fa48..24749170021 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/Make/options
@@ -20,6 +20,7 @@ EXE_INC = \
EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lthermophysicalFunctions \
-lfluidThermophysicalModels \
-lspecie \
diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
index e0aac8c5dbb..64d1d962ba4 100644
--- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options
@@ -44,5 +44,6 @@ EXE_LIBS = \
-lradiationModels \
-lsurfaceFilmModels \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lODE \
-lcombustionModels
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
index 9aa18479609..2cc7dfa1e78 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/LTSReactingParcelFoam/Make/options
@@ -34,6 +34,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lspecie \
-lfluidThermophysicalModels \
-lliquidProperties \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
index 705cfc9433f..ce479be6b6c 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options
@@ -34,6 +34,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lspecie \
-lfluidThermophysicalModels \
-lliquidProperties \
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
index 705cfc9433f..ce479be6b6c 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options
@@ -34,6 +34,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lspecie \
-lfluidThermophysicalModels \
-lliquidProperties \
diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options
index 9dce65d0235..bbae7d499bf 100644
--- a/applications/solvers/lagrangian/sprayFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/Make/options
@@ -35,6 +35,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-llagrangianSpray \
-lspecie \
-lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
index 77034c9ef3b..e516ea3f108 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
+++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options
@@ -37,6 +37,7 @@ EXE_LIBS = \
-lcompressibleLESModels \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-llagrangianSpray \
-lspecie \
-lfluidThermophysicalModels \
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
index 12c7c1c5511..dd86faf2ab2 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options
@@ -14,6 +14,7 @@ EXE_INC = \
EXE_LIBS = \
-llagrangian \
-llagrangianIntermediate \
+ -llagrangianTurbulence \
-lthermophysicalFunctions \
-lfluidThermophysicalModels \
-lspecie \
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index f4e774028ee..79cbc346255 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -12,7 +12,6 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
- -I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/regionModels/regionModel/lnInclude \
-I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
@@ -33,13 +32,6 @@ LIB_LIBS = \
-lreactionThermophysicalModels \
-lSLGThermo \
-lradiationModels \
- -lincompressibleTurbulenceModel \
- -lincompressibleRASModels \
- -lincompressibleLESModels \
- -lcompressibleTurbulenceModel \
- -lcompressibleRASModels \
- -lcompressibleLESModels \
- -lLESdeltas \
-lincompressibleTransportModels \
-lregionModels \
-lsurfaceFilmModels \
diff --git a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
index c0b418fd0a4..584dc186302 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicKinematicCollidingParcel/makeBasicKinematicCollidingParcelSubmodels.C
@@ -27,8 +27,8 @@ License
#include "makeParcelCloudFunctionObjects.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
index a35eeaef2b3..119de86cc63 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -27,8 +27,8 @@ License
#include "makeParcelCloudFunctionObjects.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
index 2ed2123cd1a..08720bbc764 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -27,8 +27,8 @@ License
#include "makeParcelCloudFunctionObjects.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
#include "BrownianMotionForce.H"
diff --git a/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
index f81c6e73b48..da13ed2e1e7 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -27,8 +27,8 @@ License
#include "makeParcelCloudFunctionObjects.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
#include "BrownianMotionForce.H"
diff --git a/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
index b2de96ae39f..5c71da29f5d 100644
--- a/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
+++ b/src/lagrangian/turbulence/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -27,8 +27,8 @@ License
#include "makeParcelCloudFunctionObjects.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
#include "BrownianMotionForce.H"
--
GitLab