From 3c5fffcd1ca4923011a7581d6598f69c841f1014 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 18 Oct 2018 12:57:32 +0200 Subject: [PATCH] STYLE: simplify read/write coding for some thermophysicalModels --- .../const/constAnIsoSolidTransport.C | 9 ++++-- .../transport/const/constIsoSolidTransport.C | 9 ++++-- .../exponential/exponentialSolidTransport.C | 26 ++++++++--------- .../polynomial/polynomialSolidTransport.C | 25 ++++++----------- .../polynomial/polynomialSolidTransport.H | 6 ++++ .../equationOfState/Boussinesq/Boussinesq.C | 13 +++++---- .../adiabaticPerfectFluid.C | 16 ++++++----- .../icoPolynomial/icoPolynomial.C | 22 +++++---------- .../icoPolynomial/icoPolynomial.H | 9 ++++++ .../incompressiblePerfectGas.C | 9 ++++-- .../specie/equationOfState/linear/linear.C | 12 ++++---- .../perfectFluid/perfectFluid.C | 12 ++++---- .../equationOfState/rhoConst/rhoConst.C | 10 ++++--- .../specie/specie/specie.C | 12 ++++---- .../specie/thermo/eConst/eConstThermo.C | 11 +++++--- .../specie/thermo/hConst/hConstThermo.C | 11 +++++--- .../thermo/hPolynomial/hPolynomialThermo.C | 25 ++++++----------- .../thermo/hPolynomial/hPolynomialThermo.H | 6 ++++ .../specie/thermo/hRefConst/hRefConstThermo.C | 15 ++++++---- .../specie/thermo/janaf/janafThermo.C | 17 ++++++----- .../logPolynomial/logPolynomialTransport.C | 28 +++---------------- .../logPolynomial/logPolynomialTransport.H | 6 ++++ .../polynomial/polynomialTransport.C | 28 +++---------------- .../polynomial/polynomialTransport.H | 6 ++++ 24 files changed, 171 insertions(+), 172 deletions(-) diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C index b4be7bb153..66df84e4fc 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/const/constAnIsoSolidTransport.C @@ -49,9 +49,12 @@ void Foam::constAnIsoSolidTransport::constAnIsoSolidTransport::write { Thermo::write(os); - dictionary dict("transport"); - dict.add("kappa", kappa_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("transport"); + os.writeEntry("kappa", kappa_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C index 3531060f98..c6ac14b11f 100644 --- a/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/const/constIsoSolidTransport.C @@ -49,9 +49,12 @@ void Foam::constIsoSolidTransport::constIsoSolidTransport::write { Thermo::write(os); - dictionary dict("transport"); - dict.add("kappa", kappa_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("transport"); + os.writeEntry("kappa", kappa_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C index b3a361e559..3bd5b0e959 100644 --- a/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/exponential/exponentialSolidTransport.C @@ -35,15 +35,10 @@ Foam::exponentialSolidTransport::exponentialSolidTransport ) : Thermo(dict), - kappa0_(0.0), - n0_(0.0), - Tref_(0.0) -{ - const dictionary& subDict = dict.subDict("transport"); - subDict.readEntry("kappa0", kappa0_); - subDict.readEntry("n0", n0_); - subDict.readEntry("Tref", Tref_); -} + kappa0_(dict.subDict("transport").get("kappa0")), + n0_(dict.subDict("transport").get("n0")), + Tref_(dict.subDict("transport").get("Tref")) +{} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // @@ -56,11 +51,14 @@ void Foam::exponentialSolidTransport::exponentialSolidTransport::write { Thermo::write(os); - dictionary dict("transport"); - dict.add("kappa0", kappa0_); - dict.add("n0", n0_); - dict.add("Tref", Tref_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("transport"); + os.writeEntry("kappa0", kappa0_); + os.writeEntry("n0", n0_); + os.writeEntry("Tref", Tref_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C index 0a2d0a665f..ffd0883b91 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.C @@ -35,15 +35,8 @@ Foam::polynomialSolidTransport::polynomialSolidTransport ) : Thermo(dict), - kappaCoeffs_ - ( - dict.subDict("transport").lookup - ( - "kappaCoeffs<" + Foam::name(PolySize) + '>' - ) - ) -{ -} + kappaCoeffs_(dict.subDict("transport").lookup(coeffsName("kappa"))) +{} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // @@ -53,14 +46,12 @@ void Foam::polynomialSolidTransport::write(Ostream& os) const { Thermo::write(os); - dictionary dict("transport"); - - dict.add - ( - word("kappaCoeffs<" + Foam::name(PolySize) + '>'), - kappaCoeffs_ - ); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("transport"); + os.writeEntry(coeffsName("kappa"), kappaCoeffs_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H index 3cb7a3b3ec..bb6692d2aa 100644 --- a/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H +++ b/src/thermophysicalModels/solidSpecie/transport/polynomial/polynomialSolidTransport.H @@ -115,6 +115,12 @@ class polynomialSolidTransport // Private Member Functions + //- Coeffs name. Eg, "kappaCoeffs<10>" + inline static word coeffsName(const char* name) + { + return word(name + ("Coeffs<" + std::to_string(PolySize) + '>')); + } + //- Construct from components inline polynomialSolidTransport ( diff --git a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C index 0675f3ff86..85ee7acb5f 100644 --- a/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C +++ b/src/thermophysicalModels/specie/equationOfState/Boussinesq/Boussinesq.C @@ -47,12 +47,15 @@ template void Foam::Boussinesq::write(Ostream& os) const { Specie::write(os); - dictionary dict("equationOfState"); - dict.add("rho0", rho0_); - dict.add("T0", T0_); - dict.add("beta", beta_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("equationOfState"); + os.writeEntry("rho0", rho0_); + os.writeEntry("T0", T0_); + os.writeEntry("beta", beta_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C index 0c2cce5081..a95d1a0510 100644 --- a/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C +++ b/src/thermophysicalModels/specie/equationOfState/adiabaticPerfectFluid/adiabaticPerfectFluid.C @@ -49,13 +49,15 @@ void Foam::adiabaticPerfectFluid::write(Ostream& os) const { Specie::write(os); - dictionary dict("equationOfState"); - dict.add("p0", p0_); - dict.add("rho0", rho0_); - dict.add("gamma", gamma_); - dict.add("B", B_); - - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("equationOfState"); + os.writeEntry("p0", p0_); + os.writeEntry("rho0", rho0_); + os.writeEntry("gamma", gamma_); + os.writeEntry("B", B_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C index fb5b0f5da1..6014db1354 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.C @@ -37,13 +37,7 @@ template icoPolynomial::icoPolynomial(const dictionary& dict) : Specie(dict), - rhoCoeffs_ -( - dict.subDict("equationOfState").lookup - ( - "rhoCoeffs<" + Foam::name(PolySize) + '>' - ) -) + rhoCoeffs_(dict.subDict("equationOfState").lookup(coeffsName("rho"))) {} @@ -54,14 +48,12 @@ void icoPolynomial::write(Ostream& os) const { Specie::write(os); - dictionary dict("equationOfState"); - dict.add - ( - word("rhoCoeffs<" + Foam::name(PolySize) + '>'), - rhoCoeffs_ - ); - - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("equationOfState"); + os.writeEntry(coeffsName("rho"), rhoCoeffs_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H index a024e8320b..f186577a44 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomial.H @@ -123,6 +123,15 @@ class icoPolynomial Polynomial rhoCoeffs_; + // Private Member Functions + + //- Coeffs name. Eg, "rhoCoeffs<10>" + inline static word coeffsName(const char* name) + { + return word(name + ("Coeffs<" + std::to_string(PolySize) + '>')); + } + + public: // Constructors diff --git a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C index ffd1234235..c0947463c1 100644 --- a/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C +++ b/src/thermophysicalModels/specie/equationOfState/incompressiblePerfectGas/incompressiblePerfectGas.C @@ -45,10 +45,13 @@ template void Foam::incompressiblePerfectGas::write(Ostream& os) const { Specie::write(os); - dictionary dict("equationOfState"); - dict.add("pRef", pRef_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("equationOfState"); + os.writeEntry("pRef", pRef_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/equationOfState/linear/linear.C b/src/thermophysicalModels/specie/equationOfState/linear/linear.C index 6f4e2c00f2..a6a20e142f 100644 --- a/src/thermophysicalModels/specie/equationOfState/linear/linear.C +++ b/src/thermophysicalModels/specie/equationOfState/linear/linear.C @@ -44,11 +44,13 @@ void Foam::linear::write(Ostream& os) const { Specie::write(os); - dictionary dict("equationOfState"); - dict.add("psi", psi_); - dict.add("rho0", rho0_); - - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("equationOfState"); + os.writeEntry("psi", psi_); + os.writeEntry("rho0", rho0_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C index 5e161a28a2..9d80be1085 100644 --- a/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C +++ b/src/thermophysicalModels/specie/equationOfState/perfectFluid/perfectFluid.C @@ -44,11 +44,13 @@ void Foam::perfectFluid::write(Ostream& os) const { Specie::write(os); - dictionary dict("equationOfState"); - dict.add("R", R_); - dict.add("rho0", rho0_); - - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("equationOfState"); + os.writeEntry("R", R_); + os.writeEntry("rho0", rho0_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C index 9907eb46f1..7f27b4d95a 100644 --- a/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C +++ b/src/thermophysicalModels/specie/equationOfState/rhoConst/rhoConst.C @@ -43,10 +43,12 @@ void Foam::rhoConst::write(Ostream& os) const { Specie::write(os); - dictionary dict("equationOfState"); - dict.add("rho", rho_); - - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("equationOfState"); + os.writeEntry("rho", rho_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/specie/specie.C b/src/thermophysicalModels/specie/specie/specie.C index 58c7a52db1..fde2ad5ebf 100644 --- a/src/thermophysicalModels/specie/specie/specie.C +++ b/src/thermophysicalModels/specie/specie/specie.C @@ -39,7 +39,7 @@ namespace Foam Foam::specie::specie(const dictionary& dict) : name_(dict.dictName()), - Y_(dict.subDict("specie").lookupOrDefault("massFraction", 1.0)), + Y_(dict.subDict("specie").lookupOrDefault("massFraction", 1)), molWeight_(dict.subDict("specie").get("molWeight")) {} @@ -48,13 +48,13 @@ Foam::specie::specie(const dictionary& dict) void Foam::specie::write(Ostream& os) const { - dictionary dict("specie"); - if (Y_ != 1) + // Entries in dictionary format { - dict.add("massFraction", Y_); + os.beginBlock("specie"); + os.writeEntryIfDifferent("massFraction", 1, Y_); + os.writeEntry("molWeight", molWeight_); + os.endBlock(); } - dict.add("molWeight", molWeight_); - os << indent << dict.dictName() << dict; } diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C index d2768bfd78..27b605532b 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.C @@ -44,10 +44,13 @@ void Foam::eConstThermo::write(Ostream& os) const { EquationOfState::write(os); - dictionary dict("thermodynamics"); - dict.add("Cv", Cv_); - dict.add("Hf", Hf_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("thermodynamics"); + os.writeEntry("Cv", Cv_); + os.writeEntry("Hf", Hf_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C index 37f027ce83..57583dbc06 100644 --- a/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C +++ b/src/thermophysicalModels/specie/thermo/hConst/hConstThermo.C @@ -44,10 +44,13 @@ void Foam::hConstThermo::write(Ostream& os) const { EquationOfState::write(os); - dictionary dict("thermodynamics"); - dict.add("Cp", Cp_); - dict.add("Hf", Hf_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("thermodynamics"); + os.writeEntry("Cp", Cp_); + os.writeEntry("Hf", Hf_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C index c0d34b9075..23f8775fce 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C @@ -37,13 +37,7 @@ Foam::hPolynomialThermo::hPolynomialThermo EquationOfState(dict), Hf_(dict.subDict("thermodynamics").get("Hf")), Sf_(dict.subDict("thermodynamics").get("Sf")), - CpCoeffs_ - ( - dict.subDict("thermodynamics").lookup - ( - "CpCoeffs<" + Foam::name(PolySize) + '>' - ) - ), + CpCoeffs_(dict.subDict("thermodynamics").lookup(coeffsName("Cp"))), hCoeffs_(), sCoeffs_() { @@ -68,15 +62,14 @@ void Foam::hPolynomialThermo::write { EquationOfState::write(os); - dictionary dict("thermodynamics"); - dict.add("Hf", Hf_); - dict.add("Sf", Sf_); - dict.add - ( - word("CpCoeffs<" + Foam::name(PolySize) + '>'), - CpCoeffs_ - ); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("thermodynamics"); + os.writeEntry("Hf", Hf_); + os.writeEntry("Sf", Sf_); + os.writeEntry(coeffsName("Cp"), CpCoeffs_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H index ca1a873bf9..46ee92d114 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.H @@ -148,6 +148,12 @@ class hPolynomialThermo // Private Member Functions + //- Coeffs name. Eg, "CpCoeffs<10>" + inline static word coeffsName(const char* name) + { + return word(name + ("Coeffs<" + std::to_string(PolySize) + '>')); + } + //- Construct from components inline hPolynomialThermo ( diff --git a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C index 3dd8a7f063..027bcc500e 100644 --- a/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C +++ b/src/thermophysicalModels/specie/thermo/hRefConst/hRefConstThermo.C @@ -46,12 +46,15 @@ void Foam::hRefConstThermo::write(Ostream& os) const { EquationOfState::write(os); - dictionary dict("thermodynamics"); - dict.add("Cp", Cp_); - dict.add("Hf", Hf_); - dict.add("Tref", Tref_); - dict.add("Href", Href_); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("thermodynamics"); + os.writeEntry("Cp", Cp_); + os.writeEntry("Hf", Hf_); + os.writeEntry("Tref", Tref_); + os.writeEntry("Href", Href_); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C index 306ad79efa..5ca7f9b572 100644 --- a/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C +++ b/src/thermophysicalModels/specie/thermo/janaf/janafThermo.C @@ -93,13 +93,16 @@ void Foam::janafThermo::write(Ostream& os) const lowCpCoeffs[coefLabel] = lowCpCoeffs_[coefLabel]/this->R(); } - dictionary dict("thermodynamics"); - dict.add("Tlow", Tlow_); - dict.add("Thigh", Thigh_); - dict.add("Tcommon", Tcommon_); - dict.add("highCpCoeffs", highCpCoeffs); - dict.add("lowCpCoeffs", lowCpCoeffs); - os << indent << dict.dictName() << dict; + // Entries in dictionary format + { + os.beginBlock("thermodynamics"); + os.writeEntry("Tlow", Tlow_); + os.writeEntry("Thigh", Thigh_); + os.writeEntry("Tcommon", Tcommon_); + os.writeEntry("highCpCoeffs", highCpCoeffs); + os.writeEntry("lowCpCoeffs", lowCpCoeffs); + os.endBlock(); + } } diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C index b35e2003df..020e47b99d 100644 --- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C +++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.C @@ -35,20 +35,8 @@ Foam::logPolynomialTransport::logPolynomialTransport ) : Thermo(dict), - muCoeffs_ - ( - dict.subDict("transport").lookup - ( - "muLogCoeffs<" + Foam::name(PolySize) + '>' - ) - ), - kappaCoeffs_ - ( - dict.subDict("transport").lookup - ( - "kappaLogCoeffs<" + Foam::name(PolySize) + '>' - ) - ) + muCoeffs_(dict.subDict("transport").lookup(coeffsName("mu"))), + kappaCoeffs_(dict.subDict("transport").lookup(coeffsName("kappa"))) {} @@ -64,16 +52,8 @@ void Foam::logPolynomialTransport::write(Ostream& os) const // Entries in dictionary format { os.beginBlock("transport"); - os.writeEntry - ( - word("muLogCoeffs<" + Foam::name(PolySize) + '>'), - muCoeffs_ - ); - os.writeEntry - ( - word("kappaLogCoeffs<" + Foam::name(PolySize) + '>'), - kappaCoeffs_ - ); + os.writeEntry(coeffsName("mu"), muCoeffs_); + os.writeEntry(coeffsName("kappa"), kappaCoeffs_); os.endBlock(); } diff --git a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H index 2eb3b4bc41..01039542d5 100644 --- a/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H +++ b/src/thermophysicalModels/specie/transport/logPolynomial/logPolynomialTransport.H @@ -139,6 +139,12 @@ class logPolynomialTransport // Private Member Functions + //- Coeffs name. Eg, "muLogCoeffs<10>" + inline static word coeffsName(const char* name) + { + return word(name + ("LogCoeffs<" + std::to_string(PolySize) + '>')); + } + //- Construct from components inline logPolynomialTransport ( diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C index 88331a715c..c5ea5d784b 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.C @@ -35,20 +35,8 @@ Foam::polynomialTransport::polynomialTransport ) : Thermo(dict), - muCoeffs_ - ( - dict.subDict("transport").lookup - ( - "muCoeffs<" + Foam::name(PolySize) + '>' - ) - ), - kappaCoeffs_ - ( - dict.subDict("transport").lookup - ( - "kappaCoeffs<" + Foam::name(PolySize) + '>' - ) - ) + muCoeffs_(dict.subDict("transport").lookup(coeffsName("mu"))), + kappaCoeffs_(dict.subDict("transport").lookup(coeffsName("kappa"))) {} @@ -64,16 +52,8 @@ void Foam::polynomialTransport::write(Ostream& os) const // Entries in dictionary format { os.beginBlock("transport"); - os.writeEntry - ( - word("muCoeffs<" + Foam::name(PolySize) + '>'), - muCoeffs_ - ); - os.writeEntry - ( - word("kappaCoeffs<" + Foam::name(PolySize) + '>'), - kappaCoeffs_ - ); + os.writeEntry(coeffsName("mu"), muCoeffs_); + os.writeEntry(coeffsName("kappa"), kappaCoeffs_); os.endBlock(); } diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H index ef5a2eb14f..2e41806057 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransport.H @@ -128,6 +128,12 @@ class polynomialTransport // Private Member Functions + //- Coeffs name. Eg, "muCoeffs<10>" + inline static word coeffsName(const char* name) + { + return word(name + ("Coeffs<" + std::to_string(PolySize) + '>')); + } + //- Construct from components inline polynomialTransport (