From ea51d79c0d1b3baeddb43f34f1855775630ffac9 Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Fri, 1 Dec 2017 11:05:28 +0000 Subject: [PATCH] basicSpecieThermo: Updated solver references to mixture class --- applications/solvers/combustion/PDRFoam/createFields.H | 2 +- applications/solvers/combustion/XiFoam/createFields.H | 2 +- applications/solvers/combustion/chemFoam/chemFoam.C | 2 +- applications/solvers/combustion/chemFoam/createFieldRefs.H | 2 +- applications/solvers/combustion/fireFoam/createFields.H | 2 +- applications/solvers/combustion/reactingFoam/createFields.H | 2 +- .../reactingFoam/rhoReactingBuoyantFoam/createFields.H | 2 +- .../combustion/reactingFoam/rhoReactingFoam/createFields.H | 2 +- .../chemistryModel/TDACChemistryModel/TDACChemistryModel.C | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index 8eadd3146..ebbfbbf83 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 96160a62f..7ca44da92 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 8a5c33cbe..5e79f6227 100644 --- a/applications/solvers/combustion/chemFoam/chemFoam.C +++ b/applications/solvers/combustion/chemFoam/chemFoam.C @@ -38,7 +38,7 @@ Description #include "chemistrySolver.H" #include "OFstream.H" #include "thermoPhysicsTypes.H" -#include "basicMultiComponentMixture.H" +#include "basicSpecieMixture.H" #include "cellModeller.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/chemFoam/createFieldRefs.H b/applications/solvers/combustion/chemFoam/createFieldRefs.H index fa0fbe2fe..df659495d 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 f6897092a..afcc85ffa 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 9a446a53c..194b9e319 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 8028b6321..7d18827c1 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 4b6b8ddc4..3c4a5e2d0 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 7eb600785..0de90a550 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/TDACChemistryModel/TDACChemistryModel.C @@ -67,7 +67,7 @@ Foam::TDACChemistryModel::TDACChemistryModel scalar(0) ) { - basicMultiComponentMixture& composition = this->thermo().composition(); + basicSpecieMixture& composition = this->thermo().composition(); // Store the species composition according to the species index speciesTable speciesTab = composition.species(); @@ -610,7 +610,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();