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

renamed polynomialThermo -> hPolynomialThermo

Browse Source
This commit is contained in:
andy
2009-07-06 12:58:25 +01:00
parent b1d2ecd38a
commit 4bf4e00716
6 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/thermophysicalModels/specie/include/reactionTypes.H
View File

@ -37,7 +37,7 @@ Description
#include "Reaction.H" #include "Reaction.H"
#include "icoPolynomial.H" #include "icoPolynomial.H"
#include "polynomialThermo.H" #include "hPolynomialThermo.H"
#include "polynomialTransport.H" #include "polynomialTransport.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

@ -41,7 +41,7 @@ Description
#include "constTransport.H" #include "constTransport.H"
#include "icoPolynomial.H" #include "icoPolynomial.H"
#include "polynomialThermo.H" #include "hPolynomialThermo.H"
#include "polynomialTransport.H" #include "polynomialTransport.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -58,7 +58,7 @@ namespace Foam
< <
specieThermo specieThermo
< <
polynomialThermo hPolynomialThermo
< <
icoPolynomial<8>, icoPolynomial<8>,
8 8

2
src/thermophysicalModels/specie/reaction/reactions/makeReactionThermo.H
View File

@ -46,7 +46,7 @@ Description
#include "perfectGas.H" #include "perfectGas.H"
#include "polynomialTransport.H" #include "polynomialTransport.H"
#include "polynomialThermo.H" #include "hPolynomialThermo.H"
#include "icoPolynomial.H" #include "icoPolynomial.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"

8
src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.C → src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C
View File

@ -24,13 +24,13 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "polynomialThermo.H" #include "hPolynomialThermo.H"
#include "IOstreams.H" #include "IOstreams.H"
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo(Istream& is) Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo(Istream& is)
: :
EquationOfState(is), EquationOfState(is),
Hf_(readScalar(is)), Hf_(readScalar(is)),
@ -47,7 +47,7 @@ template<class EquationOfState, int PolySize>
Foam::Ostream& Foam::operator<< Foam::Ostream& Foam::operator<<
( (
Ostream& os, Ostream& os,
const polynomialThermo<EquationOfState, PolySize>& pt const hPolynomialThermo<EquationOfState, PolySize>& pt
) )
{ {
os << static_cast<const EquationOfState&>(pt) << tab os << static_cast<const EquationOfState&>(pt) << tab
@ -59,7 +59,7 @@ Foam::Ostream& Foam::operator<<
os.check os.check
( (
"operator<<(Ostream& os, const polynomialThermo<EquationOfState>& pt)" "operator<<(Ostream& os, const hPolynomialThermo<EquationOfState>& pt)"
); );
return os; return os;

78
src/thermophysicalModels/specie/thermo/polynomial/polynomialThermo.H → src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H
View File

@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Class Class
Foam::polynomialThermo Foam::hPolynomialThermo
Description Description
Thermodynamics package templated on the equation of state, using polynomial Thermodynamics package templated on the equation of state, using polynomial
@ -32,13 +32,13 @@ Description
Polynomials for h and s derived from cp Polynomials for h and s derived from cp
SourceFiles SourceFiles
polynomialThermoI.H hPolynomialThermoI.H
polynomialThermo.C hPolynomialThermo.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef polynomialThermo_H #ifndef hPolynomialThermo_H
#define polynomialThermo_H #define hPolynomialThermo_H
#include "scalar.H" #include "scalar.H"
#include "Polynomial.H" #include "Polynomial.H"
@ -51,50 +51,50 @@ namespace Foam
// Forward declaration of friend functions and operators // Forward declaration of friend functions and operators
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
class polynomialThermo; class hPolynomialThermo;
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline polynomialThermo<EquationOfState, PolySize> operator+ inline hPolynomialThermo<EquationOfState, PolySize> operator+
( (
const polynomialThermo<EquationOfState, PolySize>&, const hPolynomialThermo<EquationOfState, PolySize>&,
const polynomialThermo<EquationOfState, PolySize>& const hPolynomialThermo<EquationOfState, PolySize>&
); );
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline polynomialThermo<EquationOfState, PolySize> operator- inline hPolynomialThermo<EquationOfState, PolySize> operator-
( (
const polynomialThermo<EquationOfState, PolySize>&, const hPolynomialThermo<EquationOfState, PolySize>&,
const polynomialThermo<EquationOfState, PolySize>& const hPolynomialThermo<EquationOfState, PolySize>&
); );
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline polynomialThermo<EquationOfState, PolySize> operator* inline hPolynomialThermo<EquationOfState, PolySize> operator*
( (
const scalar, const scalar,
const polynomialThermo<EquationOfState, PolySize>& const hPolynomialThermo<EquationOfState, PolySize>&
); );
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline polynomialThermo<EquationOfState, PolySize> operator== inline hPolynomialThermo<EquationOfState, PolySize> operator==
( (
const polynomialThermo<EquationOfState, PolySize>&, const hPolynomialThermo<EquationOfState, PolySize>&,
const polynomialThermo<EquationOfState, PolySize>& const hPolynomialThermo<EquationOfState, PolySize>&
); );
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
Ostream& operator<< Ostream& operator<<
( (
Ostream&, Ostream&,
const polynomialThermo<EquationOfState, PolySize>& const hPolynomialThermo<EquationOfState, PolySize>&
); );
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class polynomialThermo Declaration Class hPolynomialThermo Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
class polynomialThermo class hPolynomialThermo
: :
public EquationOfState public EquationOfState
{ {
@ -119,7 +119,7 @@ class polynomialThermo
// Private member functions // Private member functions
//- Construct from components //- Construct from components
inline polynomialThermo inline hPolynomialThermo
( (
const EquationOfState& pt, const EquationOfState& pt,
const scalar Hf, const scalar Hf,
@ -135,10 +135,10 @@ public:
// Constructors // Constructors
//- Construct from dictionary //- Construct from dictionary
polynomialThermo(Istream& is); hPolynomialThermo(Istream& is);
//- Construct as a named copy //- Construct as a named copy
inline polynomialThermo(const word&, const polynomialThermo&); inline hPolynomialThermo(const word&, const hPolynomialThermo&);
// Member Functions // Member Functions
@ -161,34 +161,34 @@ public:
// Member operators // Member operators
inline void operator+=(const polynomialThermo&); inline void operator+=(const hPolynomialThermo&);
inline void operator-=(const polynomialThermo&); inline void operator-=(const hPolynomialThermo&);
// Friend operators // Friend operators
friend polynomialThermo operator+ <EquationOfState, PolySize> friend hPolynomialThermo operator+ <EquationOfState, PolySize>
( (
const polynomialThermo&, const hPolynomialThermo&,
const polynomialThermo& const hPolynomialThermo&
); );
friend polynomialThermo operator- <EquationOfState, PolySize> friend hPolynomialThermo operator- <EquationOfState, PolySize>
( (
const polynomialThermo&, const hPolynomialThermo&,
const polynomialThermo& const hPolynomialThermo&
); );
friend polynomialThermo operator* <EquationOfState, PolySize> friend hPolynomialThermo operator* <EquationOfState, PolySize>
( (
const scalar, const scalar,
const polynomialThermo& const hPolynomialThermo&
); );
friend polynomialThermo operator== <EquationOfState, PolySize> friend hPolynomialThermo operator== <EquationOfState, PolySize>
( (
const polynomialThermo&, const hPolynomialThermo&,
const polynomialThermo& const hPolynomialThermo&
); );
@ -197,7 +197,7 @@ public:
friend Ostream& operator<< <EquationOfState, PolySize> friend Ostream& operator<< <EquationOfState, PolySize>
( (
Ostream&, Ostream&,
const polynomialThermo& const hPolynomialThermo&
); );
}; };
@ -208,10 +208,10 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "polynomialThermoI.H" #include "hPolynomialThermoI.H"
#ifdef NoRepository #ifdef NoRepository
# include "polynomialThermo.C" # include "hPolynomialThermo.C"
#endif #endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

54
src/thermophysicalModels/specie/thermo/polynomial/polynomialThermoI.H → src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H
View File

@ -24,12 +24,12 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "polynomialThermo.H" #include "hPolynomialThermo.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
( (
const EquationOfState& pt, const EquationOfState& pt,
const scalar Hf, const scalar Hf,
@ -51,10 +51,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo inline Foam::hPolynomialThermo<EquationOfState, PolySize>::hPolynomialThermo
( (
const word& name, const word& name,
const polynomialThermo& pt const hPolynomialThermo& pt
) )
: :
EquationOfState(name, pt), EquationOfState(name, pt),
@ -69,7 +69,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize>::polynomialThermo
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::cp inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::cp
( (
const scalar T const scalar T
) const ) const
@ -79,7 +79,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::cp
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::h inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::h
( (
const scalar T const scalar T
) const ) const
@ -89,7 +89,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::h
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hs inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hs
( (
const scalar T const scalar T
) const ) const
@ -99,7 +99,7 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hs
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::hc() inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::hc()
const const
{ {
return Hf_*this->W(); return Hf_*this->W();
@ -107,7 +107,7 @@ const
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::s inline Foam::scalar Foam::hPolynomialThermo<EquationOfState, PolySize>::s
( (
const scalar T const scalar T
) const ) const
@ -119,9 +119,9 @@ inline Foam::scalar Foam::polynomialThermo<EquationOfState, PolySize>::s
// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator+= inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator+=
( (
const polynomialThermo<EquationOfState, PolySize>& pt const hPolynomialThermo<EquationOfState, PolySize>& pt
) )
{ {
scalar molr1 = this->nMoles(); scalar molr1 = this->nMoles();
@ -140,9 +140,9 @@ inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator+=
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator-= inline void Foam::hPolynomialThermo<EquationOfState, PolySize>::operator-=
( (
const polynomialThermo<EquationOfState, PolySize>& pt const hPolynomialThermo<EquationOfState, PolySize>& pt
) )
{ {
scalar molr1 = this->nMoles(); scalar molr1 = this->nMoles();
@ -163,10 +163,10 @@ inline void Foam::polynomialThermo<EquationOfState, PolySize>::operator-=
// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * //
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+ inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator+
( (
const polynomialThermo<EquationOfState, PolySize>& pt1, const hPolynomialThermo<EquationOfState, PolySize>& pt1,
const polynomialThermo<EquationOfState, PolySize>& pt2 const hPolynomialThermo<EquationOfState, PolySize>& pt2
) )
{ {
EquationOfState eofs EquationOfState eofs
@ -177,7 +177,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
scalar molr1 = pt1.nMoles()/eofs.nMoles(); scalar molr1 = pt1.nMoles()/eofs.nMoles();
scalar molr2 = pt2.nMoles()/eofs.nMoles(); scalar molr2 = pt2.nMoles()/eofs.nMoles();
return polynomialThermo<EquationOfState, PolySize> return hPolynomialThermo<EquationOfState, PolySize>
( (
eofs, eofs,
molr1*pt1.Hf_ + molr2*pt2.Hf_, molr1*pt1.Hf_ + molr2*pt2.Hf_,
@ -190,10 +190,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator+
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator- inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator-
( (
const polynomialThermo<EquationOfState, PolySize>& pt1, const hPolynomialThermo<EquationOfState, PolySize>& pt1,
const polynomialThermo<EquationOfState, PolySize>& pt2 const hPolynomialThermo<EquationOfState, PolySize>& pt2
) )
{ {
EquationOfState eofs EquationOfState eofs
@ -204,7 +204,7 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
scalar molr1 = pt1.nMoles()/eofs.nMoles(); scalar molr1 = pt1.nMoles()/eofs.nMoles();
scalar molr2 = pt2.nMoles()/eofs.nMoles(); scalar molr2 = pt2.nMoles()/eofs.nMoles();
return polynomialThermo<EquationOfState, PolySize> return hPolynomialThermo<EquationOfState, PolySize>
( (
eofs, eofs,
molr1*pt1.Hf_ - molr2*pt2.Hf_, molr1*pt1.Hf_ - molr2*pt2.Hf_,
@ -217,13 +217,13 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator-
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator* inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator*
( (
const scalar s, const scalar s,
const polynomialThermo<EquationOfState, PolySize>& pt const hPolynomialThermo<EquationOfState, PolySize>& pt
) )
{ {
return polynomialThermo<EquationOfState, PolySize> return hPolynomialThermo<EquationOfState, PolySize>
( (
s*static_cast<const EquationOfState&>(pt), s*static_cast<const EquationOfState&>(pt),
pt.Hf_, pt.Hf_,
@ -236,10 +236,10 @@ inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator*
template<class EquationOfState, int PolySize> template<class EquationOfState, int PolySize>
inline Foam::polynomialThermo<EquationOfState, PolySize> Foam::operator== inline Foam::hPolynomialThermo<EquationOfState, PolySize> Foam::operator==
( (
const polynomialThermo<EquationOfState, PolySize>& pt1, const hPolynomialThermo<EquationOfState, PolySize>& pt1,
const polynomialThermo<EquationOfState, PolySize>& pt2 const hPolynomialThermo<EquationOfState, PolySize>& pt2
) )
{ {
return pt2 - pt1; return pt2 - pt1;