From 228cbc5080b1759bfa1cdc50467c206fbd0f7150 Mon Sep 17 00:00:00 2001 From: Henry Date: Tue, 22 Nov 2011 17:55:01 +0000 Subject: [PATCH] janafThermo: Reverted FatalError concerning mismatching Tcommon to be on a debug switch --- src/thermophysicalModels/specie/specie/specie.C | 2 ++ src/thermophysicalModels/specie/specie/specie.H | 4 ++++ .../specie/thermo/janaf/janafThermoI.H | 16 ++++++++++++---- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C index 621cd043ab..fa4bea7ca9 100644 --- a/src/thermophysicalModels/specie/specie/specie.C +++ b/src/thermophysicalModels/specie/specie/specie.C @@ -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 * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/specie/specie.H b/src/thermophysicalModels/specie/specie/specie.H index 6a64f02198..fd7c69c128 100644 --- a/src/thermophysicalModels/specie/specie/specie.H +++ b/src/thermophysicalModels/specie/specie/specie.H @@ -74,6 +74,10 @@ class specie public: + //- Runtime type information + ClassName("specie"); + + // Public constants // Thermodynamic constants diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H index eac1663e11..4e0a5b4ff2 100644 --- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H +++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H @@ -241,7 +241,7 @@ inline void Foam::janafThermo::operator+= Tlow_ = max(Tlow_, jt.Tlow_); Thigh_ = min(Thigh_, jt.Thigh_); - if (notEqual(Tcommon_, jt.Tcommon_)) + if (janafThermo::debug && notEqual(Tcommon_, jt.Tcommon_)) { FatalErrorIn ( @@ -288,7 +288,7 @@ inline void Foam::janafThermo::operator-= Tlow_ = max(Tlow_, jt.Tlow_); Thigh_ = min(Thigh_, jt.Thigh_); - if (notEqual(Tcommon_, jt.Tcommon_)) + if (janafThermo::debug && notEqual(Tcommon_, jt.Tcommon_)) { FatalErrorIn ( @@ -353,7 +353,11 @@ inline Foam::janafThermo Foam::operator+ + molr2*jt2.lowCpCoeffs_[coefLabel]; } - if (notEqual(jt1.Tcommon_, jt2.Tcommon_)) + if + ( + janafThermo::debug + && notEqual(jt1.Tcommon_, jt2.Tcommon_) + ) { FatalErrorIn ( @@ -411,7 +415,11 @@ inline Foam::janafThermo Foam::operator- - molr2*jt2.lowCpCoeffs_[coefLabel]; } - if (notEqual(jt1.Tcommon_, jt2.Tcommon_)) + if + ( + janafThermo::debug + && notEqual(jt1.Tcommon_, jt2.Tcommon_) + ) { FatalErrorIn (