diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C index 34070501da..a8b5d68230 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/reactionThermo/hRefConstThermos.C @@ -37,6 +37,7 @@ License #include "sensibleEnthalpy.H" #include "hRefConstThermo.H" +#include "eRefConstThermo.H" #include "constTransport.H" @@ -86,7 +87,7 @@ constTransport < species::thermo < - hRefConstThermo + eRefConstThermo < perfectGas >, @@ -99,7 +100,7 @@ constTransport < species::thermo < - hRefConstThermo + eRefConstThermo < perfectFluid >, @@ -112,7 +113,7 @@ constTransport < species::thermo < - hRefConstThermo + eRefConstThermo < rhoConst >, @@ -182,7 +183,7 @@ makeThermos pureMixture, constTransport, sensibleInternalEnergy, - hRefConstThermo, + eRefConstThermo, perfectGas, specie ); @@ -194,7 +195,7 @@ makeThermos pureMixture, constTransport, sensibleInternalEnergy, - hRefConstThermo, + eRefConstThermo, perfectFluid, specie ); @@ -206,7 +207,7 @@ makeThermos pureMixture, constTransport, sensibleInternalEnergy, - hRefConstThermo, + eRefConstThermo, rhoConst, specie ); diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H index 68c09de673..6d14078d5d 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H @@ -166,7 +166,6 @@ public: inline scalar dCpdT(const scalar p, const scalar T) const; - // I-O //- Write to Ostream diff --git a/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermo.C b/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermo.C new file mode 100644 index 0000000000..f433a407d4 --- /dev/null +++ b/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermo.C @@ -0,0 +1,72 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "eRefConstThermo.H" +#include "IOstreams.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::eRefConstThermo::eRefConstThermo(const dictionary& dict) +: + EquationOfState(dict), + Cv_(readScalar(dict.subDict("thermodynamics").lookup("Cv"))), + Hf_(readScalar(dict.subDict("thermodynamics").lookup("Hf"))), + Tref_(readScalar(dict.subDict("thermodynamics").lookup("Tref"))), + Eref_(readScalar(dict.subDict("thermodynamics").lookup("Eref"))) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +void Foam::eRefConstThermo::write(Ostream& os) const +{ + EquationOfState::write(os); + + dictionary dict("thermodynamics"); + dict.add("Cv", Cv_); + dict.add("Hf", Hf_); + dict.add("Tref", Tref_); + dict.add("Eref", Eref_); + os << indent << dict.dictName() << dict; +} + + +// * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // + +template +Foam::Ostream& Foam::operator<< +( + Ostream& os, + const eRefConstThermo& ct +) +{ + ct.write(os); + return os; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermo.H b/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermo.H new file mode 100644 index 0000000000..938d56cb9a --- /dev/null +++ b/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermo.H @@ -0,0 +1,224 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::eRefConstThermo + +Description + Constant properties thermodynamics package + templated into the EquationOfState. + +SourceFiles + eRefConstThermoI.H + eRefConstThermo.C + +\*---------------------------------------------------------------------------*/ + +#ifndef eRefConstThermo_H +#define eRefConstThermo_H + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of friend functions and operators + +template class eRefConstThermo; + +template +inline eRefConstThermo operator+ +( + const eRefConstThermo&, + const eRefConstThermo& +); + +template +inline eRefConstThermo operator* +( + const scalar, + const eRefConstThermo& +); + +template +inline eRefConstThermo operator== +( + const eRefConstThermo&, + const eRefConstThermo& +); + +template +Ostream& operator<< +( + Ostream&, + const eRefConstThermo& +); + + +/*---------------------------------------------------------------------------*\ + Class eRefConstThermo Declaration +\*---------------------------------------------------------------------------*/ + +template +class eRefConstThermo +: + public EquationOfState +{ + // Private data + + scalar Cv_; + scalar Hf_; + scalar Tref_; + scalar Eref_; + + + // Private Member Functions + + //- Construct from components + inline eRefConstThermo + ( + const EquationOfState& st, + const scalar cv, + const scalar hf, + const scalar tref, + const scalar eref + ); + + +public: + + // Constructors + + //- Construct from dictionary + eRefConstThermo(const dictionary& dict); + + //- Construct as named copy + inline eRefConstThermo(const word&, const eRefConstThermo&); + + //- Construct and return a clone + inline autoPtr clone() const; + + //- Selector from dictionary + inline static autoPtr New(const dictionary& dict); + + + // Member Functions + + //- Return the instantiated type name + static word typeName() + { + return "eRefConst<" + EquationOfState::typeName() + '>'; + } + + //- Limit the temperature to be in the range Tlow_ to Thigh_ + inline scalar limit(const scalar T) const; + + + // Fundamental properties + + //- Heat capacity at constant volume [J/(kg K)] + inline scalar Cv(const scalar p, const scalar T) const; + + //- Sensible internal energy [J/kg] + inline scalar Es(const scalar p, const scalar T) const; + + //- Absolute internal energy [J/kg] + inline scalar Ea(const scalar p, const scalar T) const; + + //- Chemical enthalpy [J/kg] + inline scalar Hc() const; + + //- Entropy [J/(kg K)] + inline scalar S(const scalar p, const scalar T) const; + + #include "EtoHthermo.H" + + + // Derivative term used for Jacobian + + //- Derivative of Gibbs free energy w.r.t. temperature + inline scalar dGdT(const scalar p, const scalar T) const; + + //- Temperature derivative of heat capacity at constant pressure + inline scalar dCpdT(const scalar p, const scalar T) const; + + + // I-O + + //- Write to Ostream + void write(Ostream& os) const; + + + // Member operators + + inline void operator+=(const eRefConstThermo&); + + + // Friend operators + + friend eRefConstThermo operator+ + ( + const eRefConstThermo&, + const eRefConstThermo& + ); + + friend eRefConstThermo operator* + ( + const scalar, + const eRefConstThermo& + ); + + friend eRefConstThermo operator== + ( + const eRefConstThermo&, + const eRefConstThermo& + ); + + + // IOstream Operators + + friend Ostream& operator<< + ( + Ostream&, + const eRefConstThermo& + ); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "eRefConstThermoI.H" + +#ifdef NoRepository + #include "eRefConstThermo.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermoI.H new file mode 100644 index 0000000000..661244c9cf --- /dev/null +++ b/src/thermophysicalModels/specie/thermo/eRefConst/eRefConstThermoI.H @@ -0,0 +1,274 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | Website: https://openfoam.org + \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +template +inline Foam::eRefConstThermo::eRefConstThermo +( + const EquationOfState& st, + const scalar cv, + const scalar hf, + const scalar tref, + const scalar eref +) +: + EquationOfState(st), + Cv_(cv), + Hf_(hf), + Tref_(tref), + Eref_(eref) +{} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +inline Foam::eRefConstThermo::eRefConstThermo +( + const word& name, + const eRefConstThermo& ct +) +: + EquationOfState(name, ct), + Cv_(ct.Cv_), + Hf_(ct.Hf_), + Tref_(ct.Tref_), + Eref_(ct.Eref_) +{} + + +template +inline Foam::autoPtr> +Foam::eRefConstThermo::clone() const +{ + return autoPtr> + ( + new eRefConstThermo(*this) + ); +} + + +template +inline Foam::autoPtr> +Foam::eRefConstThermo::New(const dictionary& dict) +{ + return autoPtr> + ( + new eRefConstThermo(dict) + ); +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +inline Foam::scalar Foam::eRefConstThermo::limit +( + const scalar T +) const +{ + return T; +} + + +template +inline Foam::scalar Foam::eRefConstThermo::Cv +( + const scalar p, + const scalar T +) const +{ + return Cv_ + EquationOfState::Cv(p, T); +} + + +template +inline Foam::scalar Foam::eRefConstThermo::Es +( + const scalar p, const scalar T +) const +{ + return Cv_*(T - Tref_) + Eref_ + EquationOfState::E(p, T); +} + + +template +inline Foam::scalar Foam::eRefConstThermo::Hc() const +{ + return Hf_; +} + + +template +inline Foam::scalar Foam::eRefConstThermo::Ea +( + const scalar p, const scalar T +) const +{ + return Es(p, T) + Hc(); +} + + +template +inline Foam::scalar Foam::eRefConstThermo::S +( + const scalar p, const scalar T +) const +{ + return Cp(p, T)*log(T/Tstd) + EquationOfState::S(p, T); +} + + +template +inline Foam::scalar Foam::eRefConstThermo::dGdT +( + const scalar p, const scalar T +) const +{ + return 0; +} + + +template +inline Foam::scalar Foam::eRefConstThermo::dCpdT +( + const scalar p, const scalar T +) const +{ + return 0; +} + + +// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // + +template +inline void Foam::eRefConstThermo::operator+= +( + const eRefConstThermo& ct +) +{ + scalar Y1 = this->Y(); + + EquationOfState::operator+=(ct); + + if (mag(this->Y()) > small) + { + Y1 /= this->Y(); + const scalar Y2 = ct.Y()/this->Y(); + + Cv_ = Y1*Cv_ + Y2*ct.Cv_; + Hf_ = Y1*Hf_ + Y2*ct.Hf_; + } +} + + +// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // + +template +inline Foam::eRefConstThermo Foam::operator+ +( + const eRefConstThermo& ct1, + const eRefConstThermo& ct2 +) +{ + EquationOfState eofs + ( + static_cast(ct1) + + static_cast(ct2) + ); + + if (mag(eofs.Y()) < small) + { + return eRefConstThermo + ( + eofs, + ct1.Cv_, + ct1.Hf_, + ct1.Tref_, + ct1.Eref_ + ); + } + else + { + return eRefConstThermo + ( + eofs, + ct1.Y()/eofs.Y()*ct1.Cv_ + + ct2.Y()/eofs.Y()*ct2.Cv_, + ct1.Y()/eofs.Y()*ct1.Hf_ + + ct2.Y()/eofs.Y()*ct2.Hf_, + ct1.Y()/eofs.Y()*ct1.Tref_ + + ct2.Y()/eofs.Y()*ct2.Tref_, + ct1.Y()/eofs.Y()*ct1.Eref_ + + ct2.Y()/eofs.Y()*ct2.Eref_ + ); + } +} + + +template +inline Foam::eRefConstThermo Foam::operator* +( + const scalar s, + const eRefConstThermo& ct +) +{ + return eRefConstThermo + ( + s*static_cast(ct), + ct.Cv_, + ct.Hf_, + ct.Tref_, + ct.Eref_ + ); +} + + +template +inline Foam::eRefConstThermo Foam::operator== +( + const eRefConstThermo& ct1, + const eRefConstThermo& ct2 +) +{ + EquationOfState eofs + ( + static_cast(ct1) + == static_cast(ct2) + ); + + return eRefConstThermo + ( + eofs, + ct2.Y()/eofs.Y()*ct2.Cv_ + - ct1.Y()/eofs.Y()*ct1.Cv_, + ct2.Y()/eofs.Y()*ct2.Hf_ + - ct1.Y()/eofs.Y()*ct1.Hf_ + ); +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H index a6ec04ccd3..b5c23c1cdd 100644 --- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermoI.H @@ -105,23 +105,13 @@ inline Foam::scalar Foam::hRefConstThermo::Cp } -template -inline Foam::scalar Foam::hRefConstThermo::Ha -( - const scalar p, const scalar T -) const -{ - return Cp_*(T-Tref_) + Href_ + Hf_ + EquationOfState::H(p, T); -} - - template inline Foam::scalar Foam::hRefConstThermo::Hs ( const scalar p, const scalar T ) const { - return Cp_*(T-Tref_) + Href_ + EquationOfState::H(p, T); + return Cp_*(T - Tref_) + Href_ + EquationOfState::H(p, T); } @@ -132,6 +122,16 @@ inline Foam::scalar Foam::hRefConstThermo::Hc() const } +template +inline Foam::scalar Foam::hRefConstThermo::Ha +( + const scalar p, const scalar T +) const +{ + return Hs(p, T) + Hc(); +} + + template inline Foam::scalar Foam::hRefConstThermo::S ( diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas index 703c2c2aea..908b7bec18 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.gas @@ -20,8 +20,8 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; - equationOfState rhoConst;//perfectGas; + thermo eRefConst; + equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; } @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 12078.4; + Cv 12078.4; Tref 373.55; - Href 2675500; + Eref 2675500; } transport { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid index dea0bdb56a..7768d06337 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_2phase/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 4195; + Cv 4195; Tref 373.55; - Href 417500; + Eref 417500; } transport { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas index 703c2c2aea..908b7bec18 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas @@ -20,8 +20,8 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; - equationOfState rhoConst;//perfectGas; + thermo eRefConst; + equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; } @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 12078.4; + Cv 12078.4; Tref 373.55; - Href 2675500; + Eref 2675500; } transport { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 index 703c2c2aea..908b7bec18 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.gas2 @@ -20,8 +20,8 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; - equationOfState rhoConst;//perfectGas; + thermo eRefConst; + equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; } @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 12078.4; + Cv 12078.4; Tref 373.55; - Href 2675500; + Eref 2675500; } transport { diff --git a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid index dea0bdb56a..7768d06337 100644 --- a/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingMultiphaseEulerFoam/RAS/wallBoiling1D_3phase/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 4195; + Cv 4195; Tref 373.55; - Href 417500; + Eref 417500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas index 44cad5ac09..d1e56986b4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.gas @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState perfectGas; specie specie; energy sensibleInternalEnergy; @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 12078.4; + Cv 12078.4; Tref 373.55; - Href 2675500; + Eref 2675500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid index 043c6f34c4..31f87d50a4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -41,9 +41,9 @@ mixture thermodynamics { Hf 0; - Cp 4195; + Cv 4195; Tref 373.55; - Href 417500; + Eref 417500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas index 703c2c2aea..908b7bec18 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.gas @@ -20,8 +20,8 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; - equationOfState rhoConst;//perfectGas; + thermo eRefConst; + equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; } @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 12078.4; + Cv 12078.4; Tref 373.55; - Href 2675500; + Eref 2675500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid index dea0bdb56a..7768d06337 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoiling1D/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 4195; + Cv 4195; Tref 373.55; - Href 417500; + Eref 417500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas index 23d06e90b3..73dc2f7d56 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.gas @@ -23,9 +23,11 @@ thermoType thermo hRefConst; equationOfState perfectGas; specie specie; - energy sensibleInternalEnergy; + energy sensibleEnthalpy; } +dpdt no; + mixture { specie @@ -36,7 +38,6 @@ mixture { rho 1; } - thermodynamics { Hf 0; diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid index 043c6f34c4..e4beb4b1aa 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingIATE/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -36,14 +36,14 @@ mixture { R 3000; rho0 959; - rho 959; + rho 959; } thermodynamics { Hf 0; - Cp 4195; + Cv 4195; Tref 373.55; - Href 417500; + Eref 417500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.gas b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.gas index 44cad5ac09..d1e56986b4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.gas +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.gas @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState perfectGas; specie specie; energy sensibleInternalEnergy; @@ -39,9 +39,9 @@ mixture thermodynamics { Hf 0; - Cp 12078.4; + Cv 12078.4; Tref 373.55; - Href 2675500; + Eref 2675500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.liquid b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.liquid index 043c6f34c4..31f87d50a4 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.liquid +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/RAS/wallBoilingPolyDisperse/constant/thermophysicalProperties.liquid @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState rhoConst; specie specie; energy sensibleInternalEnergy; @@ -41,9 +41,9 @@ mixture thermodynamics { Hf 0; - Cp 4195; + Cv 4195; Tref 373.55; - Href 417500; + Eref 417500; } transport { diff --git a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water index b9341f6376..f78f74e6fd 100644 --- a/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water +++ b/tutorials/multiphase/reactingTwoPhaseEulerFoam/laminar/steamInjection/constant/thermophysicalProperties.water @@ -20,7 +20,7 @@ thermoType type heRhoThermo; mixture pureMixture; transport const; - thermo hRefConst; + thermo eRefConst; equationOfState perfectFluid; specie specie; energy sensibleInternalEnergy; @@ -44,9 +44,9 @@ mixture thermodynamics { Hf 0; - Cp 4195; + Cv 4195; Tref 372.76; - Href 417500; + Eref 417500; } transport