basicSpecieThermo: Updated solver references to mixture class

This commit is contained in:
Will Bainbridge
2017-12-01 11:05:28 +00:00
parent 1206066f40
commit ea51d79c0d
9 changed files with 10 additions and 10 deletions

View File

@ -7,7 +7,7 @@ autoPtr<psiuReactionThermo> pThermo
psiuReactionThermo& thermo = pThermo(); psiuReactionThermo& thermo = pThermo();
thermo.validate(args.executable(), "ha", "ea"); thermo.validate(args.executable(), "ha", "ea");
basicMultiComponentMixture& composition = thermo.composition(); basicSpecieMixture& composition = thermo.composition();
volScalarField rho volScalarField rho
( (

View File

@ -7,7 +7,7 @@ autoPtr<psiuReactionThermo> pThermo
psiuReactionThermo& thermo = pThermo(); psiuReactionThermo& thermo = pThermo();
thermo.validate(args.executable(), "ha", "ea"); thermo.validate(args.executable(), "ha", "ea");
basicMultiComponentMixture& composition = thermo.composition(); basicSpecieMixture& composition = thermo.composition();
volScalarField rho volScalarField rho
( (

View File

@ -38,7 +38,7 @@ Description
#include "chemistrySolver.H" #include "chemistrySolver.H"
#include "OFstream.H" #include "OFstream.H"
#include "thermoPhysicsTypes.H" #include "thermoPhysicsTypes.H"
#include "basicMultiComponentMixture.H" #include "basicSpecieMixture.H"
#include "cellModeller.H" #include "cellModeller.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

@ -3,6 +3,6 @@ scalar dtChem = refCast<const BasicChemistryModel<psiReactionThermo>>
( (
chemistry chemistry
).deltaTChem()[0]; ).deltaTChem()[0];
basicMultiComponentMixture& composition = thermo.composition(); basicSpecieMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y(); PtrList<volScalarField>& Y = composition.Y();
volScalarField& p = thermo.p(); volScalarField& p = thermo.p();

View File

@ -5,7 +5,7 @@ thermo.validate(args.executable(), "h", "e");
SLGThermo slgThermo(mesh, thermo); SLGThermo slgThermo(mesh, thermo);
basicMultiComponentMixture& composition = thermo.composition(); basicSpecieMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y(); PtrList<volScalarField>& Y = composition.Y();
const word inertSpecie(thermo.lookup("inertSpecie")); const word inertSpecie(thermo.lookup("inertSpecie"));

View File

@ -5,7 +5,7 @@ autoPtr<psiReactionThermo> pThermo(psiReactionThermo::New(mesh));
psiReactionThermo& thermo = pThermo(); psiReactionThermo& thermo = pThermo();
thermo.validate(args.executable(), "h", "e"); thermo.validate(args.executable(), "h", "e");
basicMultiComponentMixture& composition = thermo.composition(); basicSpecieMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y(); PtrList<volScalarField>& Y = composition.Y();
const word inertSpecie(thermo.lookup("inertSpecie")); const word inertSpecie(thermo.lookup("inertSpecie"));

View File

@ -5,7 +5,7 @@ autoPtr<rhoReactionThermo> pThermo(rhoReactionThermo::New(mesh));
rhoReactionThermo& thermo = pThermo(); rhoReactionThermo& thermo = pThermo();
thermo.validate(args.executable(), "h", "e"); thermo.validate(args.executable(), "h", "e");
basicMultiComponentMixture& composition = thermo.composition(); basicSpecieMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y(); PtrList<volScalarField>& Y = composition.Y();
const word inertSpecie(thermo.lookup("inertSpecie")); const word inertSpecie(thermo.lookup("inertSpecie"));

View File

@ -5,7 +5,7 @@ autoPtr<rhoReactionThermo> pThermo(rhoReactionThermo::New(mesh));
rhoReactionThermo& thermo = pThermo(); rhoReactionThermo& thermo = pThermo();
thermo.validate(args.executable(), "h", "e"); thermo.validate(args.executable(), "h", "e");
basicMultiComponentMixture& composition = thermo.composition(); basicSpecieMixture& composition = thermo.composition();
PtrList<volScalarField>& Y = composition.Y(); PtrList<volScalarField>& Y = composition.Y();
const word inertSpecie(thermo.lookup("inertSpecie")); const word inertSpecie(thermo.lookup("inertSpecie"));

View File

@ -67,7 +67,7 @@ Foam::TDACChemistryModel<ReactionThermo, ThermoType>::TDACChemistryModel
scalar(0) scalar(0)
) )
{ {
basicMultiComponentMixture& composition = this->thermo().composition(); basicSpecieMixture& composition = this->thermo().composition();
// Store the species composition according to the species index // Store the species composition according to the species index
speciesTable speciesTab = composition.species(); speciesTable speciesTab = composition.species();
@ -610,7 +610,7 @@ Foam::scalar Foam::TDACChemistryModel<ReactionThermo, ThermoType>::solve
label nAdditionalEqn = (tabulation_->variableTimeStep() ? 1 : 0); label nAdditionalEqn = (tabulation_->variableTimeStep() ? 1 : 0);
basicMultiComponentMixture& composition = this->thermo().composition(); basicSpecieMixture& composition = this->thermo().composition();
// CPU time analysis // CPU time analysis
const clockTime clockTime_= clockTime(); const clockTime clockTime_= clockTime();