diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H index 464f829239..7cd491fde7 100644 --- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H +++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H @@ -173,6 +173,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H index 27a729211c..2d68984738 100644 --- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H +++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/BoussinesqI.H @@ -120,6 +120,20 @@ inline Foam::scalar Foam::Boussinesq::rho } +template +inline Foam::scalar Foam::Boussinesq::h(scalar p, scalar T) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::Boussinesq::cp(scalar p, scalar T) const +{ + return 0; +} + + template inline Foam::scalar Foam::Boussinesq::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H index 8a24f6e104..cb55086c48 100644 --- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H @@ -168,6 +168,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H index c69829d9a6..45ccf67cd9 100644 --- a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGasI.H @@ -116,6 +116,20 @@ inline Foam::scalar Foam::PengRobinsonGas::rho } +template +inline Foam::scalar Foam::PengRobinsonGas::h(scalar p, scalar T) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::PengRobinsonGas::cp(scalar p, scalar T) const +{ + return 0; +} + + template inline Foam::scalar Foam::PengRobinsonGas::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H index 3b391410ce..b270ccab4b 100644 --- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H +++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H @@ -167,6 +167,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H index a2f02cdd95..87adcdad2b 100644 --- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H +++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluidI.H @@ -111,6 +111,28 @@ inline Foam::scalar Foam::adiabaticPerfectFluid::rho } +template +inline Foam::scalar Foam::adiabaticPerfectFluid::h +( + scalar p, + scalar T +) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::adiabaticPerfectFluid::cp +( + scalar p, + scalar T +) const +{ + return 0; +} + + template inline Foam::scalar Foam::adiabaticPerfectFluid::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H index 44eb86ffbd..e4345e2f4e 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H @@ -155,6 +155,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H index c5302e1828..03d087c74f 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H @@ -110,6 +110,28 @@ inline Foam::scalar Foam::icoPolynomial::rho } +template +inline Foam::scalar Foam::icoPolynomial::h +( + scalar p, + scalar T +) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::icoPolynomial::cp +( + scalar p, + scalar T +) const +{ + return 0; +} + + template inline Foam::scalar Foam::icoPolynomial::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H index 922466d740..30c6ea1b4d 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H @@ -158,6 +158,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H index 3281e2e613..8816c9f317 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGasI.H @@ -114,6 +114,28 @@ inline Foam::scalar Foam::incompressiblePerfectGas::rho } +template +inline Foam::scalar Foam::incompressiblePerfectGas::h +( + scalar p, + scalar T +) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::incompressiblePerfectGas::cp +( + scalar p, + scalar T +) const +{ + return 0; +} + + template inline Foam::scalar Foam::incompressiblePerfectGas::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H index acdbda0134..1236cac125 100644 --- a/src/thermophysicalModels/specie/equationOfState/linear/linear.H +++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.H @@ -156,6 +156,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H index 225957173e..701ccc3c7c 100644 --- a/src/thermophysicalModels/specie/equationOfState/linear/linearI.H +++ b/src/thermophysicalModels/specie/equationOfState/linear/linearI.H @@ -92,6 +92,20 @@ inline Foam::scalar Foam::linear::rho(scalar p, scalar T) const } +template +inline Foam::scalar Foam::linear::h(scalar p, scalar T) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::linear::cp(scalar p, scalar T) const +{ + return 0; +} + + template inline Foam::scalar Foam::linear::s(scalar p, scalar T) const { diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H index fcd1b373f3..16d346f1c1 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.H @@ -155,6 +155,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H index 8d988eb7a6..f58bcaaed6 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluidI.H @@ -100,6 +100,20 @@ inline Foam::scalar Foam::perfectFluid::rho(scalar p, scalar T) const } +template +inline Foam::scalar Foam::perfectFluid::h(scalar p, scalar T) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::perfectFluid::cp(scalar p, scalar T) const +{ + return 0; +} + + template inline Foam::scalar Foam::perfectFluid::s(scalar p, scalar T) const { diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H index 986eecce70..4b5611bee3 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.H @@ -139,6 +139,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H index bfe0301ce7..94e0c500ff 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H @@ -82,6 +82,20 @@ inline Foam::scalar Foam::perfectGas::rho(scalar p, scalar T) const } +template +inline Foam::scalar Foam::perfectGas::h(scalar p, scalar T) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::perfectGas::cp(scalar p, scalar T) const +{ + return 0; +} + + template inline Foam::scalar Foam::perfectGas::s(scalar p, scalar T) const { diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H index 98f2547123..5c654d000d 100644 --- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H +++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.H @@ -141,6 +141,12 @@ public: //- Return density [kg/m^3] inline scalar rho(scalar p, scalar T) const; + //- Return enthalpy departure [J/kmol] + inline scalar h(const scalar p, const scalar T) const; + + //- Return cp departure [J/(kmol K] + inline scalar cp(scalar p, scalar T) const; + //- Return entropy [J/(kmol K)] inline scalar s(const scalar p, const scalar T) const; diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H index 600b668794..09f884b8b7 100644 --- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H +++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConstI.H @@ -78,6 +78,20 @@ inline Foam::scalar Foam::rhoConst::rho(scalar p, scalar T) const } +template +inline Foam::scalar Foam::rhoConst::h(scalar p, scalar T) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::rhoConst::cp(scalar p, scalar T) const +{ + return 0; +} + + template inline Foam::scalar Foam::rhoConst::s(scalar p, scalar T) const { diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H index f16ca49759..2c6bda1a69 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H @@ -106,7 +106,7 @@ inline Foam::scalar Foam::eConstThermo::cp const scalar T ) const { - return Cv_ + this->cpMcv(p, T); + return Cv_ + this->cpMcv(p, T) + EquationOfState::cp(p, T); } @@ -117,7 +117,7 @@ inline Foam::scalar Foam::eConstThermo::ha const scalar T ) const { - return cp(p, T)*T + Hf_; + return cp(p, T)*T + Hf_ + EquationOfState::h(p, T); } @@ -128,7 +128,7 @@ inline Foam::scalar Foam::eConstThermo::hs const scalar T ) const { - return cp(p, T)*T; + return cp(p, T)*T + EquationOfState::h(p, T); } diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H index 7ca5b48044..1367c7c426 100644 --- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermoI.H @@ -106,7 +106,7 @@ inline Foam::scalar Foam::hConstThermo::cp const scalar T ) const { - return Cp_; + return Cp_ + EquationOfState::cp(p, T); } @@ -116,7 +116,7 @@ inline Foam::scalar Foam::hConstThermo::ha const scalar p, const scalar T ) const { - return Cp_*T + Hf_; + return Cp_*T + Hf_ + EquationOfState::h(p, T); } @@ -126,7 +126,7 @@ inline Foam::scalar Foam::hConstThermo::hs const scalar p, const scalar T ) const { - return Cp_*T; + return Cp_*T + EquationOfState::h(p, T); } diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H index 4e8c91f688..7cef8ce2b5 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H @@ -98,7 +98,7 @@ inline Foam::scalar Foam::hPolynomialThermo::cp const scalar p, const scalar T ) const { - return CpCoeffs_.value(T); + return CpCoeffs_.value(T) + EquationOfState::cp(p, T); } @@ -108,7 +108,7 @@ inline Foam::scalar Foam::hPolynomialThermo::ha const scalar p, const scalar T ) const { - return hCoeffs_.value(T); + return hCoeffs_.value(T) + EquationOfState::h(p, T); } diff --git a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H index 8f4094d975..c9114a1dd8 100644 --- a/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hPower/hPowerThermoI.H @@ -130,7 +130,7 @@ inline Foam::scalar Foam::hPowerThermo::cp const scalar p, const scalar T ) const { - return c0_*pow(T/Tref_, n0_); + return c0_*pow(T/Tref_, n0_) + EquationOfState::cp(p, T); } @@ -151,7 +151,8 @@ inline Foam::scalar Foam::hPowerThermo::hs ) const { return - c0_*(pow(T, n0_ + 1) - pow(Tstd, n0_ + 1))/(pow(Tref_, n0_)*(n0_ + 1)); + c0_*(pow(T, n0_ + 1) - pow(Tstd, n0_ + 1))/(pow(Tref_, n0_)*(n0_ + 1)) + + EquationOfState::h(p, T); } diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H index b25d5f0f73..29bd2c9753 100644 --- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H @@ -112,7 +112,7 @@ inline Foam::scalar Foam::hRefConstThermo::cp const scalar T ) const { - return Cp_; + return Cp_ + EquationOfState::cp(p, T); } @@ -122,7 +122,7 @@ inline Foam::scalar Foam::hRefConstThermo::ha const scalar p, const scalar T ) const { - return Cp_*(T-Tref_) + Href_ + Hf_; + return Cp_*(T-Tref_) + Href_ + Hf_ + EquationOfState::h(p, T); } @@ -132,7 +132,7 @@ inline Foam::scalar Foam::hRefConstThermo::hs const scalar p, const scalar T ) const { - return Cp_*(T-Tref_) + Href_ ; + return Cp_*(T-Tref_) + Href_ + EquationOfState::h(p, T); } diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H index 18f9d7cc73..256859ef9c 100644 --- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H +++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H @@ -162,7 +162,9 @@ inline Foam::scalar Foam::janafThermo::cp ) const { const coeffArray& a = coeffs(T); - return RR*((((a[4]*T + a[3])*T + a[2])*T + a[1])*T + a[0]); + return + RR*((((a[4]*T + a[3])*T + a[2])*T + a[1])*T + a[0]) + + EquationOfState::cp(p, T); } @@ -178,7 +180,8 @@ inline Foam::scalar Foam::janafThermo::ha ( ((((a[4]/5.0*T + a[3]/4.0)*T + a[2]/3.0)*T + a[1]/2.0)*T + a[0])*T + a[5] - ); + ) + + EquationOfState::h(p, T); }