From 3a77be2c4895ab062111338f6eb6649fc90cfabd Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 26 Aug 2008 10:57:40 +0100 Subject: [PATCH] moved constantVolume flag from massTransferModel to constantProperties --- .../Templates/ReactingParcel/ReactingParcel.C | 12 ++++++------ .../Templates/ReactingParcel/ReactingParcel.H | 6 ++++++ .../Templates/ReactingParcel/ReactingParcelI.H | 11 ++++++++++- .../ConstantRateDevolatilisation.C | 7 ------- .../ConstantRateDevolatilisation.H | 3 --- .../MassTransferModel/MassTransferModel.H | 3 --- .../NoMassTransfer/NoMassTransfer.C | 7 ------- .../NoMassTransfer/NoMassTransfer.H | 3 --- .../SingleKineticRateDevolatilisation.C | 7 ------- .../SingleKineticRateDevolatilisation.H | 3 --- 10 files changed, 22 insertions(+), 40 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 7fe198e773..5fe3aa1633 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -191,13 +191,13 @@ void Foam::ReactingParcel::calcCoupled + YMixture_[2]*td.cloud().composition().cpSolid(YSolid_); // Update particle density or diameter - if (td.cloud().massTransfer().changesVolume()) + if (td.constProps().constantVolume()) { - this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi); + this->rho_ = mass1/this->volume(); } else { - this->rho_ = mass1/this->volume(); + this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi); } } } @@ -296,13 +296,13 @@ void Foam::ReactingParcel::calcUncoupled this->cp_ = cp1; // Update particle density or diameter - if (td.cloud().massTransfer().changesVolume()) + if (td.constProps().constantVolume()) { - this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi); + this->rho_ = mass1/this->volume(); } else { - this->rho_ = mass1/this->volume(); + this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi); } } } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index a6b8eb5ad5..fc4edfb797 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -92,6 +92,9 @@ public: //- Latent heat of devolatilisation [J/kg] const scalar Ldevol_; + //- Constant volume flag - e.g. during mass transfer + Switch constantVolume_; + public: @@ -108,6 +111,9 @@ public: //- Return const access to the latent heat of devolatilisation inline scalar Ldevol() const; + + //- Return const access to the constant volume flag + inline Switch constantVolume() const; }; diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index 0c50b0a853..d84ee3742c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -35,7 +35,8 @@ inline Foam::ReactingParcel::constantProperties::constantProperties ThermoParcel::constantProperties(dict), Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()), Tbp_(dimensionedScalar(dict.lookup("Tbp")).value()), - Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value()) + Ldevol_(dimensionedScalar(dict.lookup("Ldevol")).value()), + constantVolume_(dict.lookup("constantVolume")) {} @@ -136,6 +137,14 @@ Foam::ReactingParcel::constantProperties::Ldevol() const } +template +inline Foam::Switch +Foam::ReactingParcel::constantProperties::constantVolume() const +{ + return constantVolume_; +} + + // * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * // template diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C index cb2785d175..304bd6897c 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C @@ -60,13 +60,6 @@ bool Foam::ConstantRateDevolatilisation::active() const } -template -bool Foam::ConstantRateDevolatilisation::changesVolume() const -{ - return false; -} - - template Foam::scalar Foam::ConstantRateDevolatilisation::calculate ( diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H index 14e7262169..094859cbec 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H +++ b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H @@ -89,9 +89,6 @@ public: //- Flag to indicate whether model activates mass transfer model bool active() const; - //- Flag to indicate whether model changes particle volume - bool changesVolume() const; - //- Update model scalar calculate ( diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H index 7b16d3dc35..2c5b5159cf 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H @@ -130,9 +130,6 @@ public: //- Flag to indicate whether model activates mass transfer model virtual bool active() const = 0; - //- Flag to indicate whether model changes particle volume - virtual bool changesVolume() const = 0; - //- Update model virtual scalar calculate ( diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C index 5b21a77250..38cb63ff38 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C +++ b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C @@ -55,13 +55,6 @@ bool Foam::NoMassTransfer::active() const } -template -bool Foam::NoMassTransfer::changesVolume() const -{ - return false; -} - - template Foam::scalar Foam::NoMassTransfer::calculate ( diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H index fb3e30fc61..9415db1dad 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H +++ b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H @@ -75,9 +75,6 @@ public: //- Flag to indicate whether model activates mass transfer model bool active() const; - //- Flag to indicate whether model changes particle volume - bool changesVolume() const; - //- Update model scalar calculate ( diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C index c8b5367d50..8cf111b816 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C +++ b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C @@ -62,13 +62,6 @@ bool Foam::SingleKineticRateDevolatilisation::active() const } -template -bool Foam::SingleKineticRateDevolatilisation::changesVolume() const -{ - return false; -} - - template Foam::scalar Foam::SingleKineticRateDevolatilisation::calculate ( diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H index a2894e5ece..13d3d4825a 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H +++ b/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H @@ -91,9 +91,6 @@ public: //- Flag to indicate whether model activates mass transfer model bool active() const; - //- Flag to indicate whether model changes particle volume - bool changesVolume() const; - //- Update model scalar calculate (