From 1970573609d5549ff4c030d7dc1f1e07732f255e Mon Sep 17 00:00:00 2001 From: andy <a.heather@opencfd.co.uk> Date: Wed, 13 Oct 2010 18:20:14 +0100 Subject: [PATCH] STYLE: Misc coding cosmetics --- .../equationOfState/perfectGas/perfectGas.C | 17 +- .../equationOfState/perfectGas/perfectGasI.H | 45 ++--- .../reaction/Reactions/Reaction/Reaction.C | 1 + .../powerSeries/powerSeriesReactionRate.H | 6 +- .../powerSeries/powerSeriesReactionRateI.H | 18 +- .../specie/thermo/eConst/eConstThermo.C | 28 +-- .../specie/thermo/eConst/eConstThermo.H | 52 ++--- .../specie/thermo/eConst/eConstThermoI.H | 137 +++++++------ .../specie/thermo/janaf/janafThermo.C | 36 ++-- .../specie/thermo/janaf/janafThermo.H | 54 ++--- .../specie/thermo/janaf/janafThermoI.H | 126 ++++++------ .../specie/thermo/specieThermo/specieThermo.C | 36 ++-- .../specie/thermo/specieThermo/specieThermo.H | 52 ++--- .../thermo/specieThermo/specieThermoI.H | 190 +++++++++--------- .../specie/transport/const/constTransport.C | 45 ++--- .../specie/transport/const/constTransport.H | 58 +++--- .../specie/transport/const/constTransportI.H | 103 +++++----- .../speciesTransport/speciesTransport.C | 19 +- .../speciesTransport/speciesTransportI.H | 15 +- .../sutherland/sutherlandTransport.C | 42 ++-- .../sutherland/sutherlandTransport.H | 60 +++--- .../sutherland/sutherlandTransportI.H | 145 +++++++------ .../constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../cavity/constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../prism/constant/thermophysicalProperties | 2 +- .../hotRoom/constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../hotRoom/constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- .../bottomAir/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 2 +- .../bottomAir/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 2 +- .../bottomAir/thermophysicalProperties | 2 +- .../constant/topAir/thermophysicalProperties | 2 +- .../constant/thermophysicalProperties | 2 +- 44 files changed, 634 insertions(+), 695 deletions(-) diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C index ece0d8baffb..f73335e225c 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C +++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C @@ -26,14 +26,9 @@ License #include "perfectGas.H" #include "IOstreams.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -perfectGas::perfectGas(Istream& is) +Foam::perfectGas::perfectGas(Istream& is) : specie(is) { @@ -41,7 +36,7 @@ perfectGas::perfectGas(Istream& is) } -perfectGas::perfectGas(const dictionary& dict) +Foam::perfectGas::perfectGas(const dictionary& dict) : specie(dict) {} @@ -49,7 +44,7 @@ perfectGas::perfectGas(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void perfectGas::write(Ostream& os) const +void Foam::perfectGas::write(Ostream& os) const { specie::write(os); } @@ -57,7 +52,7 @@ void perfectGas::write(Ostream& os) const // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -Ostream& operator<<(Ostream& os, const perfectGas& pg) +Foam::Ostream& Foam::operator<<(Ostream& os, const perfectGas& pg) { os << static_cast<const specie&>(pg); @@ -66,8 +61,4 @@ Ostream& operator<<(Ostream& os, const perfectGas& pg) } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H index a72cf9fb87f..199bbd73f92 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H +++ b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGasI.H @@ -25,17 +25,9 @@ License #include "perfectGas.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -inline perfectGas::perfectGas -( - const specie& sp -) +inline Foam::perfectGas::perfectGas(const specie& sp) : specie(sp) {} @@ -43,25 +35,28 @@ inline perfectGas::perfectGas // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -inline perfectGas::perfectGas(const word& name, const perfectGas& pg) +inline Foam::perfectGas::perfectGas(const word& name, const perfectGas& pg) : specie(name, pg) {} -inline autoPtr<perfectGas> perfectGas::clone() const +inline Foam::autoPtr<Foam::perfectGas> Foam::perfectGas::clone() const { return autoPtr<perfectGas>(new perfectGas(*this)); } -inline autoPtr<perfectGas> perfectGas::New(Istream& is) +inline Foam::autoPtr<Foam::perfectGas> Foam::perfectGas::New(Istream& is) { return autoPtr<perfectGas>(new perfectGas(is)); } -inline autoPtr<perfectGas> perfectGas::New(const dictionary& dict) +inline Foam::autoPtr<Foam::perfectGas> Foam::perfectGas::New +( + const dictionary& dict +) { return autoPtr<perfectGas>(new perfectGas(dict)); } @@ -69,19 +64,19 @@ inline autoPtr<perfectGas> perfectGas::New(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline scalar perfectGas::rho(scalar p, scalar T) const +inline Foam::scalar Foam::perfectGas::rho(scalar p, scalar T) const { return p/(R()*T); } -inline scalar perfectGas::psi(scalar, scalar T) const +inline Foam::scalar Foam::perfectGas::psi(scalar, scalar T) const { return 1.0/(R()*T); } -inline scalar perfectGas::Z(scalar, scalar) const +inline Foam::scalar Foam::perfectGas::Z(scalar, scalar) const { return 1.0; } @@ -89,19 +84,19 @@ inline scalar perfectGas::Z(scalar, scalar) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline void perfectGas::operator+=(const perfectGas& pg) +inline void Foam::perfectGas::operator+=(const perfectGas& pg) { specie::operator+=(pg); } -inline void perfectGas::operator-=(const perfectGas& pg) +inline void Foam::perfectGas::operator-=(const perfectGas& pg) { specie::operator-=(pg); } -inline void perfectGas::operator*=(const scalar s) +inline void Foam::perfectGas::operator*=(const scalar s) { specie::operator*=(s); } @@ -109,7 +104,7 @@ inline void perfectGas::operator*=(const scalar s) // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -inline perfectGas operator+ +inline Foam::perfectGas Foam::operator+ ( const perfectGas& pg1, const perfectGas& pg2 @@ -123,7 +118,7 @@ inline perfectGas operator+ } -inline perfectGas operator- +inline Foam::perfectGas Foam::operator- ( const perfectGas& pg1, const perfectGas& pg2 @@ -137,7 +132,7 @@ inline perfectGas operator- } -inline perfectGas operator* +inline Foam::perfectGas Foam::operator* ( const scalar s, const perfectGas& pg @@ -147,7 +142,7 @@ inline perfectGas operator* } -inline perfectGas operator== +inline Foam::perfectGas Foam::operator== ( const perfectGas& pg1, const perfectGas& pg2 @@ -157,8 +152,4 @@ inline perfectGas operator== } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C index 94a369f9a35..d721f96e4fb 100644 --- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C +++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C @@ -380,6 +380,7 @@ Foam::scalar Foam::Reaction<ReactionThermo>::kr return 0.0; } + template<class ReactionThermo> Foam::scalar Foam::Reaction<ReactionThermo>::kr ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H index 4d4239ebc1b..ce92828a723 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H @@ -56,8 +56,8 @@ class powerSeriesReactionRate scalar beta_; scalar Ta_; - static const label nb_ = 4; - FixedList<scalar, nb_> b_; + static const label nCoeff_ = 4; + FixedList<scalar, nCoeff_> coeffs_; public: @@ -70,7 +70,7 @@ public: const scalar A, const scalar beta, const scalar Ta, - const FixedList<scalar, nb_> b + const FixedList<scalar, nCoeff_> coeffs ); //- Construct from Istream diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H index 7900f282e50..b6391f84415 100644 --- a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H +++ b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRateI.H @@ -30,13 +30,13 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate const scalar A, const scalar beta, const scalar Ta, - const FixedList<scalar, nb_> b + const FixedList<scalar, nCoeff_> coeffs ) : A_(A), beta_(beta), Ta_(Ta), - b_(b) + coeffs_(coeffs) {} @@ -49,7 +49,7 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate A_(readScalar(is.readBegin("powerSeriesReactionRate(Istream&)"))), beta_(readScalar(is)), Ta_(readScalar(is)), - b_(is) + coeffs_(is) { is.readEnd("powerSeriesReactionRate(Istream&)"); } @@ -64,7 +64,7 @@ inline Foam::powerSeriesReactionRate::powerSeriesReactionRate A_(readScalar(dict.lookup("A"))), beta_(readScalar(dict.lookup("beta"))), Ta_(readScalar(dict.lookup("Ta"))), - b_(dict.lookup("coeffs")) + coeffs_(dict.lookup("coeffs")) {} @@ -86,9 +86,9 @@ inline Foam::scalar Foam::powerSeriesReactionRate::operator() scalar expArg = 0.0; - for (int n=0; n<nb_; n++) + forAll(coeffs_, n) { - expArg += b_[n]/pow(T, n); + expArg += coeffs_[n]/pow(T, n); } lta *= exp(expArg); @@ -102,7 +102,7 @@ inline void Foam::powerSeriesReactionRate::write(Ostream& os) const os.writeKeyword("A") << A_ << token::END_STATEMENT << nl; os.writeKeyword("beta") << beta_ << token::END_STATEMENT << nl; os.writeKeyword("Ta") << Ta_ << token::END_STATEMENT << nl; - os.writeKeyword("b") << b_ << token::END_STATEMENT << nl; + os.writeKeyword("coeffs") << coeffs_ << token::END_STATEMENT << nl; } @@ -115,9 +115,9 @@ inline Foam::Ostream& Foam::operator<< os << token::BEGIN_LIST << psrr.A_ << token::SPACE << psrr.beta_ << token::SPACE << psrr.Ta_; - for (int n=0; n<powerSeriesReactionRate::nb_; n++) + for (int n=0; n<powerSeriesReactionRate::nCoeff_; n++) { - os << token::SPACE << psrr.b_[n]; + os << token::SPACE << psrr.coeffs_[n]; } os << token::END_LIST; diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C index 41671b58e79..f03e8d9e89e 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C @@ -28,21 +28,21 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class equationOfState> -Foam::eConstThermo<equationOfState>::eConstThermo(Istream& is) +template<class EquationOfState> +Foam::eConstThermo<EquationOfState>::eConstThermo(Istream& is) : - equationOfState(is), + EquationOfState(is), Cv_(readScalar(is)), Hf_(readScalar(is)) { - is.check("eConstThermo::eConstThermo(Istream& is)"); + is.check("eConstThermo<EquationOfState>::eConstThermo(Istream&)"); } -template<class equationOfState> -Foam::eConstThermo<equationOfState>::eConstThermo(const dictionary& dict) +template<class EquationOfState> +Foam::eConstThermo<EquationOfState>::eConstThermo(const dictionary& dict) : - equationOfState(dict), + EquationOfState(dict), Cv_(readScalar(dict.lookup("Cv"))), Hf_(readScalar(dict.lookup("Hf"))) {} @@ -50,10 +50,10 @@ Foam::eConstThermo<equationOfState>::eConstThermo(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class equationOfState> -void Foam::eConstThermo<equationOfState>::write(Ostream& os) const +template<class EquationOfState> +void Foam::eConstThermo<EquationOfState>::write(Ostream& os) const { - equationOfState::write(os); + EquationOfState::write(os); os.writeKeyword("Cv") << Cv_ << token::END_STATEMENT << nl; os.writeKeyword("Hf") << Hf_ << token::END_STATEMENT << nl; } @@ -61,17 +61,17 @@ void Foam::eConstThermo<equationOfState>::write(Ostream& os) const // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -template<class equationOfState> +template<class EquationOfState> Foam::Ostream& Foam::operator<< ( Ostream& os, - const eConstThermo<equationOfState>& ct + const eConstThermo<EquationOfState>& ct ) { - os << static_cast<const equationOfState&>(ct) << tab + os << static_cast<const EquationOfState&>(ct) << tab << ct.Cv_ << tab << ct.Hf_; - os.check("Ostream& operator<<(Ostream& os, const eConstThermo& ct)"); + os.check("Ostream& operator<<(Ostream&, const eConstThermo&)"); return os; } diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H index 9211123b10f..450dd714f6b 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H @@ -46,41 +46,41 @@ namespace Foam // Forward declaration of friend functions and operators -template<class equationOfState> class eConstThermo; +template<class EquationOfState> class eConstThermo; -template<class equationOfState> -inline eConstThermo<equationOfState> operator+ +template<class EquationOfState> +inline eConstThermo<EquationOfState> operator+ ( - const eConstThermo<equationOfState>&, - const eConstThermo<equationOfState>& + const eConstThermo<EquationOfState>&, + const eConstThermo<EquationOfState>& ); -template<class equationOfState> -inline eConstThermo<equationOfState> operator- +template<class EquationOfState> +inline eConstThermo<EquationOfState> operator- ( - const eConstThermo<equationOfState>&, - const eConstThermo<equationOfState>& + const eConstThermo<EquationOfState>&, + const eConstThermo<EquationOfState>& ); -template<class equationOfState> -inline eConstThermo<equationOfState> operator* +template<class EquationOfState> +inline eConstThermo<EquationOfState> operator* ( const scalar, - const eConstThermo<equationOfState>& + const eConstThermo<EquationOfState>& ); -template<class equationOfState> -inline eConstThermo<equationOfState> operator== +template<class EquationOfState> +inline eConstThermo<EquationOfState> operator== ( - const eConstThermo<equationOfState>&, - const eConstThermo<equationOfState>& + const eConstThermo<EquationOfState>&, + const eConstThermo<EquationOfState>& ); -template<class equationOfState> +template<class EquationOfState> Ostream& operator<< ( Ostream&, - const eConstThermo<equationOfState>& + const eConstThermo<EquationOfState>& ); @@ -88,10 +88,10 @@ Ostream& operator<< Class eConstThermo Declaration \*---------------------------------------------------------------------------*/ -template<class equationOfState> +template<class EquationOfState> class eConstThermo : - public equationOfState + public EquationOfState { // Private data @@ -104,7 +104,7 @@ class eConstThermo //- Construct from components inline eConstThermo ( - const equationOfState& st, + const EquationOfState& st, const scalar cv, const scalar hf ); @@ -167,25 +167,25 @@ public: // Friend operators - friend eConstThermo operator+ <equationOfState> + friend eConstThermo operator+ <EquationOfState> ( const eConstThermo&, const eConstThermo& ); - friend eConstThermo operator- <equationOfState> + friend eConstThermo operator- <EquationOfState> ( const eConstThermo&, const eConstThermo& ); - friend eConstThermo operator* <equationOfState> + friend eConstThermo operator* <EquationOfState> ( const scalar, const eConstThermo& ); - friend eConstThermo operator== <equationOfState> + friend eConstThermo operator== <EquationOfState> ( const eConstThermo&, const eConstThermo& @@ -194,7 +194,7 @@ public: // IOstream Operators - friend Ostream& operator<< <equationOfState> + friend Ostream& operator<< <EquationOfState> ( Ostream&, const eConstThermo& diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H index 917a43089bd..f2a117a00bf 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H @@ -25,15 +25,15 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template<class equationOfState> -inline Foam::eConstThermo<equationOfState>::eConstThermo +template<class EquationOfState> +inline Foam::eConstThermo<EquationOfState>::eConstThermo ( - const equationOfState& st, + const EquationOfState& st, const scalar cv, const scalar hf ) : - equationOfState(st), + EquationOfState(st), Cv_(cv), Hf_(hf) {} @@ -41,56 +41,56 @@ inline Foam::eConstThermo<equationOfState>::eConstThermo // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class equationOfState> -inline Foam::eConstThermo<equationOfState>::eConstThermo +template<class EquationOfState> +inline Foam::eConstThermo<EquationOfState>::eConstThermo ( const word& name, - const eConstThermo<equationOfState>& ct + const eConstThermo<EquationOfState>& ct ) : - equationOfState(name, ct), + EquationOfState(name, ct), Cv_(ct.Cv_), Hf_(ct.Hf_) {} -template<class equationOfState> -inline Foam::autoPtr<Foam::eConstThermo<equationOfState> > -Foam::eConstThermo<equationOfState>::clone() const +template<class EquationOfState> +inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> > +Foam::eConstThermo<EquationOfState>::clone() const { - return autoPtr<eConstThermo<equationOfState> > + return autoPtr<eConstThermo<EquationOfState> > ( - new eConstThermo<equationOfState>(*this) + new eConstThermo<EquationOfState>(*this) ); } -template<class equationOfState> -inline Foam::autoPtr<Foam::eConstThermo<equationOfState> > -Foam::eConstThermo<equationOfState>::New(Istream& is) +template<class EquationOfState> +inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> > +Foam::eConstThermo<EquationOfState>::New(Istream& is) { - return autoPtr<eConstThermo<equationOfState> > + return autoPtr<eConstThermo<EquationOfState> > ( - new eConstThermo<equationOfState>(is) + new eConstThermo<EquationOfState>(is) ); } -template<class equationOfState> -inline Foam::autoPtr<Foam::eConstThermo<equationOfState> > -Foam::eConstThermo<equationOfState>::New(const dictionary& dict) +template<class EquationOfState> +inline Foam::autoPtr<Foam::eConstThermo<EquationOfState> > +Foam::eConstThermo<EquationOfState>::New(const dictionary& dict) { - return autoPtr<eConstThermo<equationOfState> > + return autoPtr<eConstThermo<EquationOfState> > ( - new eConstThermo<equationOfState>(dict) + new eConstThermo<EquationOfState>(dict) ); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class equationOfState> -inline Foam::scalar Foam::eConstThermo<equationOfState>::cp +template<class EquationOfState> +inline Foam::scalar Foam::eConstThermo<EquationOfState>::cp ( const scalar ) const @@ -99,8 +99,8 @@ inline Foam::scalar Foam::eConstThermo<equationOfState>::cp } -template<class equationOfState> -inline Foam::scalar Foam::eConstThermo<equationOfState>::h +template<class EquationOfState> +inline Foam::scalar Foam::eConstThermo<EquationOfState>::h ( const scalar T ) const @@ -109,8 +109,8 @@ inline Foam::scalar Foam::eConstThermo<equationOfState>::h } -template<class equationOfState> -inline Foam::scalar Foam::eConstThermo<equationOfState>::hs +template<class EquationOfState> +inline Foam::scalar Foam::eConstThermo<EquationOfState>::hs ( const scalar T ) const @@ -119,35 +119,38 @@ inline Foam::scalar Foam::eConstThermo<equationOfState>::hs } -template<class equationOfState> -inline Foam::scalar Foam::eConstThermo<equationOfState>::hc() const +template<class EquationOfState> +inline Foam::scalar Foam::eConstThermo<EquationOfState>::hc() const { return Hf_*this->W(); } -template<class equationOfState> -inline Foam::scalar Foam::eConstThermo<equationOfState>::s +template<class EquationOfState> +inline Foam::scalar Foam::eConstThermo<EquationOfState>::s ( const scalar T ) const { - notImplemented("scalar eConstThermo::s(const scalar T) const"); + notImplemented + ( + "scalar eConstThermo<EquationOfState>::s(const scalar) const" + ); return T; } // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template<class equationOfState> -inline void Foam::eConstThermo<equationOfState>::operator+= +template<class EquationOfState> +inline void Foam::eConstThermo<EquationOfState>::operator+= ( - const eConstThermo<equationOfState>& ct + const eConstThermo<EquationOfState>& ct ) { scalar molr1 = this->nMoles(); - equationOfState::operator+=(ct); + EquationOfState::operator+=(ct); molr1 /= this->nMoles(); scalar molr2 = ct.nMoles()/this->nMoles(); @@ -157,15 +160,15 @@ inline void Foam::eConstThermo<equationOfState>::operator+= } -template<class equationOfState> -inline void Foam::eConstThermo<equationOfState>::operator-= +template<class EquationOfState> +inline void Foam::eConstThermo<EquationOfState>::operator-= ( - const eConstThermo<equationOfState>& ct + const eConstThermo<EquationOfState>& ct ) { scalar molr1 = this->nMoles(); - equationOfState::operator-=(ct); + EquationOfState::operator-=(ct); molr1 /= this->nMoles(); scalar molr2 = ct.nMoles()/this->nMoles(); @@ -177,20 +180,20 @@ inline void Foam::eConstThermo<equationOfState>::operator-= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template<class equationOfState> -inline Foam::eConstThermo<equationOfState> Foam::operator+ +template<class EquationOfState> +inline Foam::eConstThermo<EquationOfState> Foam::operator+ ( - const eConstThermo<equationOfState>& ct1, - const eConstThermo<equationOfState>& ct2 + const eConstThermo<EquationOfState>& ct1, + const eConstThermo<EquationOfState>& ct2 ) { - equationOfState eofs + EquationOfState eofs ( - static_cast<const equationOfState&>(ct1) - + static_cast<const equationOfState&>(ct2) + static_cast<const EquationOfState&>(ct1) + + static_cast<const EquationOfState&>(ct2) ); - return eConstThermo<equationOfState> + return eConstThermo<EquationOfState> ( eofs, ct1.nMoles()/eofs.nMoles()*ct1.Cv_ @@ -201,20 +204,20 @@ inline Foam::eConstThermo<equationOfState> Foam::operator+ } -template<class equationOfState> -inline Foam::eConstThermo<equationOfState> Foam::operator- +template<class EquationOfState> +inline Foam::eConstThermo<EquationOfState> Foam::operator- ( - const eConstThermo<equationOfState>& ct1, - const eConstThermo<equationOfState>& ct2 + const eConstThermo<EquationOfState>& ct1, + const eConstThermo<EquationOfState>& ct2 ) { - equationOfState eofs + EquationOfState eofs ( - static_cast<const equationOfState&>(ct1) - - static_cast<const equationOfState&>(ct2) + static_cast<const EquationOfState&>(ct1) + - static_cast<const EquationOfState&>(ct2) ); - return eConstThermo<equationOfState> + return eConstThermo<EquationOfState> ( eofs, ct1.nMoles()/eofs.nMoles()*ct1.Cv_ @@ -225,27 +228,27 @@ inline Foam::eConstThermo<equationOfState> Foam::operator- } -template<class equationOfState> -inline Foam::eConstThermo<equationOfState> Foam::operator* +template<class EquationOfState> +inline Foam::eConstThermo<EquationOfState> Foam::operator* ( const scalar s, - const eConstThermo<equationOfState>& ct + const eConstThermo<EquationOfState>& ct ) { - return eConstThermo<equationOfState> + return eConstThermo<EquationOfState> ( - s*static_cast<const equationOfState&>(ct), + s*static_cast<const EquationOfState&>(ct), ct.Cv_, ct.Hf_ ); } -template<class equationOfState> -inline Foam::eConstThermo<equationOfState> Foam::operator== +template<class EquationOfState> +inline Foam::eConstThermo<EquationOfState> Foam::operator== ( - const eConstThermo<equationOfState>& ct1, - const eConstThermo<equationOfState>& ct2 + const eConstThermo<EquationOfState>& ct1, + const eConstThermo<EquationOfState>& ct2 ) { return ct2 - ct1; diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C index 71a4cb45f2b..562f373df71 100644 --- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C +++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C @@ -28,26 +28,26 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template<class equationOfState> -void Foam::janafThermo<equationOfState>::checkInputData() const +template<class EquationOfState> +void Foam::janafThermo<EquationOfState>::checkInputData() const { if (Tlow_ >= Thigh_) { - FatalErrorIn("janafThermo<equationOfState>::check()") + FatalErrorIn("janafThermo<EquationOfState>::check()") << "Tlow(" << Tlow_ << ") >= Thigh(" << Thigh_ << ')' << exit(FatalIOError); } if (Tcommon_ <= Tlow_) { - FatalErrorIn("janafThermo<equationOfState>::check()") + FatalErrorIn("janafThermo<EquationOfState>::check()") << "Tcommon(" << Tcommon_ << ") <= Tlow(" << Tlow_ << ')' << exit(FatalIOError); } if (Tcommon_ > Thigh_) { - FatalErrorIn("janafThermo<equationOfState>::check()") + FatalErrorIn("janafThermo<EquationOfState>::check()") << "Tcommon(" << Tcommon_ << ") > Thigh(" << Thigh_ << ')' << exit(FatalIOError); } @@ -56,10 +56,10 @@ void Foam::janafThermo<equationOfState>::checkInputData() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class equationOfState> -Foam::janafThermo<equationOfState>::janafThermo(Istream& is) +template<class EquationOfState> +Foam::janafThermo<EquationOfState>::janafThermo(Istream& is) : - equationOfState(is), + EquationOfState(is), Tlow_(readScalar(is)), Thigh_(readScalar(is)), Tcommon_(readScalar(is)) @@ -81,10 +81,10 @@ Foam::janafThermo<equationOfState>::janafThermo(Istream& is) } -template<class equationOfState> -Foam::janafThermo<equationOfState>::janafThermo(const dictionary& dict) +template<class EquationOfState> +Foam::janafThermo<EquationOfState>::janafThermo(const dictionary& dict) : - equationOfState(dict), + EquationOfState(dict), Tlow_(readScalar(dict.lookup("Tlow"))), Thigh_(readScalar(dict.lookup("Thigh"))), Tcommon_(readScalar(dict.lookup("Tcommon"))), @@ -97,10 +97,10 @@ Foam::janafThermo<equationOfState>::janafThermo(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class equationOfState> -void Foam::janafThermo<equationOfState>::write(Ostream& os) const +template<class EquationOfState> +void Foam::janafThermo<EquationOfState>::write(Ostream& os) const { - equationOfState::write(os); + EquationOfState::write(os); os.writeKeyword("Tlow") << Tlow_ << token::END_STATEMENT << endl; os.writeKeyword("Thigh") << Thigh_ << token::END_STATEMENT << endl; os.writeKeyword("Tcommon") << Tcommon_ << token::END_STATEMENT << endl; @@ -113,14 +113,14 @@ void Foam::janafThermo<equationOfState>::write(Ostream& os) const // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -template<class equationOfState> +template<class EquationOfState> Foam::Ostream& Foam::operator<< ( Ostream& os, - const janafThermo<equationOfState>& jt + const janafThermo<EquationOfState>& jt ) { - os << static_cast<const equationOfState&>(jt) << nl + os << static_cast<const EquationOfState&>(jt) << nl << " " << jt.Tlow_ << tab << jt.Thigh_ << tab << jt.Tcommon_; @@ -143,7 +143,7 @@ Foam::Ostream& Foam::operator<< os.check ( - "operator<<(Ostream& os, const janafThermo<equationOfState>& jt)" + "operator<<(Ostream& os, const janafThermo<EquationOfState>& jt)" ); return os; diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H index 8cd749b94d0..c60c8981639 100644 --- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H +++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H @@ -26,7 +26,7 @@ Class Description JANAF tables based thermodynamics package templated - into the equationOfState. + into the equation of state. SourceFiles janafThermoI.H @@ -47,41 +47,41 @@ namespace Foam // Forward declaration of friend functions and operators -template<class equationOfState> class janafThermo; +template<class EquationOfState> class janafThermo; -template<class equationOfState> -inline janafThermo<equationOfState> operator+ +template<class EquationOfState> +inline janafThermo<EquationOfState> operator+ ( - const janafThermo<equationOfState>&, - const janafThermo<equationOfState>& + const janafThermo<EquationOfState>&, + const janafThermo<EquationOfState>& ); -template<class equationOfState> -inline janafThermo<equationOfState> operator- +template<class EquationOfState> +inline janafThermo<EquationOfState> operator- ( - const janafThermo<equationOfState>&, - const janafThermo<equationOfState>& + const janafThermo<EquationOfState>&, + const janafThermo<EquationOfState>& ); -template<class equationOfState> -inline janafThermo<equationOfState> operator* +template<class EquationOfState> +inline janafThermo<EquationOfState> operator* ( const scalar, - const janafThermo<equationOfState>& + const janafThermo<EquationOfState>& ); -template<class equationOfState> -inline janafThermo<equationOfState> operator== +template<class EquationOfState> +inline janafThermo<EquationOfState> operator== ( - const janafThermo<equationOfState>&, - const janafThermo<equationOfState>& + const janafThermo<EquationOfState>&, + const janafThermo<EquationOfState>& ); -template<class equationOfState> +template<class EquationOfState> Ostream& operator<< ( Ostream&, - const janafThermo<equationOfState>& + const janafThermo<EquationOfState>& ); @@ -89,10 +89,10 @@ Ostream& operator<< Class janafThermo Declaration \*---------------------------------------------------------------------------*/ -template<class equationOfState> +template<class EquationOfState> class janafThermo : - public equationOfState + public EquationOfState { public: @@ -133,7 +133,7 @@ public: //- Construct from components inline janafThermo ( - const equationOfState& st, + const EquationOfState& st, const scalar Tlow, const scalar Thigh, const scalar Tcommon, @@ -185,25 +185,25 @@ public: // Friend operators - friend janafThermo operator+ <equationOfState> + friend janafThermo operator+ <EquationOfState> ( const janafThermo&, const janafThermo& ); - friend janafThermo operator- <equationOfState> + friend janafThermo operator- <EquationOfState> ( const janafThermo&, const janafThermo& ); - friend janafThermo operator* <equationOfState> + friend janafThermo operator* <EquationOfState> ( const scalar, const janafThermo& ); - friend janafThermo operator== <equationOfState> + friend janafThermo operator== <EquationOfState> ( const janafThermo&, const janafThermo& @@ -212,7 +212,7 @@ public: // Ostream Operator - friend Ostream& operator<< <equationOfState> + friend Ostream& operator<< <EquationOfState> ( Ostream&, const janafThermo& diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H index 1379a9d8adc..05f3a1b9812 100644 --- a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H +++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H @@ -28,18 +28,18 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template<class equationOfState> -inline Foam::janafThermo<equationOfState>::janafThermo +template<class EquationOfState> +inline Foam::janafThermo<EquationOfState>::janafThermo ( - const equationOfState& st, + const EquationOfState& st, const scalar Tlow, const scalar Thigh, const scalar Tcommon, - const typename janafThermo<equationOfState>::coeffArray& highCpCoeffs, - const typename janafThermo<equationOfState>::coeffArray& lowCpCoeffs + const typename janafThermo<EquationOfState>::coeffArray& highCpCoeffs, + const typename janafThermo<EquationOfState>::coeffArray& lowCpCoeffs ) : - equationOfState(st), + EquationOfState(st), Tlow_(Tlow), Thigh_(Thigh), Tcommon_(Tcommon) @@ -52,15 +52,15 @@ inline Foam::janafThermo<equationOfState>::janafThermo } -template<class equationOfState> -inline void Foam::janafThermo<equationOfState>::checkT(const scalar T) const +template<class EquationOfState> +inline void Foam::janafThermo<EquationOfState>::checkT(const scalar T) const { if (T < Tlow_ || T > Thigh_) { FatalErrorIn ( - "janafThermo<equationOfState>::checkT(const scalar T) const" - ) << "attempt to use janafThermo<equationOfState>" + "janafThermo<EquationOfState>::checkT(const scalar T) const" + ) << "attempt to use janafThermo<EquationOfState>" " out of temperature range " << Tlow_ << " -> " << Thigh_ << "; T = " << T << abort(FatalError); @@ -68,9 +68,9 @@ inline void Foam::janafThermo<equationOfState>::checkT(const scalar T) const } -template<class equationOfState> -inline const typename Foam::janafThermo<equationOfState>::coeffArray& -Foam::janafThermo<equationOfState>::coeffs +template<class EquationOfState> +inline const typename Foam::janafThermo<EquationOfState>::coeffArray& +Foam::janafThermo<EquationOfState>::coeffs ( const scalar T ) const @@ -90,14 +90,14 @@ Foam::janafThermo<equationOfState>::coeffs // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class equationOfState> -inline Foam::janafThermo<equationOfState>::janafThermo +template<class EquationOfState> +inline Foam::janafThermo<EquationOfState>::janafThermo ( const word& name, const janafThermo& jt ) : - equationOfState(name, jt), + EquationOfState(name, jt), Tlow_(jt.Tlow_), Thigh_(jt.Thigh_), Tcommon_(jt.Tcommon_) @@ -112,8 +112,8 @@ inline Foam::janafThermo<equationOfState>::janafThermo // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class equationOfState> -inline Foam::scalar Foam::janafThermo<equationOfState>::cp +template<class EquationOfState> +inline Foam::scalar Foam::janafThermo<EquationOfState>::cp ( const scalar T ) const @@ -123,8 +123,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::cp } -template<class equationOfState> -inline Foam::scalar Foam::janafThermo<equationOfState>::h +template<class EquationOfState> +inline Foam::scalar Foam::janafThermo<EquationOfState>::h ( const scalar T ) const @@ -138,8 +138,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::h } -template<class equationOfState> -inline Foam::scalar Foam::janafThermo<equationOfState>::hs +template<class EquationOfState> +inline Foam::scalar Foam::janafThermo<EquationOfState>::hs ( const scalar T ) const @@ -148,8 +148,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::hs } -template<class equationOfState> -inline Foam::scalar Foam::janafThermo<equationOfState>::hc() const +template<class EquationOfState> +inline Foam::scalar Foam::janafThermo<EquationOfState>::hc() const { const coeffArray& a = lowCpCoeffs_; const scalar Tstd = specie::Tstd; @@ -163,8 +163,8 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::hc() const } -template<class equationOfState> -inline Foam::scalar Foam::janafThermo<equationOfState>::s +template<class EquationOfState> +inline Foam::scalar Foam::janafThermo<EquationOfState>::s ( const scalar T ) const @@ -181,15 +181,15 @@ inline Foam::scalar Foam::janafThermo<equationOfState>::s // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template<class equationOfState> -inline void Foam::janafThermo<equationOfState>::operator+= +template<class EquationOfState> +inline void Foam::janafThermo<EquationOfState>::operator+= ( - const janafThermo<equationOfState>& jt + const janafThermo<EquationOfState>& jt ) { scalar molr1 = this->nMoles(); - equationOfState::operator+=(jt); + EquationOfState::operator+=(jt); molr1 /= this->nMoles(); scalar molr2 = jt.nMoles()/this->nMoles(); @@ -201,7 +201,7 @@ inline void Foam::janafThermo<equationOfState>::operator+= for ( register label coefLabel=0; - coefLabel<janafThermo<equationOfState>::nCoeffs_; + coefLabel<janafThermo<EquationOfState>::nCoeffs_; coefLabel++ ) { @@ -216,15 +216,15 @@ inline void Foam::janafThermo<equationOfState>::operator+= } -template<class equationOfState> -inline void Foam::janafThermo<equationOfState>::operator-= +template<class EquationOfState> +inline void Foam::janafThermo<EquationOfState>::operator-= ( - const janafThermo<equationOfState>& jt + const janafThermo<EquationOfState>& jt ) { scalar molr1 = this->nMoles(); - equationOfState::operator-=(jt); + EquationOfState::operator-=(jt); molr1 /= this->nMoles(); scalar molr2 = jt.nMoles()/this->nMoles(); @@ -236,7 +236,7 @@ inline void Foam::janafThermo<equationOfState>::operator-= for ( register label coefLabel=0; - coefLabel<janafThermo<equationOfState>::nCoeffs_; + coefLabel<janafThermo<EquationOfState>::nCoeffs_; coefLabel++ ) { @@ -253,26 +253,26 @@ inline void Foam::janafThermo<equationOfState>::operator-= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template<class equationOfState> -inline Foam::janafThermo<equationOfState> Foam::operator+ +template<class EquationOfState> +inline Foam::janafThermo<EquationOfState> Foam::operator+ ( - const janafThermo<equationOfState>& jt1, - const janafThermo<equationOfState>& jt2 + const janafThermo<EquationOfState>& jt1, + const janafThermo<EquationOfState>& jt2 ) { - equationOfState eofs = jt1; + EquationOfState eofs = jt1; eofs += jt2; scalar molr1 = jt1.nMoles()/eofs.nMoles(); scalar molr2 = jt2.nMoles()/eofs.nMoles(); - typename janafThermo<equationOfState>::coeffArray highCpCoeffs; - typename janafThermo<equationOfState>::coeffArray lowCpCoeffs; + typename janafThermo<EquationOfState>::coeffArray highCpCoeffs; + typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs; for ( register label coefLabel=0; - coefLabel<janafThermo<equationOfState>::nCoeffs_; + coefLabel<janafThermo<EquationOfState>::nCoeffs_; coefLabel++ ) { @@ -285,7 +285,7 @@ inline Foam::janafThermo<equationOfState> Foam::operator+ + molr2*jt2.lowCpCoeffs_[coefLabel]; } - return janafThermo<equationOfState> + return janafThermo<EquationOfState> ( eofs, max(jt1.Tlow_, jt2.Tlow_), @@ -297,26 +297,26 @@ inline Foam::janafThermo<equationOfState> Foam::operator+ } -template<class equationOfState> -inline Foam::janafThermo<equationOfState> Foam::operator- +template<class EquationOfState> +inline Foam::janafThermo<EquationOfState> Foam::operator- ( - const janafThermo<equationOfState>& jt1, - const janafThermo<equationOfState>& jt2 + const janafThermo<EquationOfState>& jt1, + const janafThermo<EquationOfState>& jt2 ) { - equationOfState eofs = jt1; + EquationOfState eofs = jt1; eofs -= jt2; scalar molr1 = jt1.nMoles()/eofs.nMoles(); scalar molr2 = jt2.nMoles()/eofs.nMoles(); - typename janafThermo<equationOfState>::coeffArray highCpCoeffs; - typename janafThermo<equationOfState>::coeffArray lowCpCoeffs; + typename janafThermo<EquationOfState>::coeffArray highCpCoeffs; + typename janafThermo<EquationOfState>::coeffArray lowCpCoeffs; for ( register label coefLabel=0; - coefLabel<janafThermo<equationOfState>::nCoeffs_; + coefLabel<janafThermo<EquationOfState>::nCoeffs_; coefLabel++ ) { @@ -329,7 +329,7 @@ inline Foam::janafThermo<equationOfState> Foam::operator- - molr2*jt2.lowCpCoeffs_[coefLabel]; } - return janafThermo<equationOfState> + return janafThermo<EquationOfState> ( eofs, max(jt1.Tlow_, jt2.Tlow_), @@ -341,16 +341,16 @@ inline Foam::janafThermo<equationOfState> Foam::operator- } -template<class equationOfState> -inline Foam::janafThermo<equationOfState> Foam::operator* +template<class EquationOfState> +inline Foam::janafThermo<EquationOfState> Foam::operator* ( const scalar s, - const janafThermo<equationOfState>& jt + const janafThermo<EquationOfState>& jt ) { - return janafThermo<equationOfState> + return janafThermo<EquationOfState> ( - s*static_cast<const equationOfState&>(jt), + s*static_cast<const EquationOfState&>(jt), jt.Tlow_, jt.Thigh_, jt.Tcommon_, @@ -360,11 +360,11 @@ inline Foam::janafThermo<equationOfState> Foam::operator* } -template<class equationOfState> -inline Foam::janafThermo<equationOfState> Foam::operator== +template<class EquationOfState> +inline Foam::janafThermo<EquationOfState> Foam::operator== ( - const janafThermo<equationOfState>& jt1, - const janafThermo<equationOfState>& jt2 + const janafThermo<EquationOfState>& jt1, + const janafThermo<EquationOfState>& jt2 ) { return jt2 - jt1; diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C index 857402c95e0..1caf28c185c 100644 --- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C +++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C @@ -28,48 +28,48 @@ License /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */ -template<class thermo> -const Foam::scalar Foam::specieThermo<thermo>::tol_ = 1.0e-4; +template<class Thermo> +const Foam::scalar Foam::specieThermo<Thermo>::tol_ = 1.0e-4; -template<class thermo> -const int Foam::specieThermo<thermo>::maxIter_ = 100; +template<class Thermo> +const int Foam::specieThermo<Thermo>::maxIter_ = 100; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class thermo> -Foam::specieThermo<thermo>::specieThermo(Istream& is) +template<class Thermo> +Foam::specieThermo<Thermo>::specieThermo(Istream& is) : - thermo(is) + Thermo(is) { - is.check("specieThermo::specieThermo(Istream& is)"); + is.check("specieThermo<Thermo>::specieThermo(Istream&)"); } -template<class thermo> -Foam::specieThermo<thermo>::specieThermo(const dictionary& dict) +template<class Thermo> +Foam::specieThermo<Thermo>::specieThermo(const dictionary& dict) : - thermo(dict) + Thermo(dict) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class thermo> -void Foam::specieThermo<thermo>::write(Ostream& os) const +template<class Thermo> +void Foam::specieThermo<Thermo>::write(Ostream& os) const { - thermo::write(os); + Thermo::write(os); } // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -template<class thermo> -Foam::Ostream& Foam::operator<<(Ostream& os, const specieThermo<thermo>& st) +template<class Thermo> +Foam::Ostream& Foam::operator<<(Ostream& os, const specieThermo<Thermo>& st) { - os << static_cast<const thermo&>(st); + os << static_cast<const Thermo&>(st); - os.check("Ostream& operator<<(Ostream& os, const specieThermo& st)"); + os.check("Ostream& operator<<(Ostream&, const specieThermo&)"); return os; } diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H index 231bf4586b2..26959d8f06c 100644 --- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H +++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.H @@ -45,41 +45,41 @@ namespace Foam // Forward declaration of friend functions and operators -template<class thermo> class specieThermo; +template<class Thermo> class specieThermo; -template<class thermo> -inline specieThermo<thermo> operator+ +template<class Thermo> +inline specieThermo<Thermo> operator+ ( - const specieThermo<thermo>&, - const specieThermo<thermo>& + const specieThermo<Thermo>&, + const specieThermo<Thermo>& ); -template<class thermo> -inline specieThermo<thermo> operator- +template<class Thermo> +inline specieThermo<Thermo> operator- ( - const specieThermo<thermo>&, - const specieThermo<thermo>& + const specieThermo<Thermo>&, + const specieThermo<Thermo>& ); -template<class thermo> -inline specieThermo<thermo> operator* +template<class Thermo> +inline specieThermo<Thermo> operator* ( const scalar, - const specieThermo<thermo>& + const specieThermo<Thermo>& ); -template<class thermo> -inline specieThermo<thermo> operator== +template<class Thermo> +inline specieThermo<Thermo> operator== ( - const specieThermo<thermo>&, - const specieThermo<thermo>& + const specieThermo<Thermo>&, + const specieThermo<Thermo>& ); -template<class thermo> +template<class Thermo> Ostream& operator<< ( Ostream&, - const specieThermo<thermo>& + const specieThermo<Thermo>& ); @@ -87,10 +87,10 @@ Ostream& operator<< Class specieThermo Declaration \*---------------------------------------------------------------------------*/ -template<class thermo> +template<class Thermo> class specieThermo : - public thermo + public Thermo { // Private data @@ -119,7 +119,7 @@ public: // Constructors //- construct from components - inline specieThermo(const thermo& sp); + inline specieThermo(const Thermo& sp); //- Construct from Istream specieThermo(Istream&); @@ -267,25 +267,25 @@ public: // Friend operators - friend specieThermo operator+ <thermo> + friend specieThermo operator+ <Thermo> ( const specieThermo&, const specieThermo& ); - friend specieThermo operator- <thermo> + friend specieThermo operator- <Thermo> ( const specieThermo&, const specieThermo& ); - friend specieThermo operator* <thermo> + friend specieThermo operator* <Thermo> ( const scalar s, const specieThermo& ); - friend specieThermo operator== <thermo> + friend specieThermo operator== <Thermo> ( const specieThermo&, const specieThermo& @@ -294,7 +294,7 @@ public: // Ostream Operator - friend Ostream& operator<< <thermo> + friend Ostream& operator<< <Thermo> ( Ostream&, const specieThermo& diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H index 402103f38cb..c729cbc42ec 100644 --- a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H +++ b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H @@ -27,23 +27,23 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template<class thermo> -inline Foam::specieThermo<thermo>::specieThermo +template<class Thermo> +inline Foam::specieThermo<Thermo>::specieThermo ( - const thermo& sp + const Thermo& sp ) : - thermo(sp) + Thermo(sp) {} -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::T +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::T ( scalar f, scalar T0, - scalar (specieThermo<thermo>::*F)(const scalar) const, - scalar (specieThermo<thermo>::*dFdT)(const scalar) const + scalar (specieThermo<Thermo>::*F)(const scalar) const, + scalar (specieThermo<Thermo>::*dFdT)(const scalar) const ) const { scalar Test = T0; @@ -60,9 +60,9 @@ inline Foam::scalar Foam::specieThermo<thermo>::T { FatalErrorIn ( - "specieThermo<thermo>::T(scalar f, scalar T0, " - "scalar (specieThermo<thermo>::*F)(const scalar) const, " - "scalar (specieThermo<thermo>::*dFdT)(const scalar) const" + "specieThermo<Thermo>::T(scalar f, scalar T0, " + "scalar (specieThermo<Thermo>::*F)(const scalar) const, " + "scalar (specieThermo<Thermo>::*dFdT)(const scalar) const" ") const" ) << "Maximum number of iterations exceeded" << abort(FatalError); @@ -76,127 +76,127 @@ inline Foam::scalar Foam::specieThermo<thermo>::T // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class thermo> -inline Foam::specieThermo<thermo>::specieThermo +template<class Thermo> +inline Foam::specieThermo<Thermo>::specieThermo ( const word& name, const specieThermo& st ) : - thermo(name, st) + Thermo(name, st) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::cv(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::cv(const scalar T) const { return this->cp(T) - this->RR; } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::gamma(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::gamma(const scalar T) const { scalar CP = this->cp(T); return CP/(CP - this->RR); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::e(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::e(const scalar T) const { return this->h(T) - this->RR*(T - this->Tstd); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::es(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::es(const scalar T) const { return this->hs(T) - this->RR*(T - this->Tstd); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::g(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::g(const scalar T) const { return this->h(T) - T*this->s(T); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::a(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::a(const scalar T) const { return this->e(T) - T*this->s(T); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Cp(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Cp(const scalar T) const { return this->cp(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Cv(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Cv(const scalar T) const { return this->cv(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::H(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::H(const scalar T) const { return this->h(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Hs(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Hs(const scalar T) const { return this->hs(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Hc() const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Hc() const { return this->hc()/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::S(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::S(const scalar T) const { return this->s(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::E(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::E(const scalar T) const { return this->e(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::G(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::G(const scalar T) const { return this->g(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::A(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::A(const scalar T) const { return this->a(T)/this->W(); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::K(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::K(const scalar T) const { scalar arg = -this->nMoles()*this->g(T)/(this->RR*T); @@ -211,15 +211,15 @@ inline Foam::scalar Foam::specieThermo<thermo>::K(const scalar T) const } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Kp(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Kp(const scalar T) const { return K(T); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Kc(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Kc(const scalar T) const { if (equal(this->nMoles(), SMALL)) { @@ -232,8 +232,8 @@ inline Foam::scalar Foam::specieThermo<thermo>::Kc(const scalar T) const } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Kx +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Kx ( const scalar T, const scalar p @@ -250,8 +250,8 @@ inline Foam::scalar Foam::specieThermo<thermo>::Kx } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::Kn +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::Kn ( const scalar T, const scalar p, @@ -269,117 +269,117 @@ inline Foam::scalar Foam::specieThermo<thermo>::Kn } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::TH +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::TH ( const scalar h, const scalar T0 ) const { - return T(h, T0, &specieThermo<thermo>::H, &specieThermo<thermo>::Cp); + return T(h, T0, &specieThermo<Thermo>::H, &specieThermo<Thermo>::Cp); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::THs +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::THs ( const scalar hs, const scalar T0 ) const { - return T(hs, T0, &specieThermo<thermo>::Hs, &specieThermo<thermo>::Cp); + return T(hs, T0, &specieThermo<Thermo>::Hs, &specieThermo<Thermo>::Cp); } -template<class thermo> -inline Foam::scalar Foam::specieThermo<thermo>::TE +template<class Thermo> +inline Foam::scalar Foam::specieThermo<Thermo>::TE ( const scalar e, const scalar T0 ) const { - return T(e, T0, &specieThermo<thermo>::E, &specieThermo<thermo>::Cv); + return T(e, T0, &specieThermo<Thermo>::E, &specieThermo<Thermo>::Cv); } // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template<class thermo> -inline void Foam::specieThermo<thermo>::operator+= +template<class Thermo> +inline void Foam::specieThermo<Thermo>::operator+= ( - const specieThermo<thermo>& st + const specieThermo<Thermo>& st ) { - thermo::operator+=(st); + Thermo::operator+=(st); } -template<class thermo> -inline void Foam::specieThermo<thermo>::operator-= +template<class Thermo> +inline void Foam::specieThermo<Thermo>::operator-= ( - const specieThermo<thermo>& st + const specieThermo<Thermo>& st ) { - thermo::operator-=(st); + Thermo::operator-=(st); } -template<class thermo> -inline void Foam::specieThermo<thermo>::operator*=(const scalar s) +template<class Thermo> +inline void Foam::specieThermo<Thermo>::operator*=(const scalar s) { - thermo::operator*=(s); + Thermo::operator*=(s); } // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template<class thermo> -inline Foam::specieThermo<thermo> Foam::operator+ +template<class Thermo> +inline Foam::specieThermo<Thermo> Foam::operator+ ( - const specieThermo<thermo>& st1, - const specieThermo<thermo>& st2 + const specieThermo<Thermo>& st1, + const specieThermo<Thermo>& st2 ) { - return specieThermo<thermo> + return specieThermo<Thermo> ( - static_cast<const thermo&>(st1) + static_cast<const thermo&>(st2) + static_cast<const Thermo&>(st1) + static_cast<const Thermo&>(st2) ); } -template<class thermo> -inline Foam::specieThermo<thermo> Foam::operator- +template<class Thermo> +inline Foam::specieThermo<Thermo> Foam::operator- ( - const specieThermo<thermo>& st1, - const specieThermo<thermo>& st2 + const specieThermo<Thermo>& st1, + const specieThermo<Thermo>& st2 ) { - return specieThermo<thermo> + return specieThermo<Thermo> ( - static_cast<const thermo&>(st1) - static_cast<const thermo&>(st2) + static_cast<const Thermo&>(st1) - static_cast<const Thermo&>(st2) ); } -template<class thermo> -inline Foam::specieThermo<thermo> Foam::operator* +template<class Thermo> +inline Foam::specieThermo<Thermo> Foam::operator* ( const scalar s, - const specieThermo<thermo>& st + const specieThermo<Thermo>& st ) { - return specieThermo<thermo> + return specieThermo<Thermo> ( - s*static_cast<const thermo&>(st) + s*static_cast<const Thermo&>(st) ); } -template<class thermo> -inline Foam::specieThermo<thermo> Foam::operator== +template<class Thermo> +inline Foam::specieThermo<Thermo> Foam::operator== ( - const specieThermo<thermo>& st1, - const specieThermo<thermo>& st2 + const specieThermo<Thermo>& st1, + const specieThermo<Thermo>& st2 ) { return st2 - st1; diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C index 8c16529dafa..ca7efe753bf 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransport.C +++ b/src/thermophysicalModels/specie/transport/const/constTransport.C @@ -26,63 +26,54 @@ License #include "constTransport.H" #include "IOstreams.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class thermo> -constTransport<thermo>::constTransport(Istream& is) +template<class Thermo> +Foam::constTransport<Thermo>::constTransport(Istream& is) : - thermo(is), - Mu_(readScalar(is)), + Thermo(is), + mu_(readScalar(is)), rPr_(1.0/readScalar(is)) { is.check("constTransport::constTransport(Istream& is)"); } -template<class thermo> -constTransport<thermo>::constTransport(const dictionary& dict) +template<class Thermo> +Foam::constTransport<Thermo>::constTransport(const dictionary& dict) : - thermo(dict), - Mu_(readScalar(dict.lookup("Mu"))), + Thermo(dict), + mu_(readScalar(dict.lookup("mu"))), rPr_(1.0/readScalar(dict.lookup("Pr"))) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class thermo> -void constTransport<thermo>::constTransport::write(Ostream& os) const +template<class Thermo> +void Foam::constTransport<Thermo>::constTransport::write(Ostream& os) const { os << this->name() << endl; os << token::BEGIN_BLOCK << incrIndent << nl; - thermo::write(os); - os.writeKeyword("Mu") << Mu_ << token::END_STATEMENT << nl; - os.writeKeyword("Pr") << Mu_ << token::END_STATEMENT << nl; + Thermo::write(os); + os.writeKeyword("mu") << mu_ << token::END_STATEMENT << nl; + os.writeKeyword("Pr") << 1.0/rPr_ << token::END_STATEMENT << nl; os << decrIndent << token::END_BLOCK << nl; } // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -template<class thermo> -Ostream& operator<<(Ostream& os, const constTransport<thermo>& ct) +template<class Thermo> +Foam::Ostream& Foam::operator<<(Ostream& os, const constTransport<Thermo>& ct) { - operator<<(os, static_cast<const thermo&>(ct)); - os << tab << ct.Mu_ << tab << 1.0/ct.rPr_; + operator<<(os, static_cast<const Thermo&>(ct)); + os << tab << ct.mu_ << tab << 1.0/ct.rPr_; - os.check("Ostream& operator<<(Ostream& os, const constTransport& ct)"); + os.check("Ostream& operator<<(Ostream&, const constTransport&)"); return os; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.H b/src/thermophysicalModels/specie/transport/const/constTransport.H index 309e4b0dfde..04241660315 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransport.H +++ b/src/thermophysicalModels/specie/transport/const/constTransport.H @@ -45,41 +45,41 @@ namespace Foam // Forward declaration of friend functions and operators -template<class thermo> class constTransport; +template<class Thermo> class constTransport; -template<class thermo> -inline constTransport<thermo> operator+ +template<class Thermo> +inline constTransport<Thermo> operator+ ( - const constTransport<thermo>&, - const constTransport<thermo>& + const constTransport<Thermo>&, + const constTransport<Thermo>& ); -template<class thermo> -inline constTransport<thermo> operator- +template<class Thermo> +inline constTransport<Thermo> operator- ( - const constTransport<thermo>&, - const constTransport<thermo>& + const constTransport<Thermo>&, + const constTransport<Thermo>& ); -template<class thermo> -inline constTransport<thermo> operator* +template<class Thermo> +inline constTransport<Thermo> operator* ( const scalar, - const constTransport<thermo>& + const constTransport<Thermo>& ); -template<class thermo> -inline constTransport<thermo> operator== +template<class Thermo> +inline constTransport<Thermo> operator== ( - const constTransport<thermo>&, - const constTransport<thermo>& + const constTransport<Thermo>&, + const constTransport<Thermo>& ); -template<class thermo> +template<class Thermo> Ostream& operator<< ( Ostream&, - const constTransport<thermo>& + const constTransport<Thermo>& ); @@ -87,15 +87,15 @@ Ostream& operator<< Class constTransport Declaration \*---------------------------------------------------------------------------*/ -template<class thermo> +template<class Thermo> class constTransport : - public thermo + public Thermo { // Private data - //- Constant viscosity [Pa.s] - scalar Mu_; + //- Constant dynamic viscosity [Pa.s] + scalar mu_; //- Reciprocal Prandtl Number [] scalar rPr_; @@ -106,8 +106,8 @@ class constTransport //- Construct from components inline constTransport ( - const thermo& t, - const scalar nu, + const Thermo& t, + const scalar mu, const scalar Pr ); @@ -154,25 +154,25 @@ public: // Friend operators - friend constTransport operator+ <thermo> + friend constTransport operator+ <Thermo> ( const constTransport&, const constTransport& ); - friend constTransport operator- <thermo> + friend constTransport operator- <Thermo> ( const constTransport&, const constTransport& ); - friend constTransport operator* <thermo> + friend constTransport operator* <Thermo> ( const scalar, const constTransport& ); - friend constTransport operator== <thermo> + friend constTransport operator== <Thermo> ( const constTransport&, const constTransport& @@ -181,7 +181,7 @@ public: // Ostream Operator - friend Ostream& operator<< <thermo> + friend Ostream& operator<< <Thermo> ( Ostream&, const constTransport& diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H index 37fa5b311b4..c187a11b4b8 100644 --- a/src/thermophysicalModels/specie/transport/const/constTransportI.H +++ b/src/thermophysicalModels/specie/transport/const/constTransportI.H @@ -23,58 +23,53 @@ License \*---------------------------------------------------------------------------*/ -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class thermo> -inline constTransport<thermo>::constTransport +template<class Thermo> +inline Foam::constTransport<Thermo>::constTransport ( - const thermo& t, + const Thermo& t, const scalar mu, const scalar Pr ) : - thermo(t), - Mu_(mu), + Thermo(t), + mu_(mu), rPr_(1.0/Pr) {} -template<class thermo> -inline constTransport<thermo>::constTransport +template<class Thermo> +inline Foam::constTransport<Thermo>::constTransport ( const word& name, const constTransport& ct ) : - thermo(name, ct), - Mu_(ct.Mu_), + Thermo(name, ct), + mu_(ct.mu_), rPr_(ct.rPr_) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class thermo> -inline scalar constTransport<thermo>::mu(const scalar) const +template<class Thermo> +inline Foam::scalar Foam::constTransport<Thermo>::mu(const scalar) const { - return Mu_; + return mu_; } -template<class thermo> -inline scalar constTransport<thermo>::kappa(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::constTransport<Thermo>::kappa(const scalar T) const { return this->Cp(T)*mu(T)*rPr_; } -template<class thermo> -inline scalar constTransport<thermo>::alpha(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::constTransport<Thermo>::alpha(const scalar T) const { scalar Cp_ = this->Cp(T); @@ -88,15 +83,15 @@ inline scalar constTransport<thermo>::alpha(const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template<class thermo> -inline constTransport<thermo>& constTransport<thermo>::operator= +template<class Thermo> +inline Foam::constTransport<Thermo>& Foam::constTransport<Thermo>::operator= ( - const constTransport<thermo>& ct + const constTransport<Thermo>& ct ) { - thermo::operator=(ct); + Thermo::operator=(ct); - Mu_ = ct.Mu_; + mu_ = ct.mu_; rPr_ = ct.rPr_; return *this; @@ -105,83 +100,79 @@ inline constTransport<thermo>& constTransport<thermo>::operator= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template<class thermo> -inline constTransport<thermo> operator+ +template<class Thermo> +inline Foam::constTransport<Thermo> Foam::operator+ ( - const constTransport<thermo>& ct1, - const constTransport<thermo>& ct2 + const constTransport<Thermo>& ct1, + const constTransport<Thermo>& ct2 ) { - thermo t + Thermo t ( - static_cast<const thermo&>(ct1) + static_cast<const thermo&>(ct2) + static_cast<const Thermo&>(ct1) + static_cast<const Thermo&>(ct2) ); scalar molr1 = ct1.nMoles()/t.nMoles(); scalar molr2 = ct2.nMoles()/t.nMoles(); - return constTransport<thermo> + return constTransport<Thermo> ( t, - molr1*ct1.Mu_ + molr2*ct2.Mu_, + molr1*ct1.mu_ + molr2*ct2.mu_, molr1*ct1.rPr_ + molr2*ct2.rPr_ ); } -template<class thermo> -inline constTransport<thermo> operator- +template<class Thermo> +inline Foam::constTransport<Thermo> Foam::operator- ( - const constTransport<thermo>& ct1, - const constTransport<thermo>& ct2 + const constTransport<Thermo>& ct1, + const constTransport<Thermo>& ct2 ) { - thermo t + Thermo t ( - static_cast<const thermo&>(ct1) - static_cast<const thermo&>(ct2) + static_cast<const Thermo&>(ct1) - static_cast<const Thermo&>(ct2) ); scalar molr1 = ct1.nMoles()/t.nMoles(); scalar molr2 = ct2.nMoles()/t.nMoles(); - return constTransport<thermo> + return constTransport<Thermo> ( t, - molr1*ct1.Mu_ - molr2*ct2.Mu_, + molr1*ct1.mu_ - molr2*ct2.mu_, molr1*ct1.rPr_ - molr2*ct2.rPr_ ); } -template<class thermo> -inline constTransport<thermo> operator* +template<class Thermo> +inline Foam::constTransport<Thermo> Foam::operator* ( const scalar s, - const constTransport<thermo>& ct + const constTransport<Thermo>& ct ) { - return constTransport<thermo> + return constTransport<Thermo> ( - s*static_cast<const thermo&>(ct), - ct.Mu_, + s*static_cast<const Thermo&>(ct), + ct.mu_, ct.rPr_ ); } -template<class thermo> -inline constTransport<thermo> operator== +template<class Thermo> +inline Foam::constTransport<Thermo> Foam::operator== ( - const constTransport<thermo>& ct1, - const constTransport<thermo>& ct2 + const constTransport<Thermo>& ct1, + const constTransport<Thermo>& ct2 ) { return ct2 - ct1; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C index cd8c900581f..69ab41db97c 100644 --- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C +++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransport.C @@ -29,14 +29,9 @@ License #include "speciesTransport.H" #include "IOstreams.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -speciesTransport::speciesTransport(Istream& is) +Foam::speciesTransport::speciesTransport(Istream& is) : janafThermo(is) { @@ -44,7 +39,7 @@ speciesTransport::speciesTransport(Istream& is) } -speciesTransport::speciesTransport(const dictionary& dict) +Foam::speciesTransport::speciesTransport(const dictionary& dict) : janafThermo(dict) {} @@ -52,7 +47,7 @@ speciesTransport::speciesTransport(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void speciesTransport::write(Ostream& os) const +void Foam::speciesTransport::write(Ostream& os) const { os << this->name() << endl; os << token::BEGIN_BLOCK << incrIndent << nl; @@ -63,18 +58,14 @@ void speciesTransport::write(Ostream& os) const // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -Ostream& operator<<(Ostream& os, const speciesTransport& sTranport) +Foam::Ostream& Foam::operator<<(Ostream& os, const speciesTransport& sTranport) { os << (const janafThermo&)sTranport; - os.check("Ostream& operator<<(Ostream& os, const speciesTransport& st)"); + os.check("Ostream& operator<<(Ostream&, const speciesTransport)"); return os; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H index e3ac8f21895..a58c73de249 100644 --- a/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H +++ b/src/thermophysicalModels/specie/transport/speciesTransport/speciesTransportI.H @@ -23,25 +23,12 @@ License \*---------------------------------------------------------------------------*/ -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -// Construct from speciesThermo -inline speciesTransport::speciesTransport -( - const janafThermo& sThermo -) +inline Foam::speciesTransport::speciesTransport(const janafThermo& sThermo) : janafThermo(sThermo) {} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C index f90f6f30f67..d210cab1d06 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.C @@ -26,28 +26,23 @@ License #include "sutherlandTransport.H" #include "IOstreams.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class thermo> -sutherlandTransport<thermo>::sutherlandTransport(Istream& is) +template<class Thermo> +Foam::sutherlandTransport<Thermo>::sutherlandTransport(Istream& is) : - thermo(is), + Thermo(is), As_(readScalar(is)), Ts_(readScalar(is)) { - is.check("sutherlandTransport<thermo>::sutherlandTransport(Istream&)"); + is.check("sutherlandTransport<Thermo>::sutherlandTransport(Istream&)"); } -template<class thermo> -sutherlandTransport<thermo>::sutherlandTransport(const dictionary& dict) +template<class Thermo> +Foam::sutherlandTransport<Thermo>::sutherlandTransport(const dictionary& dict) : - thermo(dict), + Thermo(dict), As_(readScalar(dict.lookup("As"))), Ts_(readScalar(dict.lookup("Ts"))) {} @@ -55,35 +50,34 @@ sutherlandTransport<thermo>::sutherlandTransport(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template<class thermo> -void sutherlandTransport<thermo>::write(Ostream& os) const +template<class Thermo> +void Foam::sutherlandTransport<Thermo>::write(Ostream& os) const { os << this->name() << endl; os << token::BEGIN_BLOCK << incrIndent << nl; - thermo::write(os); + Thermo::write(os); os.writeKeyword("As") << As_ << token::END_STATEMENT << nl; - os.writeKeyword("Ts") << As_ << token::END_STATEMENT << nl; + os.writeKeyword("Ts") << Ts_ << token::END_STATEMENT << nl; os << decrIndent << token::END_BLOCK << nl; } // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -template<class thermo> -Ostream& operator<<(Ostream& os, const sutherlandTransport<thermo>& st) +template<class Thermo> +Foam::Ostream& Foam::operator<< +( + Ostream& os, const sutherlandTransport<Thermo>& st +) { - os << static_cast<const thermo&>(st) << tab << st.As_ << tab << st.Ts_; + os << static_cast<const Thermo&>(st) << tab << st.As_ << tab << st.Ts_; os.check ( - "Ostream& operator<<(Ostream&, const sutherlandTransport<thermo>&)" + "Ostream& operator<<(Ostream&, const sutherlandTransport<Thermo>&)" ); return os; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H index f3117b003f5..80cc3ff5d44 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H @@ -51,52 +51,52 @@ namespace Foam // Forward declaration of friend functions and operators -template<class thermo> class sutherlandTransport; +template<class Thermo> class sutherlandTransport; -template<class thermo> -inline sutherlandTransport<thermo> operator+ +template<class Thermo> +inline sutherlandTransport<Thermo> operator+ ( - const sutherlandTransport<thermo>&, - const sutherlandTransport<thermo>& + const sutherlandTransport<Thermo>&, + const sutherlandTransport<Thermo>& ); -template<class thermo> -inline sutherlandTransport<thermo> operator- +template<class Thermo> +inline sutherlandTransport<Thermo> operator- ( - const sutherlandTransport<thermo>&, - const sutherlandTransport<thermo>& + const sutherlandTransport<Thermo>&, + const sutherlandTransport<Thermo>& ); -template<class thermo> -inline sutherlandTransport<thermo> operator* +template<class Thermo> +inline sutherlandTransport<Thermo> operator* ( const scalar, - const sutherlandTransport<thermo>& + const sutherlandTransport<Thermo>& ); -template<class thermo> -inline sutherlandTransport<thermo> operator== +template<class Thermo> +inline sutherlandTransport<Thermo> operator== ( - const sutherlandTransport<thermo>&, - const sutherlandTransport<thermo>& + const sutherlandTransport<Thermo>&, + const sutherlandTransport<Thermo>& ); -template<class thermo> +template<class Thermo> Ostream& operator<< ( Ostream&, - const sutherlandTransport<thermo>& + const sutherlandTransport<Thermo>& ); /*---------------------------------------------------------------------------*\ - Class sutherlandTransport Declaration + Class sutherlandTransport Declaration \*---------------------------------------------------------------------------*/ -template<class thermo> +template<class Thermo> class sutherlandTransport : - public thermo + public Thermo { // Private data @@ -122,15 +122,15 @@ public: //- Construct from components inline sutherlandTransport ( - const thermo& t, - const scalar as, - const scalar ts + const Thermo& t, + const scalar As, + const scalar Ts ); //- Construct from two viscosities inline sutherlandTransport ( - const thermo& t, + const Thermo& t, const scalar mu1, const scalar T1, const scalar mu2, const scalar T2 ); @@ -182,25 +182,25 @@ public: // Friend operators - friend sutherlandTransport operator+ <thermo> + friend sutherlandTransport operator+ <Thermo> ( const sutherlandTransport&, const sutherlandTransport& ); - friend sutherlandTransport operator- <thermo> + friend sutherlandTransport operator- <Thermo> ( const sutherlandTransport&, const sutherlandTransport& ); - friend sutherlandTransport operator* <thermo> + friend sutherlandTransport operator* <Thermo> ( const scalar, const sutherlandTransport& ); - friend sutherlandTransport operator== <thermo> + friend sutherlandTransport operator== <Thermo> ( const sutherlandTransport&, const sutherlandTransport& @@ -209,7 +209,7 @@ public: // Ostream Operator - friend Ostream& operator<< <thermo> + friend Ostream& operator<< <Thermo> ( Ostream&, const sutherlandTransport& diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H index a99d724b089..3320a8ae3aa 100644 --- a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H +++ b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H @@ -25,15 +25,10 @@ License #include "specie.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template<class thermo> -inline void sutherlandTransport<thermo>::calcCoeffs +template<class Thermo> +inline void Foam::sutherlandTransport<Thermo>::calcCoeffs ( const scalar mu1, const scalar T1, const scalar mu2, const scalar T2 @@ -51,104 +46,111 @@ inline void sutherlandTransport<thermo>::calcCoeffs // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template<class thermo> -inline sutherlandTransport<thermo>::sutherlandTransport +template<class Thermo> +inline Foam::sutherlandTransport<Thermo>::sutherlandTransport ( - const thermo& t, - const scalar as, - const scalar ts + const Thermo& t, + const scalar As, + const scalar Ts ) : - thermo(t), - As_(as), - Ts_(ts) + Thermo(t), + As_(As), + Ts_(Ts) {} -template<class thermo> -inline sutherlandTransport<thermo>::sutherlandTransport +template<class Thermo> +inline Foam::sutherlandTransport<Thermo>::sutherlandTransport ( - const thermo& t, + const Thermo& t, const scalar mu1, const scalar T1, const scalar mu2, const scalar T2 ) : - thermo(t) + Thermo(t) { calcCoeffs(mu1, T1, mu2, T2); } -template<class thermo> -inline sutherlandTransport<thermo>::sutherlandTransport +template<class Thermo> +inline Foam::sutherlandTransport<Thermo>::sutherlandTransport ( const word& name, const sutherlandTransport& st ) : - thermo(name, st), + Thermo(name, st), As_(st.As_), Ts_(st.Ts_) {} -template<class thermo> -inline autoPtr<sutherlandTransport<thermo> > sutherlandTransport<thermo>::clone -() const +template<class Thermo> +inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> > +Foam::sutherlandTransport<Thermo>::clone() const { - return autoPtr<sutherlandTransport<thermo> > + return autoPtr<sutherlandTransport<Thermo> > ( - new sutherlandTransport<thermo>(*this) + new sutherlandTransport<Thermo>(*this) ); } -template<class thermo> -inline autoPtr<sutherlandTransport<thermo> > sutherlandTransport<thermo>::New +template<class Thermo> +inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> > +Foam::sutherlandTransport<Thermo>::New ( Istream& is ) { - return autoPtr<sutherlandTransport<thermo> > + return autoPtr<sutherlandTransport<Thermo> > ( - new sutherlandTransport<thermo>(is) + new sutherlandTransport<Thermo>(is) ); } -template<class thermo> -inline autoPtr<sutherlandTransport<thermo> > sutherlandTransport<thermo>::New +template<class Thermo> +inline Foam::autoPtr<Foam::sutherlandTransport<Thermo> > +Foam::sutherlandTransport<Thermo>::New ( const dictionary& dict ) { - return autoPtr<sutherlandTransport<thermo> > + return autoPtr<sutherlandTransport<Thermo> > ( - new sutherlandTransport<thermo>(dict) + new sutherlandTransport<Thermo>(dict) ); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Dynamic viscosity [kg/ms] -template<class thermo> -inline scalar sutherlandTransport<thermo>::mu(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::sutherlandTransport<Thermo>::mu(const scalar T) const { return As_*::sqrt(T)/(1.0 + Ts_/T); } -template<class thermo> -inline scalar sutherlandTransport<thermo>::kappa(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::sutherlandTransport<Thermo>::kappa +( + const scalar T +) const { scalar Cv_ = this->Cv(T); return mu(T)*Cv_*(1.32 + 1.77*this->R()/Cv_); } -template<class thermo> -inline scalar sutherlandTransport<thermo>::alpha(const scalar T) const +template<class Thermo> +inline Foam::scalar Foam::sutherlandTransport<Thermo>::alpha +( + const scalar T +) const { scalar Cv_ = this->Cv(T); scalar R_ = this->R(); @@ -164,13 +166,14 @@ inline scalar sutherlandTransport<thermo>::alpha(const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template<class thermo> -inline sutherlandTransport<thermo>& sutherlandTransport<thermo>::operator= +template<class Thermo> +inline Foam::sutherlandTransport<Thermo>& +Foam::sutherlandTransport<Thermo>::operator= ( - const sutherlandTransport<thermo>& st + const sutherlandTransport<Thermo>& st ) { - thermo::operator=(st); + Thermo::operator=(st); As_ = st.As_; Ts_ = st.Ts_; @@ -181,22 +184,22 @@ inline sutherlandTransport<thermo>& sutherlandTransport<thermo>::operator= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template<class thermo> -inline sutherlandTransport<thermo> operator+ +template<class Thermo> +inline Foam::sutherlandTransport<Thermo> Foam::operator+ ( - const sutherlandTransport<thermo>& st1, - const sutherlandTransport<thermo>& st2 + const sutherlandTransport<Thermo>& st1, + const sutherlandTransport<Thermo>& st2 ) { - thermo t + Thermo t ( - static_cast<const thermo&>(st1) + static_cast<const thermo&>(st2) + static_cast<const Thermo&>(st1) + static_cast<const Thermo&>(st2) ); scalar molr1 = st1.nMoles()/t.nMoles(); scalar molr2 = st2.nMoles()/t.nMoles(); - return sutherlandTransport<thermo> + return sutherlandTransport<Thermo> ( t, molr1*st1.As_ + molr2*st2.As_, @@ -205,22 +208,22 @@ inline sutherlandTransport<thermo> operator+ } -template<class thermo> -inline sutherlandTransport<thermo> operator- +template<class Thermo> +inline Foam::sutherlandTransport<Thermo> Foam::operator- ( - const sutherlandTransport<thermo>& st1, - const sutherlandTransport<thermo>& st2 + const sutherlandTransport<Thermo>& st1, + const sutherlandTransport<Thermo>& st2 ) { - thermo t + Thermo t ( - static_cast<const thermo&>(st1) - static_cast<const thermo&>(st2) + static_cast<const Thermo&>(st1) - static_cast<const Thermo&>(st2) ); scalar molr1 = st1.nMoles()/t.nMoles(); scalar molr2 = st2.nMoles()/t.nMoles(); - return sutherlandTransport<thermo> + return sutherlandTransport<Thermo> ( t, molr1*st1.As_ - molr2*st2.As_, @@ -229,35 +232,31 @@ inline sutherlandTransport<thermo> operator- } -template<class thermo> -inline sutherlandTransport<thermo> operator* +template<class Thermo> +inline Foam::sutherlandTransport<Thermo> Foam::operator* ( const scalar s, - const sutherlandTransport<thermo>& st + const sutherlandTransport<Thermo>& st ) { - return sutherlandTransport<thermo> + return sutherlandTransport<Thermo> ( - s*static_cast<const thermo&>(st), + s*static_cast<const Thermo&>(st), st.As_, st.Ts_ ); } -template<class thermo> -inline sutherlandTransport<thermo> operator== +template<class Thermo> +inline Foam::sutherlandTransport<Thermo> Foam::operator== ( - const sutherlandTransport<thermo>& st1, - const sutherlandTransport<thermo>& st2 + const sutherlandTransport<Thermo>& st1, + const sutherlandTransport<Thermo>& st2 ) { return st2 - st1; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties index e29c4ca7b7d..cb6bd7a7d63 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties @@ -26,7 +26,7 @@ mixture molWeight 11640.3; Cp 2.5; Hf 0; - Mu 0; + mu 0; Pr 1; } diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties index 86e3e2bb1b4..43d943618a5 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/thermophysicalProperties @@ -24,7 +24,7 @@ mixture molWeight 11640.3; Cp 2.5; Hf 0; - Mu 0; + mu 0; Pr 1; } diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties index 16a5a98e21c..0433bc0a0dc 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.96; Cp 1004.5; Hf 2.544e+06; - Mu 0; + mu 0; Pr 1; } diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties index 86e3e2bb1b4..43d943618a5 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/thermophysicalProperties @@ -24,7 +24,7 @@ mixture molWeight 11640.3; Cp 2.5; Hf 0; - Mu 0; + mu 0; Pr 1; } diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties index 2f276bc52aa..697d53b1931 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties index 0bd26dd166c..c482d50e2a8 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties +++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1007; Hf 0; - Mu 1.84e-05; + mu 1.84e-05; Pr 0.7; } diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties index bdaf26e9fd2..4997591ddf1 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties @@ -26,7 +26,7 @@ mixture molWeight 11640.3; Cp 2.5; Hf 0; - Mu 0; + mu 0; Pr 1; } diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties index e723a52bbed..3f1cabc2c6f 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cv 717.5; Hf 0; - Mu 0; + mu 0; Pr 0.7; } diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties index b0992ad6727..977c2b55ff6 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cv 717.5; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties index b0992ad6727..977c2b55ff6 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cv 717.5; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties index 3684941cfb0..7d8965c40fc 100644 --- a/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/constant/thermophysicalProperties @@ -25,7 +25,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties index 88958cde6c3..7cbec49f1c1 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/buoyantCavity/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.96; Cp 1004.4; Hf 0; - Mu 1.831e-05; + mu 1.831e-05; Pr 0.705; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties index 3d044d0d77a..9728c7e2863 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/constant/thermophysicalProperties @@ -25,7 +25,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties index 3d044d0d77a..9728c7e2863 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/thermophysicalProperties @@ -25,7 +25,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties index 3d044d0d77a..9728c7e2863 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/thermophysicalProperties @@ -25,7 +25,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index c849bd357ad..9a8420f3622 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index dad4948bd22..2915b8b267a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/constant/topAir/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties index c849bd357ad..9a8420f3622 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties index dad4948bd22..2915b8b267a 100644 --- a/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties index c849bd357ad..9a8420f3622 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/bottomAir/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties index dad4948bd22..2915b8b267a 100644 --- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties +++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/multiRegionHeater/constant/topAir/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1000; Hf 0; - Mu 1.8e-05; + mu 1.8e-05; Pr 0.7; } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties index f2f83052549..5ed23978a56 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermophysicalProperties @@ -23,7 +23,7 @@ mixture molWeight 28.9; Cp 1007; Hf 0; - Mu 1.84e-05; + mu 1.84e-05; Pr 0.7; } -- GitLab