diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index 70cec41f5b..a0568cd489 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -7,7 +7,7 @@ autoPtr pThermo psiuReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "ha", "ea"); -basicMultiComponentMixture& composition = thermo.composition(); +basicSpecieMixture& composition = thermo.composition(); volScalarField rho ( diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 4339a3d84b..fa7f36ddf2 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -7,7 +7,7 @@ autoPtr pThermo psiuReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "ha", "ea"); -basicMultiComponentMixture& composition = thermo.composition(); +basicSpecieMixture& composition = thermo.composition(); volScalarField rho ( diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C index 7e32e64b87..a3e704fcf5 100644 --- a/applications/solvers/combustion/chemFoam/chemFoam.C +++ b/applications/solvers/combustion/chemFoam/chemFoam.C @@ -42,7 +42,7 @@ Description #include "chemistrySolver.H" #include "OFstream.H" #include "thermoPhysicsTypes.H" -#include "basicMultiComponentMixture.H" +#include "basicSpecieMixture.H" #include "cellModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/chemFoam/createFieldRefs.H b/applications/solvers/combustion/chemFoam/createFieldRefs.H index fa0fbe2fe9..df659495db 100644 --- a/applications/solvers/combustion/chemFoam/createFieldRefs.H +++ b/applications/solvers/combustion/chemFoam/createFieldRefs.H @@ -3,6 +3,6 @@ scalar dtChem = refCast> ( chemistry ).deltaTChem()[0]; -basicMultiComponentMixture& composition = thermo.composition(); +basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); volScalarField& p = thermo.p(); diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 5ce421a6bd..d6f83561b3 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -5,7 +5,7 @@ thermo.validate(args.executable(), "h", "e"); SLGThermo slgThermo(mesh, thermo); -basicMultiComponentMixture& composition = thermo.composition(); +basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); const word inertSpecie(thermo.lookup("inertSpecie")); diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index b45da388cd..6efaf1eb8d 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -5,7 +5,7 @@ autoPtr pThermo(psiReactionThermo::New(mesh)); psiReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); -basicMultiComponentMixture& composition = thermo.composition(); +basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); const word inertSpecie(thermo.lookup("inertSpecie")); diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index 7c28c1879a..4bdfc46d4f 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -5,7 +5,7 @@ autoPtr pThermo(rhoReactionThermo::New(mesh)); rhoReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); -basicMultiComponentMixture& composition = thermo.composition(); +basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); const word inertSpecie(thermo.lookup("inertSpecie")); diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index 024755ef4d..95524e04ef 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -5,7 +5,7 @@ autoPtr pThermo(rhoReactionThermo::New(mesh)); rhoReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "h", "e"); -basicMultiComponentMixture& composition = thermo.composition(); +basicSpecieMixture& composition = thermo.composition(); PtrList& Y = composition.Y(); const word inertSpecie(thermo.lookup("inertSpecie")); diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C index b275f735e7..2fe0227eec 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C @@ -67,7 +67,7 @@ Foam::TDACChemistryModel::TDACChemistryModel dimensionedScalar(dimless, Zero) ) { - basicMultiComponentMixture& composition = this->thermo().composition(); + basicSpecieMixture& composition = this->thermo().composition(); // Store the species composition according to the species index speciesTable speciesTab = composition.species(); @@ -611,7 +611,7 @@ Foam::scalar Foam::TDACChemistryModel::solve label nAdditionalEqn = (tabulation_->variableTimeStep() ? 1 : 0); - basicMultiComponentMixture& composition = this->thermo().composition(); + basicSpecieMixture& composition = this->thermo().composition(); // CPU time analysis const clockTime clockTime_= clockTime();