From 85e249e61d2dbc6b9443373be06a679369b08fd1 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Thu, 21 Jun 2018 21:59:59 +0100
Subject: [PATCH] chemFoam: Changed from psi to rho thermo to support both
 liquid and gaseous reactions

---
 applications/solvers/combustion/chemFoam/chemFoam.C       | 2 +-
 .../solvers/combustion/chemFoam/createFieldRefs.H         | 4 ++--
 applications/solvers/combustion/chemFoam/createFields.H   | 8 ++++----
 .../chemFoam/gri/constant/thermophysicalProperties        | 2 +-
 .../chemFoam/h2/constant/thermophysicalProperties         | 2 +-
 .../chemFoam/ic8h18/constant/thermophysicalProperties     | 2 +-
 .../ic8h18_TDAC/constant/thermophysicalProperties         | 2 +-
 .../chemFoam/nc7h16/constant/thermophysicalProperties     | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C
index c6513e60c..2f5e5aab1 100644
--- a/applications/solvers/combustion/chemFoam/chemFoam.C
+++ b/applications/solvers/combustion/chemFoam/chemFoam.C
@@ -32,7 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "psiReactionThermo.H"
+#include "rhoReactionThermo.H"
 #include "BasicChemistryModel.H"
 #include "reactingMixture.H"
 #include "chemistrySolver.H"
diff --git a/applications/solvers/combustion/chemFoam/createFieldRefs.H b/applications/solvers/combustion/chemFoam/createFieldRefs.H
index 745805491..73f65df78 100644
--- a/applications/solvers/combustion/chemFoam/createFieldRefs.H
+++ b/applications/solvers/combustion/chemFoam/createFieldRefs.H
@@ -1,7 +1,7 @@
-BasicChemistryModel<psiReactionThermo>& chemistry = pChemistry();
+BasicChemistryModel<rhoReactionThermo>& chemistry = pChemistry();
 scalar dtChem = min
 (
-    refCast<const BasicChemistryModel<psiReactionThermo>>
+    refCast<const BasicChemistryModel<rhoReactionThermo>>
     (
         chemistry
     ).deltaTChem()[0],
diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H
index a70760962..b0baa21d0 100644
--- a/applications/solvers/combustion/chemFoam/createFields.H
+++ b/applications/solvers/combustion/chemFoam/createFields.H
@@ -24,13 +24,13 @@
     #include "createBaseFields.H"
 
     Info<< "Reading thermophysical properties\n" << endl;
-    autoPtr<psiReactionThermo> pThermo(psiReactionThermo::New(mesh));
-    psiReactionThermo& thermo = pThermo();
+    autoPtr<rhoReactionThermo> pThermo(rhoReactionThermo::New(mesh));
+    rhoReactionThermo& thermo = pThermo();
     thermo.validate(args.executable(), "h");
 
-    autoPtr<BasicChemistryModel<psiReactionThermo>> pChemistry
+    autoPtr<BasicChemistryModel<rhoReactionThermo>> pChemistry
     (
-        BasicChemistryModel<psiReactionThermo>::New(thermo)
+        BasicChemistryModel<rhoReactionThermo>::New(thermo)
     );
 
     volScalarField rho
diff --git a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
index aa3f2e1e3..347902eaf 100644
--- a/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/gri/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
index 90267ad29..4626be564 100644
--- a/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/h2/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
index 90267ad29..4626be564 100644
--- a/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
index 90267ad29..4626be564 100644
--- a/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/ic8h18_TDAC/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;
diff --git a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
index 90267ad29..4626be564 100644
--- a/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
+++ b/tutorials/combustion/chemFoam/nc7h16/constant/thermophysicalProperties
@@ -17,7 +17,7 @@ FoamFile
 
 thermoType
 {
-    type            hePsiThermo;
+    type            heRhoThermo;
     mixture         reactingMixture;
     transport       sutherland;
     thermo          janaf;