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& chemistry = pChemistry(); +BasicChemistryModel& chemistry = pChemistry(); scalar dtChem = min ( - refCast> + refCast> ( 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 pThermo(psiReactionThermo::New(mesh)); - psiReactionThermo& thermo = pThermo(); + autoPtr pThermo(rhoReactionThermo::New(mesh)); + rhoReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "h"); - autoPtr> pChemistry + autoPtr> pChemistry ( - BasicChemistryModel::New(thermo) + BasicChemistryModel::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;