diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.H index 464f829239a04e67c09a91ccb938219f48316579..7cd491fde79cb1cd5aaef415584e8d924cb3985e 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 27a729211c09498d7d8dc24bb890bb4f544f41f7..2d689847382d3b82163bffc6c863bd19b6c36d96 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<Specie>::rho } +template<class Specie> +inline Foam::scalar Foam::Boussinesq<Specie>::h(scalar p, scalar T) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::Boussinesq<Specie>::cp(scalar p, scalar T) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::Boussinesq<Specie>::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H b/src/thermophysicalModels/specie/equationOfState/PengRobinsonGas/PengRobinsonGas.H index 8a24f6e104fa3cdc276d3a1e86119b014d984baf..cb55086c48a78b8170b7b19c6eb4ccf6a413b4a3 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 c69829d9a68da23885dfbb7a3abadf9d48407e5f..45ccf67cd9424e49c5e083a66ad8f8203ab4643e 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<Specie>::rho } +template<class Specie> +inline Foam::scalar Foam::PengRobinsonGas<Specie>::h(scalar p, scalar T) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::PengRobinsonGas<Specie>::cp(scalar p, scalar T) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::PengRobinsonGas<Specie>::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.H index 3b391410ce57731c22604d3aee4379bd83f1bd61..b270ccab4b92127246f98c730ed26ee4dd39a5db 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 a2f02cdd95ddafbb8912adf33cfbb4478e4df0a5..87adcdad2bb55ebd5f969c118c59d512b296cafc 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<Specie>::rho } +template<class Specie> +inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::h +( + scalar p, + scalar T +) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::cp +( + scalar p, + scalar T +) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::adiabaticPerfectFluid<Specie>::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H index 44eb86ffbde6a9813ee2432480ee0d042ffda2a7..e4345e2f4ed5243608c27db4d2dcb6663efa878d 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 c5302e182855285eaef374a216d4a15491f450cb..03d087c74f78b64de0471cead37394cad62d8d27 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<Specie, PolySize>::rho } +template<class Specie, int PolySize> +inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::h +( + scalar p, + scalar T +) const +{ + return 0; +} + + +template<class Specie, int PolySize> +inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::cp +( + scalar p, + scalar T +) const +{ + return 0; +} + + template<class Specie, int PolySize> inline Foam::scalar Foam::icoPolynomial<Specie, PolySize>::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.H index 922466d7406e43292581725d77abb2c6846217cb..30c6ea1b4d46ca4ed4be1841462c0b07e33051cb 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 3281e2e613773831a7ac752be1f03a9ffade2f04..8816c9f317c21ae7836c482097019ecceb30eacc 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<Specie>::rho } +template<class Specie> +inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::h +( + scalar p, + scalar T +) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::cp +( + scalar p, + scalar T +) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::incompressiblePerfectGas<Specie>::s ( diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.H b/src/thermophysicalModels/specie/equationOfState/linear/linear.H index acdbda013411d287c5d753b5c3113d00dc71a5f1..1236cac125a7e7665708631bcc4752d5dde28d03 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 225957173e768d1154a6d00e0ae286aef39cdfb5..701ccc3c7ce360414c84d73feaba9f9941910c3e 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<Specie>::rho(scalar p, scalar T) const } +template<class Specie> +inline Foam::scalar Foam::linear<Specie>::h(scalar p, scalar T) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::linear<Specie>::cp(scalar p, scalar T) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::linear<Specie>::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 fcd1b373f3b7e482fd78549e4be0e52f569aa92f..16d346f1c1ec9c50bdd22b740267364da14000a7 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 8d988eb7a6e3c9a352fa4d8c265e57c06f6e6daa..f58bcaaed6a73fc43462bc7c1271154f80c7ae82 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<Specie>::rho(scalar p, scalar T) const } +template<class Specie> +inline Foam::scalar Foam::perfectFluid<Specie>::h(scalar p, scalar T) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::perfectFluid<Specie>::cp(scalar p, scalar T) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::perfectFluid<Specie>::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 986eecce702042474f2a4c0df4e2b69b2445e9fa..4b5611bee37165a6cff4cca1443f3c01deef2b7d 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 bfe0301ce741c66adda7590abb309559902b0c4a..94e0c500ffcdfe4ee47d8c9b02a1ba05a06f9e69 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<Specie>::rho(scalar p, scalar T) const } +template<class Specie> +inline Foam::scalar Foam::perfectGas<Specie>::h(scalar p, scalar T) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::perfectGas<Specie>::cp(scalar p, scalar T) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::perfectGas<Specie>::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 98f25471239bbc86ef565c9ecb8d197064e88b42..5c654d000d456552f1b9fe6f0e76cd39bf0bf3fb 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 600b66879445bfbee7560b856fe44d2b79566542..09f884b8b7bc43bd6eee5f594935ca6183ae414a 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<Specie>::rho(scalar p, scalar T) const } +template<class Specie> +inline Foam::scalar Foam::rhoConst<Specie>::h(scalar p, scalar T) const +{ + return 0; +} + + +template<class Specie> +inline Foam::scalar Foam::rhoConst<Specie>::cp(scalar p, scalar T) const +{ + return 0; +} + + template<class Specie> inline Foam::scalar Foam::rhoConst<Specie>::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 f16ca49759fc8289c3e6ba6a361c455fb23b0e52..2c6bda1a697d579661637d42d3464d7a6470d9e4 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<EquationOfState>::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<EquationOfState>::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<EquationOfState>::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 7ca5b480444e0e761f56d8bb2ec5904c7c5daf64..1367c7c426c82a900b1a0015925d01a2d7fb22c5 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<EquationOfState>::cp const scalar T ) const { - return Cp_; + return Cp_ + EquationOfState::cp(p, T); } @@ -116,7 +116,7 @@ inline Foam::scalar Foam::hConstThermo<EquationOfState>::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<EquationOfState>::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 4e8c91f68873263121d2268f00f3e1b1ab8cb5e5..7cef8ce2b53433c6aaad6962575af645212fcba5 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<EquationOfState, PolySize>::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<EquationOfState, PolySize>::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 8f4094d975c1b9ab8cf8659ad6f9beb091144b21..c9114a1dd81c261b5bc936a504a7d6d0fb0f6a28 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<EquationOfState>::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<EquationOfState>::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 b25d5f0f73732948ffca325b6370617ad0157cde..29bd2c97530a672a8ced3c1a573500278bdd328a 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<EquationOfState>::cp const scalar T ) const { - return Cp_; + return Cp_ + EquationOfState::cp(p, T); } @@ -122,7 +122,7 @@ inline Foam::scalar Foam::hRefConstThermo<EquationOfState>::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<EquationOfState>::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 18f9d7cc735101822262f5b8113f369a1c403f72..256859ef9c7da2c652631de701352c7d5b55c450 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<EquationOfState>::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<EquationOfState>::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); }