From a9b8718c3f748df56591aa876e61bc99dcf8c588 Mon Sep 17 00:00:00 2001
From: Paul Kieckhefen <paul.kieckhefen@gmail.com>
Date: Wed, 10 Apr 2019 14:36:06 +0200
Subject: [PATCH] adapt cfdemSolverRhoPimpleChem for OF-6.

---
 .../cfdemSolverRhoPimpleChem/Make/options     |  7 -------
 .../solvers/cfdemSolverRhoPimpleChem/YEqn.H   |  2 +-
 .../cfdemSolverRhoPimpleChem.C                |  5 +++--
 .../cfdemSolverRhoPimpleChem/createFields.H   | 20 +++++++++----------
 4 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options
index aa2a2273..3555fa85 100644
--- a/applications/solvers/cfdemSolverRhoPimpleChem/Make/options
+++ b/applications/solvers/cfdemSolverRhoPimpleChem/Make/options
@@ -19,12 +19,8 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude \
@@ -48,9 +44,6 @@ EXE_LIBS = \
     -l$(CFDEM_LIB_COMP_NAME) \
      $(CFDEM_ADD_LIB_PATHS) \
      $(CFDEM_ADD_LIBS) \
-    -lliquidProperties \
-    -lliquidMixtureProperties \
-    -lthermophysicalFunctions \
     -lreactionThermophysicalModels \
     -lchemistryModel \
     -lradiationModels \
diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H
index 3c82ddc8..525ef340 100644
--- a/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H
+++ b/applications/solvers/cfdemSolverRhoPimpleChem/YEqn.H
@@ -13,7 +13,7 @@ tmp<fv::convectionScheme<scalar> > mvConvection
 
 {
     combustion->correct();
-    dQ = combustion->dQ();
+    dQ = combustion->Qdot();
     label inertIndex = -1;
     volScalarField Yt(0.0*Y[0]);
 
diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C
index 762a1cbc..460d6a78 100644
--- a/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C
+++ b/applications/solvers/cfdemSolverRhoPimpleChem/cfdemSolverRhoPimpleChem.C
@@ -30,7 +30,8 @@ Description
 
 #include "fvCFD.H"
 #include "turbulentFluidThermoModel.H"
-#include "rhoCombustionModel.H"
+#include "rhoReactionThermo.H"
+#include "CombustionModel.H"
 #include "bound.H"
 #include "pimpleControl.H"
 #include "fvOptions.H"
@@ -117,7 +118,7 @@ int main(int argc, char *argv[])
 
        particleCloud.clockM().start(26,"Flow");
 
-        if (pimple.nCorrPIMPLE() <= 1)
+        if (pimple.nCorrPimple() <= 1)
         {
             #include "rhoEqn.H"
         }
diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H
index 80f4166e..c1013203 100644
--- a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H
+++ b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H
@@ -1,21 +1,15 @@
     //  thermodynamics, chemistry
 
-    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");
 
     basicSpecieMixture& composition = thermo.composition();
     PtrList<volScalarField>& Y = composition.Y();
 
     // read molecular weight
-    volScalarField W(composition.W());
+    volScalarField W(thermo.W());
 
     bool propagateInertSpecie = true;
 
@@ -209,6 +203,12 @@
         )
     );
 
+    Info<< "Creating combustion model\n" << endl;
+    autoPtr<CombustionModel<rhoReactionThermo>> combustion
+    (
+        CombustionModel<rhoReactionThermo>::New(thermo, turbulence())
+    );
+
     Info<< "Creating field dpdt\n" << endl;
     volScalarField dpdt
     (