janafThermo: Warnings concerning differing Tcommon are now FatalErrors

OpenFOAM · Oct 29, 2011 · 329e824 · 329e824
1 parent 3354f73
commit 329e824
Showing 1 changed file with 26 additions and 28 deletions.
diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H
@@ -206,15 +206,15 @@ inline void Foam::janafThermo<EquationOfState>::operator+=
 
     if (notEqual(Tcommon_, jt.Tcommon_))
     {
-        WarningIn
+        FatalErrorIn
         (
             "janafThermo<EquationOfState>::operator+="
             "(const janafThermo<EquationOfState>& jt) const"
-        )   << "Tcommon " << Tcommon_ << " != " << jt.Tcommon_
-            << ", an average value will be used for the result"
-            << endl;
-
-        Tcommon_ = molr1*Tcommon_ + molr2*jt.Tcommon_;
+        )   << "Tcommon " << Tcommon_ << " for "
+            << (this->name().size() ? this->name() : "others")
+            << " != " << jt.Tcommon_ << " for "
+            << (jt.name().size() ? jt.name() : "others")
+            << exit(FatalError);
     }
 
     for
@@ -253,15 +253,15 @@ inline void Foam::janafThermo<EquationOfState>::operator-=
 
     if (notEqual(Tcommon_, jt.Tcommon_))
     {
-        WarningIn
+        FatalErrorIn
         (
             "janafThermo<EquationOfState>::operator-="
             "(const janafThermo<EquationOfState>& jt) const"
-        )   << "Tcommon " << Tcommon_ << " != " << jt.Tcommon_
-            << ", an average value will be used for the result"
-            << endl;
-
-        Tcommon_ = (molr1*Tcommon_ + molr2*jt.Tcommon_)/(molr1 + molr2);
+        )   << "Tcommon " << Tcommon_ << " for "
+            << (this->name().size() ? this->name() : "others")
+            << " != " << jt.Tcommon_ << " for "
+            << (jt.name().size() ? jt.name() : "others")
+            << exit(FatalError);
     }
 
     for
@@ -316,27 +316,26 @@ inline Foam::janafThermo<EquationOfState> Foam::operator+
           + molr2*jt2.lowCpCoeffs_[coefLabel];
     }
 
-    scalar Tcommon = jt1.Tcommon_;
     if (notEqual(jt1.Tcommon_, jt2.Tcommon_))
     {
-        WarningIn
+        FatalErrorIn
         (
             "operator+"
             "(const janafThermo<EquationOfState>& jt1,"
             " const janafThermo<EquationOfState>& jt2)"
-        )   << "Tcommon " << jt1.Tcommon_ << " != " << jt2.Tcommon_
-            << ", an average value will be used for the result"
-            << endl;
-
-        Tcommon = molr1*jt1.Tcommon_ + molr2*jt2.Tcommon_;
+        )   << "Tcommon " << jt1.Tcommon_ << " for "
+            << (jt1.name().size() ? jt1.name() : "others")
+            << " != " << jt2.Tcommon_ << " for "
+            << (jt2.name().size() ? jt2.name() : "others")
+            << exit(FatalError);
     }
 
     return janafThermo<EquationOfState>
     (
         eofs,
         max(jt1.Tlow_, jt2.Tlow_),
         min(jt1.Thigh_, jt2.Thigh_),
-        Tcommon,
+        jt1.Tcommon_,
         highCpCoeffs,
         lowCpCoeffs
     );
@@ -375,27 +374,26 @@ inline Foam::janafThermo<EquationOfState> Foam::operator-
           - molr2*jt2.lowCpCoeffs_[coefLabel];
     }
 
-    scalar Tcommon = jt1.Tcommon_;
     if (notEqual(jt1.Tcommon_, jt2.Tcommon_))
     {
-        WarningIn
+        FatalErrorIn
         (
             "operator-"
             "(const janafThermo<EquationOfState>& jt1,"
             " const janafThermo<EquationOfState>& jt2)"
-        )   << "Tcommon " << jt1.Tcommon_ << " != " << jt2.Tcommon_
-            << ", an average value will be used for the result"
-            << endl;
-
-        Tcommon = (molr1*jt1.Tcommon_ + molr2*jt2.Tcommon_)/(molr1 + molr2);
+        )   << "Tcommon " << jt1.Tcommon_ << " for "
+            << (jt1.name().size() ? jt1.name() : "others")
+            << " != " << jt2.Tcommon_ << " for "
+            << (jt2.name().size() ? jt2.name() : "others")
+            << exit(FatalError);
     }
 
     return janafThermo<EquationOfState>
     (
         eofs,
         max(jt1.Tlow_, jt2.Tlow_),
         min(jt1.Thigh_, jt2.Thigh_),
-        Tcommon,
+        jt1.Tcommon_,
         highCpCoeffs,
         lowCpCoeffs
     );