diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 86ed6862e4..bce296229c 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -72,14 +72,14 @@ Foam::ReactingCloud::ReactingCloud const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ) : ThermoCloud(cloudType, rho, U, g, thermo), reactingCloud(), constProps_(this->particleProperties()), carrierThermo_(thermo), - gases_(gases), + carrierSpecies_(carrierSpecies), compositionModel_ ( CompositionModel >::New diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H index 0cc8bfc96b..848da63604 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H @@ -80,7 +80,7 @@ class ReactingCloud hCombustionThermo& carrierThermo_; //- Gas phase properties - PtrList& gases_; + PtrList& carrierSpecies_; // References to the cloud sub-models @@ -127,7 +127,7 @@ public: const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ); @@ -154,7 +154,7 @@ public: inline hCombustionThermo& carrierThermo(); //- Gas phase properties - inline const PtrList& gases() const; + inline const PtrList& carrierSpecies() const; // Sub-models diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H index 98d9eee8fe..d21df2f89d 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H @@ -52,9 +52,9 @@ Foam::ReactingCloud::carrierThermo() template inline const Foam::PtrList& -Foam::ReactingCloud::gases() const +Foam::ReactingCloud::carrierSpecies() const { - return gases_; + return carrierSpecies_; } diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C index 7936ddea40..4ffc530614 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C @@ -79,10 +79,10 @@ Foam::ReactingMultiphaseCloud::ReactingMultiphaseCloud const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ) : - ReactingCloud(cloudType, rho, U, g, thermo, gases), + ReactingCloud(cloudType, rho, U, g, thermo, carrierSpecies), reactingMultiphaseCloud(), constProps_(this->particleProperties()), devolatilisationModel_ diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H index ea3f585313..d16577c03a 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H @@ -121,7 +121,7 @@ public: const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ); diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C index 6cd0e4d4fe..405dc4a658 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C @@ -43,7 +43,7 @@ Foam::basicReactingCloud::basicReactingCloud const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ) : ReactingCloud @@ -53,7 +53,7 @@ Foam::basicReactingCloud::basicReactingCloud U, g, thermo, - gases + carrierSpecies ) { basicReactingParcel::readFields(*this); diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H index 42f36fddcb..7a56097614 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H @@ -77,7 +77,7 @@ public: const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ); diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C index c83cf4a20d..d174e0ea0a 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.C @@ -43,7 +43,7 @@ Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ) : ReactingMultiphaseCloud @@ -53,7 +53,7 @@ Foam::basicReactingMultiphaseCloud::basicReactingMultiphaseCloud U, g, thermo, - gases + carrierSpecies ) { basicReactingMultiphaseParcel::readFields(*this); diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H index 7ccdc7a7ae..e8a9485cb8 100644 --- a/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H +++ b/src/lagrangian/intermediate/clouds/derived/basicReactingMultiphaseCloud/basicReactingMultiphaseCloud.H @@ -77,7 +77,7 @@ public: const volVectorField& U, const dimensionedVector& g, hCombustionThermo& thermo, - PtrList& gases + PtrList& carrierSpecies ); diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index 977bb68234..4d4eae98fb 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -168,7 +168,7 @@ void Foam::ReactingMultiphaseParcel::cellValueSourceCorrection forAll(td.cloud().rhoTrans(), i) { scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass; - cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_); + cpEff += Y*td.cloud().carrierSpecies()[i].Cp(this->Tc_); } } const scalar cpc = td.cpInterp().psi()[cellI]; @@ -268,7 +268,7 @@ void Foam::ReactingMultiphaseParcel::calc scalarField dMassSRGas(YGas_.size(), 0.0); scalarField dMassSRLiquid(YLiquid_.size(), 0.0); scalarField dMassSRSolid(YSolid_.size(), 0.0); - scalarField dMassSRCarrier(td.cloud().gases().size(), 0.0); + scalarField dMassSRCarrier(td.cloud().carrierSpecies().size(), 0.0); // Return enthalpy source and calc mass transfer(s) due to surface reaction scalar hReaction = diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index f793f545f8..3ea161f28f 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -86,7 +86,7 @@ void Foam::ReactingParcel::cellValueSourceCorrection forAll(td.cloud().rhoTrans(), i) { scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass; - cpEff += Y*td.cloud().gases()[i].Cp(this->Tc_); + cpEff += Y*td.cloud().carrierSpecies()[i].Cp(this->Tc_); } } const scalar cpc = td.cpInterp().psi()[cellI]; diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H index 730d99fbb5..be45bc51ca 100644 --- a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H +++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H @@ -100,7 +100,8 @@ private: //- Set global ids - liquid and solid phases void setGlobalIds(const wordList& globalNames); - //- Set global gas ids - attempts to map component names to global gases + //- Set global gas ids - attempts to map component names to global + // carrier species void setGlobalGasIds(const PtrList& YGas); //- Check the total mass fraction diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C index 79f538d1e8..1bbdc5221f 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C @@ -40,7 +40,7 @@ Foam::CompositionModel::CompositionModel owner_(owner), coeffDict_(dict.subDict(type + "Coeffs")), carrierThermo_(owner.carrierThermo()), - gases_(owner.gases()), + carrierSpecies_(owner.carrierSpecies()), liquids_ ( liquidMixture::New @@ -111,9 +111,9 @@ Foam::CompositionModel::carrierThermo() const template const Foam::PtrList& -Foam::CompositionModel::gases() const +Foam::CompositionModel::carrierSpecies() const { - return gases_; + return carrierSpecies_; } @@ -294,8 +294,8 @@ Foam::scalarField Foam::CompositionModel::X forAll(Y, i) { label gid = props.globalIds()[i]; - WInv += Y[i]/this->gases()[gid].W(); - X[i] = Y[i]/this->gases()[gid].W(); + WInv += Y[i]/this->carrierSpecies()[gid].W(); + X[i] = Y[i]/this->carrierSpecies()[gid].W(); } break; } @@ -345,7 +345,7 @@ Foam::scalar Foam::CompositionModel::H forAll(Y, i) { label gid = props.globalIds()[i]; - HMixture += Y[i]*this->gases()[gid].H(T); + HMixture += Y[i]*this->carrierSpecies()[gid].H(T); } break; } @@ -409,7 +409,7 @@ Foam::scalar Foam::CompositionModel::cp forAll(Y, i) { label gid = props.globalIds()[i]; - cpMixture += Y[i]*this->gases()[gid].Cp(T); + cpMixture += Y[i]*this->carrierSpecies()[gid].Cp(T); } break; } diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H index f6a41acf0b..e45f7d96d0 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H @@ -27,7 +27,8 @@ Class Description Templated reacting parcel composition model class - Consists of gases (via thermo package), liquids and solids + Consists of carrier species (via thermo package), and additional liquids + and solids SourceFiles CompositionModel.C @@ -77,12 +78,12 @@ class CompositionModel hCombustionThermo& carrierThermo_; //- Reference to the carrier phase species - const PtrList& gases_; + const PtrList& carrierSpecies_; - //- Global liquid properties data + //- Global (additional) liquid properties data autoPtr liquids_; - //- Global solid properties data + //- Global (additional) solid properties data autoPtr solids_; //- List of phase properties @@ -150,13 +151,13 @@ public: // Composition lists - //- Return the gases - const PtrList& gases() const; + //- Return the carrier species + const PtrList& carrierSpecies() const; - //- Return the global liquids + //- Return the global (additional) liquids const liquidMixture& liquids() const; - //- Return the global solids + //- Return the global (additional) solids const solidMixture& solids() const; //- Return the list of phase properties diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C index f87de2537e..a9f6e5738a 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C @@ -41,8 +41,8 @@ Foam::scalarField Foam::LiquidEvaporation::calcXc forAll(Xc, i) { scalar Y = this->owner().carrierThermo().composition().Y()[i][cellI]; - Winv += Y/this->owner().gases()[i].W(); - Xc[i] = Y/this->owner().gases()[i].W(); + Winv += Y/this->owner().carrierSpecies()[i].W(); + Xc[i] = Y/this->owner().carrierSpecies()[i].W(); } return Xc/Winv;