Commit 2f5178f6 authored by Andrew Heather's avatar Andrew Heather
Browse files

updates

parent 13a61cb5
......@@ -13,6 +13,9 @@ coalParcel/submodels/makeCoalParcelHeatTransferModels.C
coalParcel/submodels/makeCoalParcelPhaseChangeModels.C
coalParcel/submodels/makeCoalParcelSurfaceReactionModels.C
coalParcel/submodels/makeCoalParcelWallInteractionModels.C
submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
......
......@@ -59,10 +59,10 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate
CsLocalId_ = owner.composition().localId(idSolid, "C");
// Set local copies of thermo properties
WO2_ = owner().composition().carrierSpecies()[O2GlobalId_].W();
scalar WCO2 = owner().composition().carrierSpecies()[CO2GlobalId_].W();
WO2_ = owner.composition().carrierSpecies()[O2GlobalId_].W();
scalar WCO2 = owner.composition().carrierSpecies()[CO2GlobalId_].W();
WC_ = WCO2 - WO2_;
HcCO2_ = owner().composition().carrierSpecies()[CO2GlobalId_].Hc();
HcCO2_ = owner.composition().carrierSpecies()[CO2GlobalId_].Hc();
if (Sb_ < 0)
{
......
......@@ -63,18 +63,6 @@ class COxidationDiffusionLimitedRate
const scalar D_;
// Local copies of thermo properties
//- Molecular weight of C [kg/kmol]
scalar WC_;
//- Molecular weight of O2 [kg/kmol]
scalar WO2_;
//- Chemical enthalpy of CO2 [J/kg]
scalar HcCO2_;
// Addressing
//- Cs positions in global/local lists
......@@ -87,6 +75,18 @@ class COxidationDiffusionLimitedRate
label CO2GlobalId_;
// Local copies of thermo properties
//- Molecular weight of C [kg/kmol]
scalar WC_;
//- Molecular weight of O2 [kg/kmol]
scalar WO2_;
//- Chemical enthalpy of CO2 [J/kg]
scalar HcCO2_;
public:
//- Runtime type information
......
......@@ -62,10 +62,10 @@ COxidationKineticDiffusionLimitedRate
CsLocalId_ = owner.composition().localId(idSolid, "C");
// Set local copies of thermo properties
WO2_ = owner().composition().carrierSpecies()[O2GlobalId_].W();
scalar WCO2 = owner().composition().carrierSpecies()[CO2GlobalId_].W();
WO2_ = owner.composition().carrierSpecies()[O2GlobalId_].W();
scalar WCO2 = owner.composition().carrierSpecies()[CO2GlobalId_].W();
WC_ = WCO2 - WO2_;
HcCO2_ = owner().composition().carrierSpecies()[CO2GlobalId_].Hc();
HcCO2_ = owner.composition().carrierSpecies()[CO2GlobalId_].Hc();
if (Sb_ < 0)
{
......
......@@ -70,18 +70,6 @@ class COxidationKineticDiffusionLimitedRate
const scalar E_;
// Local copies of thermo properties
//- Molecular weight of C [kg/kmol]
scalar WC_;
//- Molecular weight of O2 [kg/kmol]
scalar WO2_;
//- Chemical enthalpy of CO2 [J/kg]
scalar HcCO2_;
// Addressing
//- Cs positions in global/local lists
......@@ -94,6 +82,18 @@ class COxidationKineticDiffusionLimitedRate
label CO2GlobalId_;
// Local copies of thermo properties
//- Molecular weight of C [kg/kmol]
scalar WC_;
//- Molecular weight of O2 [kg/kmol]
scalar WO2_;
//- Chemical enthalpy of CO2 [J/kg]
scalar HcCO2_;
public:
//- Runtime type information
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment