diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 230a4c1cd3..0bb8f3704e 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -115,6 +115,7 @@ public: const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index 04b85b99dc..c3f1872606 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -85,6 +85,7 @@ inline Foam::ReactingParcel::constantProperties::constantProperties const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, @@ -105,6 +106,7 @@ inline Foam::ReactingParcel::constantProperties::constantProperties poissonsRatio, T0, TMin, + TMax, Cp0, epsilon0, f0, diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index e7b5a14a49..232b45d471 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -82,6 +82,9 @@ public: //- Minimum temperature [K] scalar TMin_; + //- Maximum temperature [K] + scalar TMax_; + //- Particle specific heat capacity [J/(kg.K)] scalar Cp0_; @@ -123,6 +126,7 @@ public: const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, @@ -140,6 +144,9 @@ public: //- Return const access to minimum temperature [K] inline scalar TMin() const; + //- Return const access to maximum temperature [K] + inline scalar TMax() const; + //- Return const access to the particle specific heat capacity // [J/(kg.K)] inline scalar Cp0() const; diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index e5c7e349c5..952a7a5bbe 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -31,6 +31,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties() ParcelType::constantProperties(), T0_(0.0), TMin_(0.0), + TMax_(VGREAT), Cp0_(0.0), epsilon0_(0.0), f0_(0.0), @@ -47,6 +48,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties ParcelType::constantProperties(cp), T0_(cp.T0_), TMin_(cp.TMin_), + TMax_(cp.TMax_), Cp0_(cp.Cp0_), epsilon0_(cp.epsilon0_), f0_(cp.f0_), @@ -64,6 +66,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties ParcelType::constantProperties(parentDict, readFields), T0_(0.0), TMin_(0.0), + TMax_(VGREAT), Cp0_(0.0), epsilon0_(0.0), f0_(0.0), @@ -73,6 +76,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties { this->dict().lookup("T0") >> T0_; this->dict().lookup("TMin") >> TMin_; + this->dict().lookup("TMax") >> TMax_; this->dict().lookup("Cp0") >> Cp0_; this->dict().lookup("epsilon0") >> epsilon0_; this->dict().lookup("f0") >> f0_; @@ -92,6 +96,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties const scalar poissonsRatio, const scalar T0, const scalar TMin, + const scalar TMax, const scalar Cp0, const scalar epsilon0, const scalar f0, @@ -109,6 +114,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties ), T0_(T0), TMin_(TMin), + TMax_(TMax), Cp0_(Cp0), epsilon0_(epsilon0), f0_(f0), @@ -195,6 +201,14 @@ Foam::ThermoParcel::constantProperties::TMin() const } +template +inline Foam::scalar +Foam::ThermoParcel::constantProperties::TMax() const +{ + return TMax_; +} + + template inline Foam::scalar Foam::ThermoParcel::constantProperties::Cp0() const