INT: Additional integration updates/clean-up

applications/solvers/lagrangian/simpleCoalParcelFoam/YEqn.H

@@ -10,8 +10,8 @@ tmp<fv::convectionScheme<scalar>> mvConvection
 );
 
 {
-    combustion->correct();
-    Qdot = combustion->Qdot();
+    reaction->correct();
+    Qdot = reaction->Qdot();
     volScalarField Yt(0.0*Y[0]);
 
     forAll(Y, i)
@@ -26,7 +26,7 @@ tmp<fv::convectionScheme<scalar>> mvConvection
               - fvm::laplacian(turbulence->muEff(), Yi)
              ==
                 parcels.SYi(i, Yi)
-              + combustion->R(Yi)
+              + reaction->R(Yi)
               + fvOptions(rho, Yi)
             );
 

applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H

@@ -1,13 +1,9 @@
 #include "readGravitationalAcceleration.H"
 
-Info<< "Creating combustion model\n" << endl;
 
-autoPtr<combustionModels::rhoCombustionModel> combustion
-(
-    combustionModels::rhoCombustionModel::New(mesh)
-);
-
-rhoReactionThermo& thermo = combustion->thermo();
+Info<< "Reading thermophysical properties\n" << endl;
+autoPtr<rhoReactionThermo> pThermo(rhoReactionThermo::New(mesh));
+rhoReactionThermo& thermo = pThermo();
 thermo.validate(args.executable(), "h", "e");
 
 SLGThermo slgThermo(mesh, thermo);
@@ -91,8 +87,11 @@ autoPtr<compressible::turbulenceModel> turbulence
     )
 );
 
-// Set the turbulence into the combustion model
-combustion->setTurbulence(turbulence());
+Info<< "Creating reaction model\n" << endl;
+autoPtr<CombustionModel<rhoReactionThermo>> reaction
+(
+    CombustionModel<rhoReactionThermo>::New(thermo, turbulence())
+);
 
 Info<< "Creating multi-variate interpolation scheme\n" << endl;
 multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;

applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C

@@ -36,7 +36,8 @@ Description
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
 #include "coalCloud.H"
-#include "rhoCombustionModel.H"
+#include "rhoReactionThermo.H"
+#include "CombustionModel.H"
 #include "radiationModel.H"
 #include "IOporosityModelList.H"
 #include "fvOptions.H"

applications/solvers/lagrangian/sprayFoam/engineFoam/startSummary.H

@@ -0,0 +1,11 @@
+Info<< "Total cylinder mass: " << fvc::domainIntegrate(rho).value() << endl;
+//Info<< "Total fuel mass: "
+//    << fvc::domainIntegrate(rho*compostion.ft()).value() << endl;
+
+OFstream logSummaryFile
+(
+    runTime.path()/("logSummary." + runTime.timeName() + ".dat")
+);
+
+logSummaryFile
+    << "# CA" << "      p" << "        T" << "       u'" << endl;

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.C

@@ -147,6 +147,13 @@ void Foam::twoPhaseMixtureEThermo::correct()
 }
 
 
+Foam::word Foam::twoPhaseMixtureEThermo::thermoName() const
+{
+    NotImplemented;
+    return word::null;
+}
+
+
 Foam::tmp<Foam::volScalarField> Foam::twoPhaseMixtureEThermo::he
 (
     const volScalarField& p,

applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/twoPhaseMixtureEThermo/twoPhaseMixtureEThermo.H

@@ -278,6 +278,9 @@ public:
         //- Correct the thermo fields
         virtual void correct();
 
+        //- Return the name of the thermo physics
+        virtual word thermoName() const;
+
         //- Read properties
         virtual bool read();