diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C index 833566efee..17b5f36c38 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C @@ -70,6 +70,24 @@ Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate } +template +Foam::COxidationDiffusionLimitedRate::COxidationDiffusionLimitedRate +( + const COxidationDiffusionLimitedRate& srm +) +: + SurfaceReactionModel(srm), + Sb_(srm.Sb_), + D_(srm.D_), + CsLocalId_(srm.CsLocalId_), + O2GlobalId_(srm.O2GlobalId_), + CO2GlobalId_(srm.CO2GlobalId_), + WC_(srm.WC_), + WO2_(srm.WO2_), + HcCO2_(srm.HcCO2_) +{} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template @@ -80,13 +98,6 @@ Foam::COxidationDiffusionLimitedRate:: // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::COxidationDiffusionLimitedRate::active() const -{ - return true; -} - - template Foam::scalar Foam::COxidationDiffusionLimitedRate::calculate ( diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H index 3caebe1f5a..7c7d5ad401 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H @@ -105,6 +105,21 @@ public: CloudType& owner ); + //- Construct copy + COxidationDiffusionLimitedRate + ( + const COxidationDiffusionLimitedRate& srm + ); + + //- Construct and return a clone + virtual autoPtr > clone() const + { + return autoPtr > + ( + new COxidationDiffusionLimitedRate(*this) + ); + } + //- Destructor virtual ~COxidationDiffusionLimitedRate(); @@ -112,9 +127,6 @@ public: // Member Functions - //- Flag to indicate whether model activates surface reaction model - virtual bool active() const; - //- Update surface reactions virtual scalar calculate ( diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C index 8e3dc2059e..5c705a8666 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C @@ -78,6 +78,26 @@ COxidationKineticDiffusionLimitedRate } +template +Foam::COxidationKineticDiffusionLimitedRate:: +COxidationKineticDiffusionLimitedRate +( + const COxidationKineticDiffusionLimitedRate& srm +) +: + SurfaceReactionModel(srm), + Sb_(srm.Sb_), + C1_(srm.C1_), + C2_(srm.C2_), + E_(srm.E_), + CsLocalId_(srm.CsLocalId_), + O2GlobalId_(srm.O2GlobalId_), + CO2GlobalId_(srm.CO2GlobalId_), + WC_(srm.WC_), + WO2_(srm.WO2_) +{} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template @@ -88,13 +108,6 @@ Foam::COxidationKineticDiffusionLimitedRate:: // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::COxidationKineticDiffusionLimitedRate::active() const -{ - return true; -} - - template Foam::scalar Foam::COxidationKineticDiffusionLimitedRate::calculate ( diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H index ffe9466c04..3d9bf041f1 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H @@ -113,6 +113,21 @@ public: CloudType& owner ); + //- Construct copy + COxidationKineticDiffusionLimitedRate + ( + const COxidationKineticDiffusionLimitedRate& srm + ); + + //- Construct and return a clone + virtual autoPtr > clone() const + { + return autoPtr > + ( + new COxidationKineticDiffusionLimitedRate(*this) + ); + } + //- Destructor virtual ~COxidationKineticDiffusionLimitedRate(); @@ -120,9 +135,6 @@ public: // Member Functions - //- Flag to indicate whether model activates surface reaction model - virtual bool active() const; - //- Update surface reactions virtual scalar calculate ( diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C index 4030f6d93c..93360ef763 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C @@ -75,6 +75,29 @@ Foam::COxidationMurphyShaddix::COxidationMurphyShaddix } +template +Foam::COxidationMurphyShaddix::COxidationMurphyShaddix +( + const COxidationMurphyShaddix& srm +) +: + SurfaceReactionModel(srm), + D0_(srm.D0_), + rho0_(srm.rho0_), + T0_(srm.T0_), + Dn_(srm.Dn_), + A_(srm.A_), + E_(srm.E_), + n_(srm.n_), + WVol_(srm.WVol_), + CsLocalId_(srm.CsLocalId_), + O2GlobalId_(srm.O2GlobalId_), + CO2GlobalId_(srm.CO2GlobalId_), + WC_(srm.WC_), + WO2_(srm.WO2_) +{} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template @@ -84,13 +107,6 @@ Foam::COxidationMurphyShaddix::~COxidationMurphyShaddix() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -bool Foam::COxidationMurphyShaddix::active() const -{ - return true; -} - - template Foam::scalar Foam::COxidationMurphyShaddix::calculate ( @@ -206,7 +222,7 @@ Foam::scalar Foam::COxidationMurphyShaddix::calculate const scalar HC = this->owner().composition().solids().properties()[CsLocalId_].Hf() - + this->owner().composition().solids().properties()[CsLocalId_].cp()*T; + + this->owner().composition().solids().properties()[CsLocalId_].Cp()*T; const scalar HCO2 = this->owner().thermo().carrier().H(CO2GlobalId_, T); const scalar HO2 = this->owner().thermo().carrier().H(O2GlobalId_, T); diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H index 599c05bfb3..4d9f6b6f1f 100644 --- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H +++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H @@ -131,6 +131,21 @@ public: CloudType& owner ); + //- Construct copy + COxidationMurphyShaddix + ( + const COxidationMurphyShaddix& srm + ); + + //- Construct and return a clone + virtual autoPtr > clone() const + { + return autoPtr > + ( + new COxidationMurphyShaddix(*this) + ); + } + //- Destructor virtual ~COxidationMurphyShaddix(); @@ -138,9 +153,6 @@ public: // Member Functions - //- Flag to indicate whether model activates surface reaction model - virtual bool active() const; - //- Update surface reactions virtual scalar calculate (