diff --git a/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C b/src/thermophysicalModels/specie/equationOfState/perfectGas/perfectGas.C index ece0d8baff..f73335e225 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(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 a72cf9fb87..199bbd73f9 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::clone() const +inline Foam::autoPtr Foam::perfectGas::clone() const { return autoPtr(new perfectGas(*this)); } -inline autoPtr perfectGas::New(Istream& is) +inline Foam::autoPtr Foam::perfectGas::New(Istream& is) { return autoPtr(new perfectGas(is)); } -inline autoPtr perfectGas::New(const dictionary& dict) +inline Foam::autoPtr Foam::perfectGas::New +( + const dictionary& dict +) { return autoPtr(new perfectGas(dict)); } @@ -69,19 +64,19 @@ inline autoPtr 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 94a369f9a3..d721f96e4f 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::kr return 0.0; } + template Foam::scalar Foam::Reaction::kr ( diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/powerSeries/powerSeriesReactionRate.H index 4d4239ebc1..ce92828a72 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 b_; + static const label nCoeff_ = 4; + FixedList coeffs_; public: @@ -70,7 +70,7 @@ public: const scalar A, const scalar beta, const scalar Ta, - const FixedList b + const FixedList 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 7900f282e5..b6391f8441 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 b + const FixedList 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 -Foam::eConstThermo::eConstThermo(Istream& is) +template +Foam::eConstThermo::eConstThermo(Istream& is) : - equationOfState(is), + EquationOfState(is), Cv_(readScalar(is)), Hf_(readScalar(is)) { - is.check("eConstThermo::eConstThermo(Istream& is)"); + is.check("eConstThermo::eConstThermo(Istream&)"); } -template -Foam::eConstThermo::eConstThermo(const dictionary& dict) +template +Foam::eConstThermo::eConstThermo(const dictionary& dict) : - equationOfState(dict), + EquationOfState(dict), Cv_(readScalar(dict.lookup("Cv"))), Hf_(readScalar(dict.lookup("Hf"))) {} @@ -50,10 +50,10 @@ Foam::eConstThermo::eConstThermo(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::eConstThermo::write(Ostream& os) const +template +void Foam::eConstThermo::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::write(Ostream& os) const // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -template +template Foam::Ostream& Foam::operator<< ( Ostream& os, - const eConstThermo& ct + const eConstThermo& ct ) { - os << static_cast(ct) << tab + os << static_cast(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 9211123b10..450dd714f6 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 eConstThermo; +template class eConstThermo; -template -inline eConstThermo operator+ +template +inline eConstThermo operator+ ( - const eConstThermo&, - const eConstThermo& + const eConstThermo&, + const eConstThermo& ); -template -inline eConstThermo operator- +template +inline eConstThermo operator- ( - const eConstThermo&, - const eConstThermo& + const eConstThermo&, + const eConstThermo& ); -template -inline eConstThermo operator* +template +inline eConstThermo operator* ( const scalar, - const eConstThermo& + const eConstThermo& ); -template -inline eConstThermo operator== +template +inline eConstThermo operator== ( - const eConstThermo&, - const eConstThermo& + const eConstThermo&, + const eConstThermo& ); -template +template Ostream& operator<< ( Ostream&, - const eConstThermo& + const eConstThermo& ); @@ -88,10 +88,10 @@ Ostream& operator<< Class eConstThermo Declaration \*---------------------------------------------------------------------------*/ -template +template 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+ + friend eConstThermo operator+ ( const eConstThermo&, const eConstThermo& ); - friend eConstThermo operator- + friend eConstThermo operator- ( const eConstThermo&, const eConstThermo& ); - friend eConstThermo operator* + friend eConstThermo operator* ( const scalar, const eConstThermo& ); - friend eConstThermo operator== + friend eConstThermo operator== ( const eConstThermo&, const eConstThermo& @@ -194,7 +194,7 @@ public: // IOstream Operators - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const eConstThermo& diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H index 917a43089b..f2a117a00b 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 -inline Foam::eConstThermo::eConstThermo +template +inline Foam::eConstThermo::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::eConstThermo // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::eConstThermo::eConstThermo +template +inline Foam::eConstThermo::eConstThermo ( const word& name, - const eConstThermo& ct + const eConstThermo& ct ) : - equationOfState(name, ct), + EquationOfState(name, ct), Cv_(ct.Cv_), Hf_(ct.Hf_) {} -template -inline Foam::autoPtr > -Foam::eConstThermo::clone() const +template +inline Foam::autoPtr > +Foam::eConstThermo::clone() const { - return autoPtr > + return autoPtr > ( - new eConstThermo(*this) + new eConstThermo(*this) ); } -template -inline Foam::autoPtr > -Foam::eConstThermo::New(Istream& is) +template +inline Foam::autoPtr > +Foam::eConstThermo::New(Istream& is) { - return autoPtr > + return autoPtr > ( - new eConstThermo(is) + new eConstThermo(is) ); } -template -inline Foam::autoPtr > -Foam::eConstThermo::New(const dictionary& dict) +template +inline Foam::autoPtr > +Foam::eConstThermo::New(const dictionary& dict) { - return autoPtr > + return autoPtr > ( - new eConstThermo(dict) + new eConstThermo(dict) ); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -inline Foam::scalar Foam::eConstThermo::cp +template +inline Foam::scalar Foam::eConstThermo::cp ( const scalar ) const @@ -99,8 +99,8 @@ inline Foam::scalar Foam::eConstThermo::cp } -template -inline Foam::scalar Foam::eConstThermo::h +template +inline Foam::scalar Foam::eConstThermo::h ( const scalar T ) const @@ -109,8 +109,8 @@ inline Foam::scalar Foam::eConstThermo::h } -template -inline Foam::scalar Foam::eConstThermo::hs +template +inline Foam::scalar Foam::eConstThermo::hs ( const scalar T ) const @@ -119,35 +119,38 @@ inline Foam::scalar Foam::eConstThermo::hs } -template -inline Foam::scalar Foam::eConstThermo::hc() const +template +inline Foam::scalar Foam::eConstThermo::hc() const { return Hf_*this->W(); } -template -inline Foam::scalar Foam::eConstThermo::s +template +inline Foam::scalar Foam::eConstThermo::s ( const scalar T ) const { - notImplemented("scalar eConstThermo::s(const scalar T) const"); + notImplemented + ( + "scalar eConstThermo::s(const scalar) const" + ); return T; } // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::eConstThermo::operator+= +template +inline void Foam::eConstThermo::operator+= ( - const eConstThermo& ct + const eConstThermo& 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::operator+= } -template -inline void Foam::eConstThermo::operator-= +template +inline void Foam::eConstThermo::operator-= ( - const eConstThermo& ct + const eConstThermo& 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::operator-= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template -inline Foam::eConstThermo Foam::operator+ +template +inline Foam::eConstThermo Foam::operator+ ( - const eConstThermo& ct1, - const eConstThermo& ct2 + const eConstThermo& ct1, + const eConstThermo& ct2 ) { - equationOfState eofs + EquationOfState eofs ( - static_cast(ct1) - + static_cast(ct2) + static_cast(ct1) + + static_cast(ct2) ); - return eConstThermo + return eConstThermo ( eofs, ct1.nMoles()/eofs.nMoles()*ct1.Cv_ @@ -201,20 +204,20 @@ inline Foam::eConstThermo Foam::operator+ } -template -inline Foam::eConstThermo Foam::operator- +template +inline Foam::eConstThermo Foam::operator- ( - const eConstThermo& ct1, - const eConstThermo& ct2 + const eConstThermo& ct1, + const eConstThermo& ct2 ) { - equationOfState eofs + EquationOfState eofs ( - static_cast(ct1) - - static_cast(ct2) + static_cast(ct1) + - static_cast(ct2) ); - return eConstThermo + return eConstThermo ( eofs, ct1.nMoles()/eofs.nMoles()*ct1.Cv_ @@ -225,27 +228,27 @@ inline Foam::eConstThermo Foam::operator- } -template -inline Foam::eConstThermo Foam::operator* +template +inline Foam::eConstThermo Foam::operator* ( const scalar s, - const eConstThermo& ct + const eConstThermo& ct ) { - return eConstThermo + return eConstThermo ( - s*static_cast(ct), + s*static_cast(ct), ct.Cv_, ct.Hf_ ); } -template -inline Foam::eConstThermo Foam::operator== +template +inline Foam::eConstThermo Foam::operator== ( - const eConstThermo& ct1, - const eConstThermo& ct2 + const eConstThermo& ct1, + const eConstThermo& ct2 ) { return ct2 - ct1; diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C index 71a4cb45f2..562f373df7 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 -void Foam::janafThermo::checkInputData() const +template +void Foam::janafThermo::checkInputData() const { if (Tlow_ >= Thigh_) { - FatalErrorIn("janafThermo::check()") + FatalErrorIn("janafThermo::check()") << "Tlow(" << Tlow_ << ") >= Thigh(" << Thigh_ << ')' << exit(FatalIOError); } if (Tcommon_ <= Tlow_) { - FatalErrorIn("janafThermo::check()") + FatalErrorIn("janafThermo::check()") << "Tcommon(" << Tcommon_ << ") <= Tlow(" << Tlow_ << ')' << exit(FatalIOError); } if (Tcommon_ > Thigh_) { - FatalErrorIn("janafThermo::check()") + FatalErrorIn("janafThermo::check()") << "Tcommon(" << Tcommon_ << ") > Thigh(" << Thigh_ << ')' << exit(FatalIOError); } @@ -56,10 +56,10 @@ void Foam::janafThermo::checkInputData() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::janafThermo::janafThermo(Istream& is) +template +Foam::janafThermo::janafThermo(Istream& is) : - equationOfState(is), + EquationOfState(is), Tlow_(readScalar(is)), Thigh_(readScalar(is)), Tcommon_(readScalar(is)) @@ -81,10 +81,10 @@ Foam::janafThermo::janafThermo(Istream& is) } -template -Foam::janafThermo::janafThermo(const dictionary& dict) +template +Foam::janafThermo::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::janafThermo(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::janafThermo::write(Ostream& os) const +template +void Foam::janafThermo::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::write(Ostream& os) const // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -template +template Foam::Ostream& Foam::operator<< ( Ostream& os, - const janafThermo& jt + const janafThermo& jt ) { - os << static_cast(jt) << nl + os << static_cast(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& jt)" + "operator<<(Ostream& os, const janafThermo& jt)" ); return os; diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.H index 8cd749b94d..c60c898163 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 janafThermo; +template class janafThermo; -template -inline janafThermo operator+ +template +inline janafThermo operator+ ( - const janafThermo&, - const janafThermo& + const janafThermo&, + const janafThermo& ); -template -inline janafThermo operator- +template +inline janafThermo operator- ( - const janafThermo&, - const janafThermo& + const janafThermo&, + const janafThermo& ); -template -inline janafThermo operator* +template +inline janafThermo operator* ( const scalar, - const janafThermo& + const janafThermo& ); -template -inline janafThermo operator== +template +inline janafThermo operator== ( - const janafThermo&, - const janafThermo& + const janafThermo&, + const janafThermo& ); -template +template Ostream& operator<< ( Ostream&, - const janafThermo& + const janafThermo& ); @@ -89,10 +89,10 @@ Ostream& operator<< Class janafThermo Declaration \*---------------------------------------------------------------------------*/ -template +template 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+ + friend janafThermo operator+ ( const janafThermo&, const janafThermo& ); - friend janafThermo operator- + friend janafThermo operator- ( const janafThermo&, const janafThermo& ); - friend janafThermo operator* + friend janafThermo operator* ( const scalar, const janafThermo& ); - friend janafThermo operator== + friend janafThermo operator== ( const janafThermo&, const janafThermo& @@ -212,7 +212,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const janafThermo& diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H b/src/thermophysicalModels/specie/thermo/janaf/janafThermoI.H index 1379a9d8ad..05f3a1b981 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 -inline Foam::janafThermo::janafThermo +template +inline Foam::janafThermo::janafThermo ( - const equationOfState& st, + const EquationOfState& st, const scalar Tlow, const scalar Thigh, const scalar Tcommon, - const typename janafThermo::coeffArray& highCpCoeffs, - const typename janafThermo::coeffArray& lowCpCoeffs + const typename janafThermo::coeffArray& highCpCoeffs, + const typename janafThermo::coeffArray& lowCpCoeffs ) : - equationOfState(st), + EquationOfState(st), Tlow_(Tlow), Thigh_(Thigh), Tcommon_(Tcommon) @@ -52,15 +52,15 @@ inline Foam::janafThermo::janafThermo } -template -inline void Foam::janafThermo::checkT(const scalar T) const +template +inline void Foam::janafThermo::checkT(const scalar T) const { if (T < Tlow_ || T > Thigh_) { FatalErrorIn ( - "janafThermo::checkT(const scalar T) const" - ) << "attempt to use janafThermo" + "janafThermo::checkT(const scalar T) const" + ) << "attempt to use janafThermo" " out of temperature range " << Tlow_ << " -> " << Thigh_ << "; T = " << T << abort(FatalError); @@ -68,9 +68,9 @@ inline void Foam::janafThermo::checkT(const scalar T) const } -template -inline const typename Foam::janafThermo::coeffArray& -Foam::janafThermo::coeffs +template +inline const typename Foam::janafThermo::coeffArray& +Foam::janafThermo::coeffs ( const scalar T ) const @@ -90,14 +90,14 @@ Foam::janafThermo::coeffs // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::janafThermo::janafThermo +template +inline Foam::janafThermo::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::janafThermo // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -inline Foam::scalar Foam::janafThermo::cp +template +inline Foam::scalar Foam::janafThermo::cp ( const scalar T ) const @@ -123,8 +123,8 @@ inline Foam::scalar Foam::janafThermo::cp } -template -inline Foam::scalar Foam::janafThermo::h +template +inline Foam::scalar Foam::janafThermo::h ( const scalar T ) const @@ -138,8 +138,8 @@ inline Foam::scalar Foam::janafThermo::h } -template -inline Foam::scalar Foam::janafThermo::hs +template +inline Foam::scalar Foam::janafThermo::hs ( const scalar T ) const @@ -148,8 +148,8 @@ inline Foam::scalar Foam::janafThermo::hs } -template -inline Foam::scalar Foam::janafThermo::hc() const +template +inline Foam::scalar Foam::janafThermo::hc() const { const coeffArray& a = lowCpCoeffs_; const scalar Tstd = specie::Tstd; @@ -163,8 +163,8 @@ inline Foam::scalar Foam::janafThermo::hc() const } -template -inline Foam::scalar Foam::janafThermo::s +template +inline Foam::scalar Foam::janafThermo::s ( const scalar T ) const @@ -181,15 +181,15 @@ inline Foam::scalar Foam::janafThermo::s // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::janafThermo::operator+= +template +inline void Foam::janafThermo::operator+= ( - const janafThermo& jt + const janafThermo& 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::operator+= for ( register label coefLabel=0; - coefLabel::nCoeffs_; + coefLabel::nCoeffs_; coefLabel++ ) { @@ -216,15 +216,15 @@ inline void Foam::janafThermo::operator+= } -template -inline void Foam::janafThermo::operator-= +template +inline void Foam::janafThermo::operator-= ( - const janafThermo& jt + const janafThermo& 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::operator-= for ( register label coefLabel=0; - coefLabel::nCoeffs_; + coefLabel::nCoeffs_; coefLabel++ ) { @@ -253,26 +253,26 @@ inline void Foam::janafThermo::operator-= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template -inline Foam::janafThermo Foam::operator+ +template +inline Foam::janafThermo Foam::operator+ ( - const janafThermo& jt1, - const janafThermo& jt2 + const janafThermo& jt1, + const janafThermo& jt2 ) { - equationOfState eofs = jt1; + EquationOfState eofs = jt1; eofs += jt2; scalar molr1 = jt1.nMoles()/eofs.nMoles(); scalar molr2 = jt2.nMoles()/eofs.nMoles(); - typename janafThermo::coeffArray highCpCoeffs; - typename janafThermo::coeffArray lowCpCoeffs; + typename janafThermo::coeffArray highCpCoeffs; + typename janafThermo::coeffArray lowCpCoeffs; for ( register label coefLabel=0; - coefLabel::nCoeffs_; + coefLabel::nCoeffs_; coefLabel++ ) { @@ -285,7 +285,7 @@ inline Foam::janafThermo Foam::operator+ + molr2*jt2.lowCpCoeffs_[coefLabel]; } - return janafThermo + return janafThermo ( eofs, max(jt1.Tlow_, jt2.Tlow_), @@ -297,26 +297,26 @@ inline Foam::janafThermo Foam::operator+ } -template -inline Foam::janafThermo Foam::operator- +template +inline Foam::janafThermo Foam::operator- ( - const janafThermo& jt1, - const janafThermo& jt2 + const janafThermo& jt1, + const janafThermo& jt2 ) { - equationOfState eofs = jt1; + EquationOfState eofs = jt1; eofs -= jt2; scalar molr1 = jt1.nMoles()/eofs.nMoles(); scalar molr2 = jt2.nMoles()/eofs.nMoles(); - typename janafThermo::coeffArray highCpCoeffs; - typename janafThermo::coeffArray lowCpCoeffs; + typename janafThermo::coeffArray highCpCoeffs; + typename janafThermo::coeffArray lowCpCoeffs; for ( register label coefLabel=0; - coefLabel::nCoeffs_; + coefLabel::nCoeffs_; coefLabel++ ) { @@ -329,7 +329,7 @@ inline Foam::janafThermo Foam::operator- - molr2*jt2.lowCpCoeffs_[coefLabel]; } - return janafThermo + return janafThermo ( eofs, max(jt1.Tlow_, jt2.Tlow_), @@ -341,16 +341,16 @@ inline Foam::janafThermo Foam::operator- } -template -inline Foam::janafThermo Foam::operator* +template +inline Foam::janafThermo Foam::operator* ( const scalar s, - const janafThermo& jt + const janafThermo& jt ) { - return janafThermo + return janafThermo ( - s*static_cast(jt), + s*static_cast(jt), jt.Tlow_, jt.Thigh_, jt.Tcommon_, @@ -360,11 +360,11 @@ inline Foam::janafThermo Foam::operator* } -template -inline Foam::janafThermo Foam::operator== +template +inline Foam::janafThermo Foam::operator== ( - const janafThermo& jt1, - const janafThermo& jt2 + const janafThermo& jt1, + const janafThermo& jt2 ) { return jt2 - jt1; diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermo.C index 857402c95e..1caf28c185 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 -const Foam::scalar Foam::specieThermo::tol_ = 1.0e-4; +template +const Foam::scalar Foam::specieThermo::tol_ = 1.0e-4; -template -const int Foam::specieThermo::maxIter_ = 100; +template +const int Foam::specieThermo::maxIter_ = 100; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::specieThermo::specieThermo(Istream& is) +template +Foam::specieThermo::specieThermo(Istream& is) : - thermo(is) + Thermo(is) { - is.check("specieThermo::specieThermo(Istream& is)"); + is.check("specieThermo::specieThermo(Istream&)"); } -template -Foam::specieThermo::specieThermo(const dictionary& dict) +template +Foam::specieThermo::specieThermo(const dictionary& dict) : - thermo(dict) + Thermo(dict) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::specieThermo::write(Ostream& os) const +template +void Foam::specieThermo::write(Ostream& os) const { - thermo::write(os); + Thermo::write(os); } // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -template -Foam::Ostream& Foam::operator<<(Ostream& os, const specieThermo& st) +template +Foam::Ostream& Foam::operator<<(Ostream& os, const specieThermo& st) { - os << static_cast(st); + os << static_cast(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 231bf4586b..26959d8f06 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 specieThermo; +template class specieThermo; -template -inline specieThermo operator+ +template +inline specieThermo operator+ ( - const specieThermo&, - const specieThermo& + const specieThermo&, + const specieThermo& ); -template -inline specieThermo operator- +template +inline specieThermo operator- ( - const specieThermo&, - const specieThermo& + const specieThermo&, + const specieThermo& ); -template -inline specieThermo operator* +template +inline specieThermo operator* ( const scalar, - const specieThermo& + const specieThermo& ); -template -inline specieThermo operator== +template +inline specieThermo operator== ( - const specieThermo&, - const specieThermo& + const specieThermo&, + const specieThermo& ); -template +template Ostream& operator<< ( Ostream&, - const specieThermo& + const specieThermo& ); @@ -87,10 +87,10 @@ Ostream& operator<< Class specieThermo Declaration \*---------------------------------------------------------------------------*/ -template +template 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+ + friend specieThermo operator+ ( const specieThermo&, const specieThermo& ); - friend specieThermo operator- + friend specieThermo operator- ( const specieThermo&, const specieThermo& ); - friend specieThermo operator* + friend specieThermo operator* ( const scalar s, const specieThermo& ); - friend specieThermo operator== + friend specieThermo operator== ( const specieThermo&, const specieThermo& @@ -294,7 +294,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const specieThermo& diff --git a/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H b/src/thermophysicalModels/specie/thermo/specieThermo/specieThermoI.H index 402103f38c..c729cbc42e 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 -inline Foam::specieThermo::specieThermo +template +inline Foam::specieThermo::specieThermo ( - const thermo& sp + const Thermo& sp ) : - thermo(sp) + Thermo(sp) {} -template -inline Foam::scalar Foam::specieThermo::T +template +inline Foam::scalar Foam::specieThermo::T ( scalar f, scalar T0, - scalar (specieThermo::*F)(const scalar) const, - scalar (specieThermo::*dFdT)(const scalar) const + scalar (specieThermo::*F)(const scalar) const, + scalar (specieThermo::*dFdT)(const scalar) const ) const { scalar Test = T0; @@ -60,9 +60,9 @@ inline Foam::scalar Foam::specieThermo::T { FatalErrorIn ( - "specieThermo::T(scalar f, scalar T0, " - "scalar (specieThermo::*F)(const scalar) const, " - "scalar (specieThermo::*dFdT)(const scalar) const" + "specieThermo::T(scalar f, scalar T0, " + "scalar (specieThermo::*F)(const scalar) const, " + "scalar (specieThermo::*dFdT)(const scalar) const" ") const" ) << "Maximum number of iterations exceeded" << abort(FatalError); @@ -76,127 +76,127 @@ inline Foam::scalar Foam::specieThermo::T // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::specieThermo::specieThermo +template +inline Foam::specieThermo::specieThermo ( const word& name, const specieThermo& st ) : - thermo(name, st) + Thermo(name, st) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -inline Foam::scalar Foam::specieThermo::cv(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::cv(const scalar T) const { return this->cp(T) - this->RR; } -template -inline Foam::scalar Foam::specieThermo::gamma(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::gamma(const scalar T) const { scalar CP = this->cp(T); return CP/(CP - this->RR); } -template -inline Foam::scalar Foam::specieThermo::e(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::e(const scalar T) const { return this->h(T) - this->RR*(T - this->Tstd); } -template -inline Foam::scalar Foam::specieThermo::es(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::es(const scalar T) const { return this->hs(T) - this->RR*(T - this->Tstd); } -template -inline Foam::scalar Foam::specieThermo::g(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::g(const scalar T) const { return this->h(T) - T*this->s(T); } -template -inline Foam::scalar Foam::specieThermo::a(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::a(const scalar T) const { return this->e(T) - T*this->s(T); } -template -inline Foam::scalar Foam::specieThermo::Cp(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::Cp(const scalar T) const { return this->cp(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::Cv(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::Cv(const scalar T) const { return this->cv(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::H(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::H(const scalar T) const { return this->h(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::Hs(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::Hs(const scalar T) const { return this->hs(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::Hc() const +template +inline Foam::scalar Foam::specieThermo::Hc() const { return this->hc()/this->W(); } -template -inline Foam::scalar Foam::specieThermo::S(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::S(const scalar T) const { return this->s(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::E(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::E(const scalar T) const { return this->e(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::G(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::G(const scalar T) const { return this->g(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::A(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::A(const scalar T) const { return this->a(T)/this->W(); } -template -inline Foam::scalar Foam::specieThermo::K(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::K(const scalar T) const { scalar arg = -this->nMoles()*this->g(T)/(this->RR*T); @@ -211,15 +211,15 @@ inline Foam::scalar Foam::specieThermo::K(const scalar T) const } -template -inline Foam::scalar Foam::specieThermo::Kp(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::Kp(const scalar T) const { return K(T); } -template -inline Foam::scalar Foam::specieThermo::Kc(const scalar T) const +template +inline Foam::scalar Foam::specieThermo::Kc(const scalar T) const { if (equal(this->nMoles(), SMALL)) { @@ -232,8 +232,8 @@ inline Foam::scalar Foam::specieThermo::Kc(const scalar T) const } -template -inline Foam::scalar Foam::specieThermo::Kx +template +inline Foam::scalar Foam::specieThermo::Kx ( const scalar T, const scalar p @@ -250,8 +250,8 @@ inline Foam::scalar Foam::specieThermo::Kx } -template -inline Foam::scalar Foam::specieThermo::Kn +template +inline Foam::scalar Foam::specieThermo::Kn ( const scalar T, const scalar p, @@ -269,117 +269,117 @@ inline Foam::scalar Foam::specieThermo::Kn } -template -inline Foam::scalar Foam::specieThermo::TH +template +inline Foam::scalar Foam::specieThermo::TH ( const scalar h, const scalar T0 ) const { - return T(h, T0, &specieThermo::H, &specieThermo::Cp); + return T(h, T0, &specieThermo::H, &specieThermo::Cp); } -template -inline Foam::scalar Foam::specieThermo::THs +template +inline Foam::scalar Foam::specieThermo::THs ( const scalar hs, const scalar T0 ) const { - return T(hs, T0, &specieThermo::Hs, &specieThermo::Cp); + return T(hs, T0, &specieThermo::Hs, &specieThermo::Cp); } -template -inline Foam::scalar Foam::specieThermo::TE +template +inline Foam::scalar Foam::specieThermo::TE ( const scalar e, const scalar T0 ) const { - return T(e, T0, &specieThermo::E, &specieThermo::Cv); + return T(e, T0, &specieThermo::E, &specieThermo::Cv); } // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline void Foam::specieThermo::operator+= +template +inline void Foam::specieThermo::operator+= ( - const specieThermo& st + const specieThermo& st ) { - thermo::operator+=(st); + Thermo::operator+=(st); } -template -inline void Foam::specieThermo::operator-= +template +inline void Foam::specieThermo::operator-= ( - const specieThermo& st + const specieThermo& st ) { - thermo::operator-=(st); + Thermo::operator-=(st); } -template -inline void Foam::specieThermo::operator*=(const scalar s) +template +inline void Foam::specieThermo::operator*=(const scalar s) { - thermo::operator*=(s); + Thermo::operator*=(s); } // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template -inline Foam::specieThermo Foam::operator+ +template +inline Foam::specieThermo Foam::operator+ ( - const specieThermo& st1, - const specieThermo& st2 + const specieThermo& st1, + const specieThermo& st2 ) { - return specieThermo + return specieThermo ( - static_cast(st1) + static_cast(st2) + static_cast(st1) + static_cast(st2) ); } -template -inline Foam::specieThermo Foam::operator- +template +inline Foam::specieThermo Foam::operator- ( - const specieThermo& st1, - const specieThermo& st2 + const specieThermo& st1, + const specieThermo& st2 ) { - return specieThermo + return specieThermo ( - static_cast(st1) - static_cast(st2) + static_cast(st1) - static_cast(st2) ); } -template -inline Foam::specieThermo Foam::operator* +template +inline Foam::specieThermo Foam::operator* ( const scalar s, - const specieThermo& st + const specieThermo& st ) { - return specieThermo + return specieThermo ( - s*static_cast(st) + s*static_cast(st) ); } -template -inline Foam::specieThermo Foam::operator== +template +inline Foam::specieThermo Foam::operator== ( - const specieThermo& st1, - const specieThermo& st2 + const specieThermo& st1, + const specieThermo& st2 ) { return st2 - st1; diff --git a/src/thermophysicalModels/specie/transport/const/constTransport.C b/src/thermophysicalModels/specie/transport/const/constTransport.C index 8c16529daf..ca7efe753b 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 -constTransport::constTransport(Istream& is) +template +Foam::constTransport::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 -constTransport::constTransport(const dictionary& dict) +template +Foam::constTransport::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 -void constTransport::constTransport::write(Ostream& os) const +template +void Foam::constTransport::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 -Ostream& operator<<(Ostream& os, const constTransport& ct) +template +Foam::Ostream& Foam::operator<<(Ostream& os, const constTransport& ct) { - operator<<(os, static_cast(ct)); - os << tab << ct.Mu_ << tab << 1.0/ct.rPr_; + operator<<(os, static_cast(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 309e4b0dfd..0424166031 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 constTransport; +template class constTransport; -template -inline constTransport operator+ +template +inline constTransport operator+ ( - const constTransport&, - const constTransport& + const constTransport&, + const constTransport& ); -template -inline constTransport operator- +template +inline constTransport operator- ( - const constTransport&, - const constTransport& + const constTransport&, + const constTransport& ); -template -inline constTransport operator* +template +inline constTransport operator* ( const scalar, - const constTransport& + const constTransport& ); -template -inline constTransport operator== +template +inline constTransport operator== ( - const constTransport&, - const constTransport& + const constTransport&, + const constTransport& ); -template +template Ostream& operator<< ( Ostream&, - const constTransport& + const constTransport& ); @@ -87,15 +87,15 @@ Ostream& operator<< Class constTransport Declaration \*---------------------------------------------------------------------------*/ -template +template 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+ + friend constTransport operator+ ( const constTransport&, const constTransport& ); - friend constTransport operator- + friend constTransport operator- ( const constTransport&, const constTransport& ); - friend constTransport operator* + friend constTransport operator* ( const scalar, const constTransport& ); - friend constTransport operator== + friend constTransport operator== ( const constTransport&, const constTransport& @@ -181,7 +181,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const constTransport& diff --git a/src/thermophysicalModels/specie/transport/const/constTransportI.H b/src/thermophysicalModels/specie/transport/const/constTransportI.H index 37fa5b311b..c187a11b4b 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 -inline constTransport::constTransport +template +inline Foam::constTransport::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 -inline constTransport::constTransport +template +inline Foam::constTransport::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 -inline scalar constTransport::mu(const scalar) const +template +inline Foam::scalar Foam::constTransport::mu(const scalar) const { - return Mu_; + return mu_; } -template -inline scalar constTransport::kappa(const scalar T) const +template +inline Foam::scalar Foam::constTransport::kappa(const scalar T) const { return this->Cp(T)*mu(T)*rPr_; } -template -inline scalar constTransport::alpha(const scalar T) const +template +inline Foam::scalar Foam::constTransport::alpha(const scalar T) const { scalar Cp_ = this->Cp(T); @@ -88,15 +83,15 @@ inline scalar constTransport::alpha(const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline constTransport& constTransport::operator= +template +inline Foam::constTransport& Foam::constTransport::operator= ( - const constTransport& ct + const constTransport& ct ) { - thermo::operator=(ct); + Thermo::operator=(ct); - Mu_ = ct.Mu_; + mu_ = ct.mu_; rPr_ = ct.rPr_; return *this; @@ -105,83 +100,79 @@ inline constTransport& constTransport::operator= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template -inline constTransport operator+ +template +inline Foam::constTransport Foam::operator+ ( - const constTransport& ct1, - const constTransport& ct2 + const constTransport& ct1, + const constTransport& ct2 ) { - thermo t + Thermo t ( - static_cast(ct1) + static_cast(ct2) + static_cast(ct1) + static_cast(ct2) ); scalar molr1 = ct1.nMoles()/t.nMoles(); scalar molr2 = ct2.nMoles()/t.nMoles(); - return constTransport + return constTransport ( t, - molr1*ct1.Mu_ + molr2*ct2.Mu_, + molr1*ct1.mu_ + molr2*ct2.mu_, molr1*ct1.rPr_ + molr2*ct2.rPr_ ); } -template -inline constTransport operator- +template +inline Foam::constTransport Foam::operator- ( - const constTransport& ct1, - const constTransport& ct2 + const constTransport& ct1, + const constTransport& ct2 ) { - thermo t + Thermo t ( - static_cast(ct1) - static_cast(ct2) + static_cast(ct1) - static_cast(ct2) ); scalar molr1 = ct1.nMoles()/t.nMoles(); scalar molr2 = ct2.nMoles()/t.nMoles(); - return constTransport + return constTransport ( t, - molr1*ct1.Mu_ - molr2*ct2.Mu_, + molr1*ct1.mu_ - molr2*ct2.mu_, molr1*ct1.rPr_ - molr2*ct2.rPr_ ); } -template -inline constTransport operator* +template +inline Foam::constTransport Foam::operator* ( const scalar s, - const constTransport& ct + const constTransport& ct ) { - return constTransport + return constTransport ( - s*static_cast(ct), - ct.Mu_, + s*static_cast(ct), + ct.mu_, ct.rPr_ ); } -template -inline constTransport operator== +template +inline Foam::constTransport Foam::operator== ( - const constTransport& ct1, - const constTransport& ct2 + const constTransport& ct1, + const constTransport& 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 cd8c900581..69ab41db97 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 e3ac8f2189..a58c73de24 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 f90f6f30f6..d210cab1d0 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 -sutherlandTransport::sutherlandTransport(Istream& is) +template +Foam::sutherlandTransport::sutherlandTransport(Istream& is) : - thermo(is), + Thermo(is), As_(readScalar(is)), Ts_(readScalar(is)) { - is.check("sutherlandTransport::sutherlandTransport(Istream&)"); + is.check("sutherlandTransport::sutherlandTransport(Istream&)"); } -template -sutherlandTransport::sutherlandTransport(const dictionary& dict) +template +Foam::sutherlandTransport::sutherlandTransport(const dictionary& dict) : - thermo(dict), + Thermo(dict), As_(readScalar(dict.lookup("As"))), Ts_(readScalar(dict.lookup("Ts"))) {} @@ -55,35 +50,34 @@ sutherlandTransport::sutherlandTransport(const dictionary& dict) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void sutherlandTransport::write(Ostream& os) const +template +void Foam::sutherlandTransport::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 -Ostream& operator<<(Ostream& os, const sutherlandTransport& st) +template +Foam::Ostream& Foam::operator<< +( + Ostream& os, const sutherlandTransport& st +) { - os << static_cast(st) << tab << st.As_ << tab << st.Ts_; + os << static_cast(st) << tab << st.As_ << tab << st.Ts_; os.check ( - "Ostream& operator<<(Ostream&, const sutherlandTransport&)" + "Ostream& operator<<(Ostream&, const sutherlandTransport&)" ); return os; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransport.H index f3117b003f..80cc3ff5d4 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 sutherlandTransport; +template class sutherlandTransport; -template -inline sutherlandTransport operator+ +template +inline sutherlandTransport operator+ ( - const sutherlandTransport&, - const sutherlandTransport& + const sutherlandTransport&, + const sutherlandTransport& ); -template -inline sutherlandTransport operator- +template +inline sutherlandTransport operator- ( - const sutherlandTransport&, - const sutherlandTransport& + const sutherlandTransport&, + const sutherlandTransport& ); -template -inline sutherlandTransport operator* +template +inline sutherlandTransport operator* ( const scalar, - const sutherlandTransport& + const sutherlandTransport& ); -template -inline sutherlandTransport operator== +template +inline sutherlandTransport operator== ( - const sutherlandTransport&, - const sutherlandTransport& + const sutherlandTransport&, + const sutherlandTransport& ); -template +template Ostream& operator<< ( Ostream&, - const sutherlandTransport& + const sutherlandTransport& ); /*---------------------------------------------------------------------------*\ - Class sutherlandTransport Declaration + Class sutherlandTransport Declaration \*---------------------------------------------------------------------------*/ -template +template 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+ + friend sutherlandTransport operator+ ( const sutherlandTransport&, const sutherlandTransport& ); - friend sutherlandTransport operator- + friend sutherlandTransport operator- ( const sutherlandTransport&, const sutherlandTransport& ); - friend sutherlandTransport operator* + friend sutherlandTransport operator* ( const scalar, const sutherlandTransport& ); - friend sutherlandTransport operator== + friend sutherlandTransport operator== ( const sutherlandTransport&, const sutherlandTransport& @@ -209,7 +209,7 @@ public: // Ostream Operator - friend Ostream& operator<< + friend Ostream& operator<< ( Ostream&, const sutherlandTransport& diff --git a/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H b/src/thermophysicalModels/specie/transport/sutherland/sutherlandTransportI.H index a99d724b08..3320a8ae3a 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 -inline void sutherlandTransport::calcCoeffs +template +inline void Foam::sutherlandTransport::calcCoeffs ( const scalar mu1, const scalar T1, const scalar mu2, const scalar T2 @@ -51,104 +46,111 @@ inline void sutherlandTransport::calcCoeffs // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline sutherlandTransport::sutherlandTransport +template +inline Foam::sutherlandTransport::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 -inline sutherlandTransport::sutherlandTransport +template +inline Foam::sutherlandTransport::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 -inline sutherlandTransport::sutherlandTransport +template +inline Foam::sutherlandTransport::sutherlandTransport ( const word& name, const sutherlandTransport& st ) : - thermo(name, st), + Thermo(name, st), As_(st.As_), Ts_(st.Ts_) {} -template -inline autoPtr > sutherlandTransport::clone -() const +template +inline Foam::autoPtr > +Foam::sutherlandTransport::clone() const { - return autoPtr > + return autoPtr > ( - new sutherlandTransport(*this) + new sutherlandTransport(*this) ); } -template -inline autoPtr > sutherlandTransport::New +template +inline Foam::autoPtr > +Foam::sutherlandTransport::New ( Istream& is ) { - return autoPtr > + return autoPtr > ( - new sutherlandTransport(is) + new sutherlandTransport(is) ); } -template -inline autoPtr > sutherlandTransport::New +template +inline Foam::autoPtr > +Foam::sutherlandTransport::New ( const dictionary& dict ) { - return autoPtr > + return autoPtr > ( - new sutherlandTransport(dict) + new sutherlandTransport(dict) ); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -// Dynamic viscosity [kg/ms] -template -inline scalar sutherlandTransport::mu(const scalar T) const +template +inline Foam::scalar Foam::sutherlandTransport::mu(const scalar T) const { return As_*::sqrt(T)/(1.0 + Ts_/T); } -template -inline scalar sutherlandTransport::kappa(const scalar T) const +template +inline Foam::scalar Foam::sutherlandTransport::kappa +( + const scalar T +) const { scalar Cv_ = this->Cv(T); return mu(T)*Cv_*(1.32 + 1.77*this->R()/Cv_); } -template -inline scalar sutherlandTransport::alpha(const scalar T) const +template +inline Foam::scalar Foam::sutherlandTransport::alpha +( + const scalar T +) const { scalar Cv_ = this->Cv(T); scalar R_ = this->R(); @@ -164,13 +166,14 @@ inline scalar sutherlandTransport::alpha(const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline sutherlandTransport& sutherlandTransport::operator= +template +inline Foam::sutherlandTransport& +Foam::sutherlandTransport::operator= ( - const sutherlandTransport& st + const sutherlandTransport& st ) { - thermo::operator=(st); + Thermo::operator=(st); As_ = st.As_; Ts_ = st.Ts_; @@ -181,22 +184,22 @@ inline sutherlandTransport& sutherlandTransport::operator= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template -inline sutherlandTransport operator+ +template +inline Foam::sutherlandTransport Foam::operator+ ( - const sutherlandTransport& st1, - const sutherlandTransport& st2 + const sutherlandTransport& st1, + const sutherlandTransport& st2 ) { - thermo t + Thermo t ( - static_cast(st1) + static_cast(st2) + static_cast(st1) + static_cast(st2) ); scalar molr1 = st1.nMoles()/t.nMoles(); scalar molr2 = st2.nMoles()/t.nMoles(); - return sutherlandTransport + return sutherlandTransport ( t, molr1*st1.As_ + molr2*st2.As_, @@ -205,22 +208,22 @@ inline sutherlandTransport operator+ } -template -inline sutherlandTransport operator- +template +inline Foam::sutherlandTransport Foam::operator- ( - const sutherlandTransport& st1, - const sutherlandTransport& st2 + const sutherlandTransport& st1, + const sutherlandTransport& st2 ) { - thermo t + Thermo t ( - static_cast(st1) - static_cast(st2) + static_cast(st1) - static_cast(st2) ); scalar molr1 = st1.nMoles()/t.nMoles(); scalar molr2 = st2.nMoles()/t.nMoles(); - return sutherlandTransport + return sutherlandTransport ( t, molr1*st1.As_ - molr2*st2.As_, @@ -229,35 +232,31 @@ inline sutherlandTransport operator- } -template -inline sutherlandTransport operator* +template +inline Foam::sutherlandTransport Foam::operator* ( const scalar s, - const sutherlandTransport& st + const sutherlandTransport& st ) { - return sutherlandTransport + return sutherlandTransport ( - s*static_cast(st), + s*static_cast(st), st.As_, st.Ts_ ); } -template -inline sutherlandTransport operator== +template +inline Foam::sutherlandTransport Foam::operator== ( - const sutherlandTransport& st1, - const sutherlandTransport& st2 + const sutherlandTransport& st1, + const sutherlandTransport& st2 ) { return st2 - st1; } -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - // ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/thermophysicalProperties index e29c4ca7b7..cb6bd7a7d6 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 86e3e2bb1b..43d943618a 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 16a5a98e21..0433bc0a0d 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 86e3e2bb1b..43d943618a 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 2f276bc52a..697d53b193 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 0bd26dd166..c482d50e2a 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 bdaf26e9fd..4997591ddf 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 e723a52bbe..3f1cabc2c6 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 b0992ad672..977c2b55ff 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 b0992ad672..977c2b55ff 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 3684941cfb..7d8965c40f 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 88958cde6c..7cbec49f1c 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 3d044d0d77..9728c7e286 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 3d044d0d77..9728c7e286 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 3d044d0d77..9728c7e286 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 c849bd357a..9a8420f362 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 dad4948bd2..2915b8b267 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 c849bd357a..9a8420f362 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 dad4948bd2..2915b8b267 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 c849bd357a..9a8420f362 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 dad4948bd2..2915b8b267 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 f2f8305254..5ed23978a5 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; }