From dc3c78c7579d79a603e843e6278e4a4561eb9eba Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 17 Feb 2017 16:35:43 +0000
Subject: [PATCH] thermophysicalModels: Ostream operator calls write(os) for
 consistent IO

---
 .../reaction/Reactions/Reaction/ReactionI.H   |  7 ++-
 .../ArrheniusReactionRateI.H                  |  4 +-
 .../ChemicallyActivatedReactionRateI.H        |  4 +-
 .../FallOffReactionRateI.H                    |  7 +--
 .../JanevReactionRate/JanevReactionRateI.H    | 11 +----
 .../LandauTellerReactionRateI.H               |  5 +-
 .../LangmuirHinshelwoodReactionRateI.H        | 11 +----
 .../SRIFallOffFunction/SRIFallOffFunctionI.H  |  9 +---
 .../TroeFallOffFunctionI.H                    |  8 +---
 .../infiniteReactionRateI.H                   |  5 +-
 .../powerSeries/powerSeriesReactionRateI.H    | 11 +----
 .../thirdBodyArrheniusReactionRateI.H         |  5 +-
 .../thirdBodyEfficienciesI.H                  | 48 +------------------
 13 files changed, 16 insertions(+), 119 deletions(-)

diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
index 6dece80ba..55287cbfd 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/ReactionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,9 +67,8 @@ Reaction<ReactionThermo>::rhs() const
 template<class ReactionThermo>
 inline Ostream& operator<<(Ostream& os, const Reaction<ReactionThermo>& r)
 {
-    OStringStream reaction;
-    os << r.reactionStr(reaction)<< token::END_STATEMENT <<nl;
-   return os;
+    r.write(os);
+    return os;
 }
 
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
index 5c67a60e9..49ec48c71 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ArrheniusReactionRate/ArrheniusReactionRateI.H
@@ -89,9 +89,7 @@ inline Foam::Ostream& Foam::operator<<
     const ArrheniusReactionRate& arr
 )
 {
-    os  << token::BEGIN_LIST
-        << arr.A_ << token::SPACE << arr.beta_ << token::SPACE << arr.Ta_
-        << token::END_LIST;
+    arr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
index f8e71fd4e..3e54f9a6a 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/ChemicallyActivatedReactionRate/ChemicallyActivatedReactionRateI.H
@@ -108,9 +108,7 @@ inline Foam::Ostream& Foam::operator<<
         <ReactionRate, ChemicallyActivationFunction>& carr
 )
 {
-    os  << token::BEGIN_LIST
-        << carr.k0_ << token::SPACE << carr.kInf_ << token::SPACE << carr.F_
-        << token::END_LIST;
+    carr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
index 0b7fa5f03..fff348d48 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/FallOffReactionRate/FallOffReactionRateI.H
@@ -120,12 +120,7 @@ inline Foam::Ostream& Foam::operator<<
     const FallOffReactionRate<ReactionRate, FallOffFunction>& forr
 )
 {
-    os  << token::BEGIN_LIST
-        << forr.k0_ << token::SPACE
-        << forr.kInf_ << token::SPACE
-        << forr.F_ << token::SPACE
-        << forr.thirdBodyEfficiencies_
-        << token::END_LIST;
+    forr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
index 055d6291d..cc76c2c2c 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/JanevReactionRate/JanevReactionRateI.H
@@ -104,16 +104,7 @@ inline Foam::Ostream& Foam::operator<<
     const JanevReactionRate& jrr
 )
 {
-    os  << token::BEGIN_LIST
-        << jrr.A_ << token::SPACE << jrr.beta_ << token::SPACE << jrr.Ta_;
-
-    for (int n=0; n<JanevReactionRate::nb_; n++)
-    {
-        os  << token::SPACE << jrr.b_[n];
-    }
-
-    os << token::END_LIST;
-
+    jrr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
index 56a636e9c..7d2c9ecd7 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LandauTellerReactionRate/LandauTellerReactionRateI.H
@@ -114,10 +114,7 @@ inline Foam::Ostream& Foam::operator<<
     const LandauTellerReactionRate& arr
 )
 {
-    os  << token::BEGIN_LIST
-        << arr.A_ << token::SPACE << arr.beta_ << token::SPACE << arr.Ta_
-        << token::SPACE << arr.B_ << token::SPACE << arr.C_
-        << token::END_LIST;
+    arr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
index 029d25444..d0b13587b 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/LangmuirHinshelwood/LangmuirHinshelwoodReactionRateI.H
@@ -109,16 +109,7 @@ inline Foam::Ostream& Foam::operator<<
     const LangmuirHinshelwoodReactionRate& lhrr
 )
 {
-    os  << token::BEGIN_LIST;
-
-    for (int i=0; i<LangmuirHinshelwoodReactionRate::n_; i++)
-    {
-        os  << token::SPACE
-            << '(' << lhrr.A_[i] << token::SPACE << lhrr.Ta_[i] << ')';
-    }
-
-    os << token::END_LIST;
-
+    lhrr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
index df4588547..68cce0350 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/SRIFallOffFunction/SRIFallOffFunctionI.H
@@ -83,14 +83,7 @@ inline Foam::Ostream& Foam::operator<<
     const Foam::SRIFallOffFunction& srifof
 )
 {
-    os  << token::BEGIN_LIST
-        << srifof.a_
-        << token::SPACE << srifof.b_
-        << token::SPACE << srifof.c_
-        << token::SPACE << srifof.d_
-        << token::SPACE << srifof.e_
-        << token::END_LIST;
-
+    srifof.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
index ff504a29f..1913985c1 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/fallOffFunctions/TroeFallOffFunction/TroeFallOffFunctionI.H
@@ -92,13 +92,7 @@ inline Foam::Ostream& Foam::operator<<
     const Foam::TroeFallOffFunction& tfof
 )
 {
-    os  << token::BEGIN_LIST
-        << tfof.alpha_
-        << token::SPACE << tfof.Tsss_
-        << token::SPACE << tfof.Ts_
-        << token::SPACE << tfof.Tss_
-        << token::END_LIST;
-
+    tfof.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
index 7d95e5539..918603451 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,8 +60,7 @@ inline Foam::Ostream& Foam::operator<<
     const infiniteReactionRate& rr
 )
 {
-    os  << token::BEGIN_LIST
-        << token::END_LIST;
+    rr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
index 5cee7f9b7..fcf9b808c 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H
@@ -97,16 +97,7 @@ inline Foam::Ostream& Foam::operator<<
     const powerSeriesReactionRate& psrr
 )
 {
-    os  << token::BEGIN_LIST
-        << psrr.A_ << token::SPACE << psrr.beta_ << token::SPACE << psrr.Ta_;
-
-    for (int n=0; n<powerSeriesReactionRate::nCoeff_; n++)
-    {
-        os  << token::SPACE << psrr.coeffs_[n];
-    }
-
-    os << token::END_LIST;
-
+    psrr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
index 711dfde0e..d9b39b61a 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyArrheniusReactionRate/thirdBodyArrheniusReactionRateI.H
@@ -81,10 +81,7 @@ inline Foam::Ostream& Foam::operator<<
     const thirdBodyArrheniusReactionRate& arr
 )
 {
-    os  << token::BEGIN_LIST
-        << static_cast<const ArrheniusReactionRate&>(arr)
-        << token::SPACE << arr.thirdBodyEfficiencies_
-        << token::END_LIST;
+    arr.write(os);
     return os;
 }
 
diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
index d77df740b..97a0e8eee 100644
--- a/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
+++ b/src/thermophysicalModels/specie/reaction/reactionRate/thirdBodyEfficiencies/thirdBodyEfficienciesI.H
@@ -114,53 +114,7 @@ inline Foam::Ostream& Foam::operator<<
     const thirdBodyEfficiencies& tbes
 )
 {
-    scalarList orderedTbes = tbes;
-    sort(orderedTbes);
-
-    scalar val = orderedTbes[0];
-    label count = 1;
-
-    scalar valMaxCount = val;
-    label maxCount = 1;
-
-    for (label i=1; i<orderedTbes.size(); i++)
-    {
-        if (equal(orderedTbes[i], val))
-        {
-            count++;
-        }
-        else
-        {
-            if (count > maxCount)
-            {
-                maxCount = count;
-                valMaxCount = val;
-            }
-
-            count = 1;
-            val = orderedTbes[i];
-        }
-    }
-
-    if (count > maxCount)
-    {
-        maxCount = count;
-        valMaxCount = val;
-    }
-
-    os << token::BEGIN_LIST << valMaxCount;
-
-    forAll(tbes, i)
-    {
-        if (notEqual(tbes[i], valMaxCount))
-        {
-            os  << token::SPACE << tbes.species_[i]
-                << token::SPACE << tbes[i];
-        }
-    }
-
-    os << token::END_LIST;
-
+    tbes.write(os);
     return os;
 }