From ea3ba49f52545a6e08156907c9d8c5cb5b04bd21 Mon Sep 17 00:00:00 2001 From: Sergio Ferraris Date: Fri, 14 Jun 2013 12:05:29 +0100 Subject: [PATCH] STY: Correcting templates names and correcting write member function in polynomialSolidTransport --- .../include/solidThermoPhysicsTypes.H | 2 +- .../const/constAnIsoSolidTransport.C | 20 +++--- .../exponential/exponentialSolidTransport.C | 20 +++--- .../exponential/exponentialSolidTransportI.H | 71 +++++++++---------- .../polynomial/polynomialSolidTransport.C | 5 -- .../circuitBoardCooling/0.org/p_rgh | 2 +- 6 files changed, 54 insertions(+), 66 deletions(-) diff --git a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H index 7ecbb075eb..b7eac0fc3f 100644 --- a/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H +++ b/src/thermophysicalModels/solidSpecie/include/solidThermoPhysicsTypes.H @@ -77,7 +77,7 @@ namespace Foam > hExponentialSolidThermoPhysics; - typedef + typedef polynomialSolidTransport < species::thermo diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C index e2c5ae6719..bef8102944 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,26 +28,26 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::constAnIsoSolidTransport::constAnIsoSolidTransport +template +Foam::constAnIsoSolidTransport::constAnIsoSolidTransport ( const dictionary& dict ) : - thermo(dict), + Thermo(dict), kappa_(dict.subDict("transport").lookup("kappa")) {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::constAnIsoSolidTransport::constAnIsoSolidTransport::write +template +void Foam::constAnIsoSolidTransport::constAnIsoSolidTransport::write ( Ostream& os ) const { - thermo::write(os); + Thermo::write(os); dictionary dict("transport"); dict.add("kappa", kappa_); @@ -57,14 +57,14 @@ void Foam::constAnIsoSolidTransport::constAnIsoSolidTransport::write // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -template +template Foam::Ostream& Foam::operator<< ( Ostream& os, - const constAnIsoSolidTransport& ct + const constAnIsoSolidTransport& ct ) { - operator<<(os, static_cast(ct)); + operator<<(os, static_cast(ct)); os << tab << ct.kappa_; os.check diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C index 10070c48ba..24abeac8ae 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,13 +28,13 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::exponentialSolidTransport::exponentialSolidTransport +template +Foam::exponentialSolidTransport::exponentialSolidTransport ( const dictionary& dict ) : - thermo(dict), + Thermo(dict), kappa0_(0.0), n0_(0.0), Tref_(0.0) @@ -48,13 +48,13 @@ Foam::exponentialSolidTransport::exponentialSolidTransport // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::exponentialSolidTransport::exponentialSolidTransport::write +template +void Foam::exponentialSolidTransport::exponentialSolidTransport::write ( Ostream& os ) const { - thermo::write(os); + Thermo::write(os); dictionary dict("transport"); dict.add("kappa0", kappa0_); @@ -66,13 +66,13 @@ void Foam::exponentialSolidTransport::exponentialSolidTransport::write // * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -template +template Foam::Ostream& Foam::operator<< ( - Ostream& os, const exponentialSolidTransport& et + Ostream& os, const exponentialSolidTransport& et ) { - operator<<(os, static_cast(et)); + operator<<(os, static_cast(et)); os << tab << et.kappa0_ << tab << et.n0_ << tab << et.Tref_; os.check diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H index 547c2e0be9..36105ceb44 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H +++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,30 +25,30 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -inline Foam::exponentialSolidTransport::exponentialSolidTransport +template +inline Foam::exponentialSolidTransport::exponentialSolidTransport ( - const thermo& t, + const Thermo& t, const scalar kappa0, const scalar n0, const scalar Tref ) : - thermo(t), + Thermo(t), kappa0_(kappa0), n0_(n0), Tref_(Tref) {} -template -inline Foam::exponentialSolidTransport::exponentialSolidTransport +template +inline Foam::exponentialSolidTransport::exponentialSolidTransport ( const word& name, const exponentialSolidTransport& ct ) : - thermo(name, ct), + Thermo(name, ct), kappa0_(ct.kappa0_), n0_(ct.n0_), Tref_(ct.Tref_) @@ -70,8 +70,8 @@ Foam::exponentialSolidTransport::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -inline Foam::scalar Foam::exponentialSolidTransport::kappa +template +inline Foam::scalar Foam::exponentialSolidTransport::kappa ( const scalar p, const scalar T ) const @@ -80,8 +80,8 @@ inline Foam::scalar Foam::exponentialSolidTransport::kappa } -template -inline Foam::vector Foam::exponentialSolidTransport::Kappa +template +inline Foam::vector Foam::exponentialSolidTransport::Kappa ( const scalar p, const scalar T ) const @@ -91,13 +91,13 @@ inline Foam::vector Foam::exponentialSolidTransport::Kappa } -template -inline Foam::scalar Foam::exponentialSolidTransport:: +template +inline Foam::scalar Foam::exponentialSolidTransport:: mu(const scalar p, const scalar T) const { notImplemented ( - "Foam::scalar Foam::exponentialSolidTransportmu::" + "Foam::scalar Foam::exponentialSolidTransportmu::" "(" " const scalar p, const scalar T" ") const" @@ -106,8 +106,8 @@ mu(const scalar p, const scalar T) const } -template -inline Foam::scalar Foam::exponentialSolidTransport:: +template +inline Foam::scalar Foam::exponentialSolidTransport:: alphah(const scalar p, const scalar T) const { return kappa(p, T)/this->Cpv(p, T); @@ -116,33 +116,28 @@ alphah(const scalar p, const scalar T) const // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -template -inline Foam::exponentialSolidTransport& -Foam::exponentialSolidTransport::operator= +template +inline Foam::exponentialSolidTransport& +Foam::exponentialSolidTransport::operator= ( - const exponentialSolidTransport& ct + const exponentialSolidTransport& ct ) { - //thermo::operator=(ct); - kappa0_ = ct.kappa0_; n0_ = ct.n0_; Tref_ = ct.Tref_; - return *this; } -template -inline void Foam::exponentialSolidTransport::operator+= +template +inline void Foam::exponentialSolidTransport::operator+= ( - const exponentialSolidTransport& ct + const exponentialSolidTransport& ct ) { scalar molr1 = this->nMoles(); - //thermo::operator+=(ct); - molr1 /= this->nMoles(); scalar molr2 = ct.nMoles()/this->nMoles(); @@ -152,16 +147,14 @@ inline void Foam::exponentialSolidTransport::operator+= } -template -inline void Foam::exponentialSolidTransport::operator-= +template +inline void Foam::exponentialSolidTransport::operator-= ( - const exponentialSolidTransport& ct + const exponentialSolidTransport& ct ) { scalar molr1 = this->nMoles(); - //thermo::operator-=(ct); - molr1 /= this->nMoles(); scalar molr2 = ct.nMoles()/this->nMoles(); @@ -173,16 +166,16 @@ inline void Foam::exponentialSolidTransport::operator-= // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -template -inline Foam::exponentialSolidTransport Foam::operator* +template +inline Foam::exponentialSolidTransport Foam::operator* ( const scalar s, - const exponentialSolidTransport& ct + const exponentialSolidTransport& ct ) { - return exponentialSolidTransport + return exponentialSolidTransport ( - s*static_cast(ct), + s*static_cast(ct), ct.kappa0_, ct.n0_, ct.Tref_ diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C index 7bddd6d822..e43b30a2e8 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C @@ -63,9 +63,6 @@ Foam::polynomialSolidTransport::polynomialSolidTransport template void Foam::polynomialSolidTransport::write(Ostream& os) const { - os << this->name() << endl; - os << token::BEGIN_BLOCK << incrIndent << nl; - Thermo::write(os); dictionary dict("transport"); @@ -76,8 +73,6 @@ void Foam::polynomialSolidTransport::write(Ostream& os) const kappaCoeffs_ ); os << indent << dict.dictName() << dict; - - os << decrIndent << token::END_BLOCK << nl; } diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh index 26fa39b255..9fa4a5a2c8 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh +++ b/tutorials/heatTransfer/buoyantSimpleFoam/circuitBoardCooling/0.org/p_rgh @@ -38,7 +38,7 @@ boundaryField } outlet { - type fixedFluxPressure; + type fixedValue; value $internalField; } fixedWalls