zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

janafThermo: Reverted FatalError concerning mismatching Tcommon to be on a debug switch

Browse Source
This commit is contained in:
Henry
2011-11-22 17:55:01 +00:00
parent 96068a670d
commit 228cbc5080
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/thermophysicalModels/specie/specie/specie.C
View File

@ -38,6 +38,8 @@ const Foam::scalar Foam::specie::Pstd = constant::standard::Pstd.value();
//- Standard temperature (default in [K])
const Foam::scalar Foam::specie::Tstd = constant::standard::Tstd.value();
defineTypeNameAndDebug(Foam::specie, 0);
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

4
src/thermophysicalModels/specie/specie/specie.H
View File

@ -74,6 +74,10 @@ class specie
public:
//- Runtime type information
ClassName("specie");
// Public constants
// Thermodynamic constants

16
src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
View File

@ -241,7 +241,7 @@ inline void Foam::janafThermo<EquationOfState>::operator+=
Tlow_ = max(Tlow_, jt.Tlow_);
Thigh_ = min(Thigh_, jt.Thigh_);
if (notEqual(Tcommon_, jt.Tcommon_))
if (janafThermo<EquationOfState>::debug && notEqual(Tcommon_, jt.Tcommon_))
{
FatalErrorIn
(
@ -288,7 +288,7 @@ inline void Foam::janafThermo<EquationOfState>::operator-=
Tlow_ = max(Tlow_, jt.Tlow_);
Thigh_ = min(Thigh_, jt.Thigh_);
if (notEqual(Tcommon_, jt.Tcommon_))
if (janafThermo<EquationOfState>::debug && notEqual(Tcommon_, jt.Tcommon_))
{
FatalErrorIn
(
@ -353,7 +353,11 @@ inline Foam::janafThermo<EquationOfState> Foam::operator+
+ molr2*jt2.lowCpCoeffs_[coefLabel];
}
if (notEqual(jt1.Tcommon_, jt2.Tcommon_))
if
(
janafThermo<EquationOfState>::debug
&& notEqual(jt1.Tcommon_, jt2.Tcommon_)
)
{
FatalErrorIn
(
@ -411,7 +415,11 @@ inline Foam::janafThermo<EquationOfState> Foam::operator-
- molr2*jt2.lowCpCoeffs_[coefLabel];
}
if (notEqual(jt1.Tcommon_, jt2.Tcommon_))
if
(
janafThermo<EquationOfState>::debug
&& notEqual(jt1.Tcommon_, jt2.Tcommon_)
)
{
FatalErrorIn
(