ENH: Updated solvers that use the lagrangian/intermediate library

applications/solvers/lagrangian/coalChemistryFoam/Make/options

@@ -14,6 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/surfaceFilmModels/lnInclude \
@@ -36,6 +37,7 @@ EXE_LIBS = \
     -lsolidMixture \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
+    -lSLGThermo \
     -lchemistryModel \
     -lradiation \
     -lsurfaceFilmModels \

applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C

@@ -39,11 +39,12 @@ Description
 #include "hCombustionThermo.H"
 #include "turbulenceModel.H"
 #include "basicThermoCloud.H"
-#include "CoalCloud.H"
+#include "coalCloud.H"
 #include "psiChemistryModel.H"
 #include "chemistrySolver.H"
 #include "timeActivatedExplicitSource.H"
 #include "radiationModel.H"
+#include "SLGThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/lagrangian/coalChemistryFoam/createClouds.H

@@ -1,11 +1,11 @@
 Info<< "\nConstructing coal cloud" << endl;
-thermoCoalCloud coalParcels
+coalCloud coalParcels
 (
     "coalCloud1",
     rho,
     U,
     g,
-    thermo
+    slgThermo
 );
 
 Info<< "\nConstructing limestone cloud" << endl;
@@ -15,5 +15,5 @@ basicThermoCloud limestoneParcels
     rho,
     U,
     g,
-    thermo
+    slgThermo
 );

applications/solvers/lagrangian/coalChemistryFoam/createFields.H

@@ -8,6 +8,8 @@
 
     hsCombustionThermo& thermo = chemistry.thermo();
 
+    SLGThermo slgThermo(mesh, thermo);
+
     basicMultiComponentMixture& composition = thermo.composition();
     PtrList<volScalarField>& Y = composition.Y();
 

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options

@@ -14,6 +14,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -35,6 +36,7 @@ EXE_LIBS = \
     -lsolidMixture \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
+    -lSLGThermo \
     -lchemistryModel \
     -lradiation \
     -lODE \

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createClouds.H

@@ -1,9 +1,9 @@
 Info<< "\nConstructing reacting cloud" << endl;
-icoPoly8ThermoReactingMultiphaseCloud parcels
+basicReactingMultiphaseCloud parcels
 (
     "reactingCloud1",
     rho,
     U,
     g,
-    thermo
+    slgThermo
 );

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H

@@ -8,6 +8,8 @@
 
     hsReactionThermo& thermo = chemistry.thermo();
 
+    SLGThermo slgThermo(mesh, thermo);
+
     basicMultiComponentMixture& composition = thermo.composition();
     PtrList<volScalarField>& Y = composition.Y();
 

applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/porousExplicitSourceReactingParcelFoam.C

@@ -33,7 +33,6 @@ Description
     - reacting multiphase parcel cloud
     - porous media
     - mass, momentum and energy sources
-    - polynomial based, incompressible thermodynamics (f(T))
 
     Note: ddtPhiCorr not used here when porous zones are active
     - not well defined for porous calculations
@@ -43,12 +42,13 @@ Description
 #include "fvCFD.H"
 #include "hReactionThermo.H"
 #include "turbulenceModel.H"
-#include "BasicReactingMultiphaseCloud.H"
+#include "basicReactingMultiphaseCloud.H"
 #include "rhoChemistryModel.H"
 #include "chemistrySolver.H"
 #include "radiationModel.H"
 #include "porousZones.H"
 #include "timeActivatedExplicitSource.H"
+#include "SLGThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/lagrangian/reactingParcelFoam/Make/options

@@ -13,6 +13,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -34,6 +35,7 @@ EXE_LIBS = \
     -lsolidMixture \
     -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
+    -lSLGThermo \
     -lchemistryModel \
     -lradiation \
     -lODE \

applications/solvers/lagrangian/reactingParcelFoam/createClouds.H

@@ -1,9 +1,9 @@
 Info<< "\nConstructing reacting cloud" << endl;
-thermoReactingCloud parcels
+basicReactingCloud parcels
 (
     "reactingCloud1",
     rho,
     U,
     g,
-    thermo
+    slgThermo
 );

applications/solvers/lagrangian/reactingParcelFoam/createFields.H

@@ -8,6 +8,8 @@
 
     hsCombustionThermo& thermo = chemistry.thermo();
 
+    SLGThermo slgThermo(mesh, thermo);
+
     basicMultiComponentMixture& composition = thermo.composition();
     PtrList<volScalarField>& Y = composition.Y();
 

applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -33,10 +33,11 @@ Description
 #include "fvCFD.H"
 #include "hCombustionThermo.H"
 #include "turbulenceModel.H"
-#include "BasicReactingCloud.H"
+#include "basicReactingCloud.H"
 #include "psiChemistryModel.H"
 #include "chemistrySolver.H"
 #include "radiationModel.H"
+#include "SLGThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options

@@ -4,7 +4,13 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -18,6 +24,7 @@ EXE_LIBS = \
     -lthermophysicalFunctions \
     -lbasicThermophysicalModels \
     -lreactionThermophysicalModels \
+    -lSLGThermo \
     -lspecie \
     -lradiation \
     -lcompressibleRASModels \

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H

@@ -5,7 +5,7 @@
         rho,
         U,
         g,
-        thermo
+        slgThermo
     );
 
     Info<< "Constructing kinematicCloud1" << endl;

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H

@@ -6,6 +6,8 @@
     );
     basicPsiThermo& thermo = pThermo();
 
+    SLGThermo slgThermo(mesh, thermo);
+
     volScalarField& p = thermo.p();
     volScalarField& hs = thermo.hs();
     const volScalarField& psi = thermo.psi();

tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C

@@ -69,10 +69,8 @@ int main(int argc, char *argv[])
         Info<< "Time = " << runTime.timeName() << nl << endl;
 
         thermoCloud1.evolve();
-        thermoCloud1.info();
 
         kinematicCloud1.evolve();
-        kinematicCloud1.info();
 
 
         #include "rhoEqn.H"