From 4bf4e007165f57f486cf7d8fd848c969b4860d99 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 6 Jul 2009 12:58:25 +0100 Subject: [PATCH] renamed polynomialThermo -> hPolynomialThermo --- .../specie/include/reactionTypes.H | 2 +- .../specie/include/thermoPhysicsTypes.H | 4 +- .../reaction/reactions/makeReactionThermo.H | 2 +- .../hPolynomialThermo.C} | 8 +- .../hPolynomialThermo.H} | 78 +++++++++---------- .../hPolynomialThermoI.H} | 54 ++++++------- 6 files changed, 74 insertions(+), 74 deletions(-) rename src/thermophysicalModels/specie/thermo/{polynomial/polynomialThermo.C => hPolynomial/hPolynomialThermo.C} (89%) rename src/thermophysicalModels/specie/thermo/{polynomial/polynomialThermo.H => hPolynomial/hPolynomialThermo.H} (69%) rename src/thermophysicalModels/specie/thermo/{polynomial/polynomialThermoI.H => hPolynomial/hPolynomialThermoI.H} (75%) diff --git a/src/thermophysicalModels/specie/include/reactionTypes.H b/src/thermophysicalModels/specie/include/reactionTypes.H index 531c9760bf..6ea8803c79 100644 --- a/src/thermophysicalModels/specie/include/reactionTypes.H +++ b/src/thermophysicalModels/specie/include/reactionTypes.H @@ -37,7 +37,7 @@ Description #include "Reaction.H" #include "icoPolynomial.H" -#include "polynomialThermo.H" +#include "hPolynomialThermo.H" #include "polynomialTransport.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H index 2b85b22474..502958b505 100644 --- a/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H +++ b/src/thermophysicalModels/specie/include/thermoPhysicsTypes.H @@ -41,7 +41,7 @@ Description #include "constTransport.H" #include "icoPolynomial.H" -#include "polynomialThermo.H" +#include "hPolynomialThermo.H" #include "polynomialTransport.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -58,7 +58,7 @@ namespace Foam < specieThermo < - polynomialThermo + hPolynomialThermo < icoPolynomial<8>, 8 diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H index 89cf9875d0..6d982155c7 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H +++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H @@ -46,7 +46,7 @@ Description #include "perfectGas.H" #include "polynomialTransport.H" -#include "polynomialThermo.H" +#include "hPolynomialThermo.H" #include "icoPolynomial.H" #include "addToRunTimeSelectionTable.H" diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C similarity index 89% rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C index c764426bbe..294a96005a 100644 --- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C @@ -24,13 +24,13 @@ License \*---------------------------------------------------------------------------*/ -#include "polynomialThermo.H" +#include "hPolynomialThermo.H" #include "IOstreams.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::polynomialThermo::polynomialThermo(Istream& is) +Foam::hPolynomialThermo::hPolynomialThermo(Istream& is) : EquationOfState(is), Hf_(readScalar(is)), @@ -47,7 +47,7 @@ template Foam::Ostream& Foam::operator<< ( Ostream& os, - const polynomialThermo& pt + const hPolynomialThermo& pt ) { os << static_cast(pt) << tab @@ -59,7 +59,7 @@ Foam::Ostream& Foam::operator<< os.check ( - "operator<<(Ostream& os, const polynomialThermo& pt)" + "operator<<(Ostream& os, const hPolynomialThermo& pt)" ); return os; diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H similarity index 69% rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H index 5f76a826d7..ec3c752f24 100644 --- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Foam::polynomialThermo + Foam::hPolynomialThermo Description Thermodynamics package templated on the equation of state, using polynomial @@ -32,13 +32,13 @@ Description Polynomials for h and s derived from cp SourceFiles - polynomialThermoI.H - polynomialThermo.C + hPolynomialThermoI.H + hPolynomialThermo.C \*---------------------------------------------------------------------------*/ -#ifndef polynomialThermo_H -#define polynomialThermo_H +#ifndef hPolynomialThermo_H +#define hPolynomialThermo_H #include "scalar.H" #include "Polynomial.H" @@ -51,50 +51,50 @@ namespace Foam // Forward declaration of friend functions and operators template -class polynomialThermo; +class hPolynomialThermo; template -inline polynomialThermo operator+ +inline hPolynomialThermo operator+ ( - const polynomialThermo&, - const polynomialThermo& + const hPolynomialThermo&, + const hPolynomialThermo& ); template -inline polynomialThermo operator- +inline hPolynomialThermo operator- ( - const polynomialThermo&, - const polynomialThermo& + const hPolynomialThermo&, + const hPolynomialThermo& ); template -inline polynomialThermo operator* +inline hPolynomialThermo operator* ( const scalar, - const polynomialThermo& + const hPolynomialThermo& ); template -inline polynomialThermo operator== +inline hPolynomialThermo operator== ( - const polynomialThermo&, - const polynomialThermo& + const hPolynomialThermo&, + const hPolynomialThermo& ); template Ostream& operator<< ( Ostream&, - const polynomialThermo& + const hPolynomialThermo& ); /*---------------------------------------------------------------------------*\ - Class polynomialThermo Declaration + Class hPolynomialThermo Declaration \*---------------------------------------------------------------------------*/ template -class polynomialThermo +class hPolynomialThermo : public EquationOfState { @@ -119,7 +119,7 @@ class polynomialThermo // Private member functions //- Construct from components - inline polynomialThermo + inline hPolynomialThermo ( const EquationOfState& pt, const scalar Hf, @@ -135,10 +135,10 @@ public: // Constructors //- Construct from dictionary - polynomialThermo(Istream& is); + hPolynomialThermo(Istream& is); //- Construct as a named copy - inline polynomialThermo(const word&, const polynomialThermo&); + inline hPolynomialThermo(const word&, const hPolynomialThermo&); // Member Functions @@ -161,34 +161,34 @@ public: // Member operators - inline void operator+=(const polynomialThermo&); - inline void operator-=(const polynomialThermo&); + inline void operator+=(const hPolynomialThermo&); + inline void operator-=(const hPolynomialThermo&); // Friend operators - friend polynomialThermo operator+ + friend hPolynomialThermo operator+ ( - const polynomialThermo&, - const polynomialThermo& + const hPolynomialThermo&, + const hPolynomialThermo& ); - friend polynomialThermo operator- + friend hPolynomialThermo operator- ( - const polynomialThermo&, - const polynomialThermo& + const hPolynomialThermo&, + const hPolynomialThermo& ); - friend polynomialThermo operator* + friend hPolynomialThermo operator* ( const scalar, - const polynomialThermo& + const hPolynomialThermo& ); - friend polynomialThermo operator== + friend hPolynomialThermo operator== ( - const polynomialThermo&, - const polynomialThermo& + const hPolynomialThermo&, + const hPolynomialThermo& ); @@ -197,7 +197,7 @@ public: friend Ostream& operator<< ( Ostream&, - const polynomialThermo& + const hPolynomialThermo& ); }; @@ -208,10 +208,10 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "polynomialThermoI.H" +#include "hPolynomialThermoI.H" #ifdef NoRepository -# include "polynomialThermo.C" +# include "hPolynomialThermo.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H similarity index 75% rename from src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H rename to src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H index 28e80c5d5f..1382c6f3ec 100644 --- a/src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H @@ -24,12 +24,12 @@ License \*---------------------------------------------------------------------------*/ -#include "polynomialThermo.H" +#include "hPolynomialThermo.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // template -inline Foam::polynomialThermo::polynomialThermo +inline Foam::hPolynomialThermo::hPolynomialThermo ( const EquationOfState& pt, const scalar Hf, @@ -51,10 +51,10 @@ inline Foam::polynomialThermo::polynomialThermo // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -inline Foam::polynomialThermo::polynomialThermo +inline Foam::hPolynomialThermo::hPolynomialThermo ( const word& name, - const polynomialThermo& pt + const hPolynomialThermo& pt ) : EquationOfState(name, pt), @@ -69,7 +69,7 @@ inline Foam::polynomialThermo::polynomialThermo // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -inline Foam::scalar Foam::polynomialThermo::cp +inline Foam::scalar Foam::hPolynomialThermo::cp ( const scalar T ) const @@ -79,7 +79,7 @@ inline Foam::scalar Foam::polynomialThermo::cp template -inline Foam::scalar Foam::polynomialThermo::h +inline Foam::scalar Foam::hPolynomialThermo::h ( const scalar T ) const @@ -89,7 +89,7 @@ inline Foam::scalar Foam::polynomialThermo::h template -inline Foam::scalar Foam::polynomialThermo::hs +inline Foam::scalar Foam::hPolynomialThermo::hs ( const scalar T ) const @@ -99,7 +99,7 @@ inline Foam::scalar Foam::polynomialThermo::hs template -inline Foam::scalar Foam::polynomialThermo::hc() +inline Foam::scalar Foam::hPolynomialThermo::hc() const { return Hf_*this->W(); @@ -107,7 +107,7 @@ const template -inline Foam::scalar Foam::polynomialThermo::s +inline Foam::scalar Foam::hPolynomialThermo::s ( const scalar T ) const @@ -119,9 +119,9 @@ inline Foam::scalar Foam::polynomialThermo::s // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // template -inline void Foam::polynomialThermo::operator+= +inline void Foam::hPolynomialThermo::operator+= ( - const polynomialThermo& pt + const hPolynomialThermo& pt ) { scalar molr1 = this->nMoles(); @@ -140,9 +140,9 @@ inline void Foam::polynomialThermo::operator+= template -inline void Foam::polynomialThermo::operator-= +inline void Foam::hPolynomialThermo::operator-= ( - const polynomialThermo& pt + const hPolynomialThermo& pt ) { scalar molr1 = this->nMoles(); @@ -163,10 +163,10 @@ inline void Foam::polynomialThermo::operator-= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // template -inline Foam::polynomialThermo Foam::operator+ +inline Foam::hPolynomialThermo Foam::operator+ ( - const polynomialThermo& pt1, - const polynomialThermo& pt2 + const hPolynomialThermo& pt1, + const hPolynomialThermo& pt2 ) { EquationOfState eofs @@ -177,7 +177,7 @@ inline Foam::polynomialThermo Foam::operator+ scalar molr1 = pt1.nMoles()/eofs.nMoles(); scalar molr2 = pt2.nMoles()/eofs.nMoles(); - return polynomialThermo + return hPolynomialThermo ( eofs, molr1*pt1.Hf_ + molr2*pt2.Hf_, @@ -190,10 +190,10 @@ inline Foam::polynomialThermo Foam::operator+ template -inline Foam::polynomialThermo Foam::operator- +inline Foam::hPolynomialThermo Foam::operator- ( - const polynomialThermo& pt1, - const polynomialThermo& pt2 + const hPolynomialThermo& pt1, + const hPolynomialThermo& pt2 ) { EquationOfState eofs @@ -204,7 +204,7 @@ inline Foam::polynomialThermo Foam::operator- scalar molr1 = pt1.nMoles()/eofs.nMoles(); scalar molr2 = pt2.nMoles()/eofs.nMoles(); - return polynomialThermo + return hPolynomialThermo ( eofs, molr1*pt1.Hf_ - molr2*pt2.Hf_, @@ -217,13 +217,13 @@ inline Foam::polynomialThermo Foam::operator- template -inline Foam::polynomialThermo Foam::operator* +inline Foam::hPolynomialThermo Foam::operator* ( const scalar s, - const polynomialThermo& pt + const hPolynomialThermo& pt ) { - return polynomialThermo + return hPolynomialThermo ( s*static_cast(pt), pt.Hf_, @@ -236,10 +236,10 @@ inline Foam::polynomialThermo Foam::operator* template -inline Foam::polynomialThermo Foam::operator== +inline Foam::hPolynomialThermo Foam::operator== ( - const polynomialThermo& pt1, - const polynomialThermo& pt2 + const hPolynomialThermo& pt1, + const hPolynomialThermo& pt2 ) { return pt2 - pt1;