diff --git a/src/lagrangian/coalCombustion/Make/files b/src/lagrangian/coalCombustion/Make/files index b4af07a35dde3a89e5cb8fc53583fcdd32300751..c8fb192aea89081987d98a244d718aeb2b0d897e 100755 --- a/src/lagrangian/coalCombustion/Make/files +++ b/src/lagrangian/coalCombustion/Make/files @@ -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 diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C index 2212358bef549f7434c8f0ae64316c9f19469d70..516554874cdaf1f5fcdab8f2a0375892952bfee4 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.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) { diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H index 888dac441afae7afe382af4b355f51aa32cbc2c5..4458a6e31e2ad4ee5e37827596322d119916d75a 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H @@ -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 diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C index e4001dc858396bdaad28342976da64f5b0455c8d..eb44c6391afaf52dc186b2a30acad79ffcb1ad40 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C @@ -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) { diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H index 6939bf193583077b77aefc83b8430edebd11fb97..1073cb637f8a69e62d45e41f74bd733b0ef4ac7b 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H @@ -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