diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C index 624bf819d86f79d59d83950a3f04b7e5767dbee8..66fb1ae6e8fc3abea25e4777ab8d70ec12b719c9 100644 --- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C @@ -46,6 +46,13 @@ scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxExp_ = 50.0; scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01; label alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10; +//! @cond fileScope +static const scalar defaultPrt_(0.85); +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void alphaSgsJayatillekeWallFunctionFvPatchScalarField::checkType() @@ -114,9 +121,9 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), - Prt_(0.85), - kappa_(0.41), - E_(9.8) + Prt_(defaultPrt_), + kappa_(defaultKappa_), + E_(defaultE_) { checkType(); } @@ -147,9 +154,9 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF, dict), - Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)) + Prt_(dict.lookupOrDefault<scalar>("Prt", defaultPrt_)), + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)) { checkType(); } @@ -311,9 +318,9 @@ void alphaSgsJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField<scalar>::write(os); - writeEntryIfDifferent<scalar>(os, "Prt", 0.85, Prt_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "Prt", defaultPrt_, Prt_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); writeEntry("value", os); } diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C index 3f3c56c4cd2ed8c0102a0500dad73a32bfc90257..e6c779a105ba57207a1b3a2162c0ecc37643bf41 100644 --- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C @@ -39,6 +39,14 @@ namespace compressible namespace LESModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField @@ -51,8 +59,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField UName_("U"), rhoName_("rho"), muName_("mu"), - kappa_(0.41), - E_(9.8) + kappa_(defaultKappa_), + E_(defaultE_) {} @@ -84,8 +92,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField UName_(dict.lookupOrDefault<word>("U", "U")), rhoName_(dict.lookupOrDefault<word>("rho", "rho")), muName_(dict.lookupOrDefault<word>("mu", "mu")), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)) + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)) {} @@ -197,8 +205,8 @@ void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_); writeEntryIfDifferent<word>(os, "mu", "mu", muName_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); writeEntry("value", os); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index 27f2ee8cc8a841083888e965b92e47f1addcc1df..1beb48840a68cfff8c21bda8a34e44585de8b543 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -38,6 +38,12 @@ namespace Foam namespace compressible { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +//! @endcond fileScope + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // turbulentMixingLengthFrequencyInletFvPatchScalarField:: @@ -48,7 +54,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField ) : fixedValueFvPatchField<scalar>(p, iF), - mixingLength_(0.0), + mixingLength_(0.001), kName_("k") {} @@ -116,7 +122,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties"); const scalar Cmu = - rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09); + rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", defaultCmu_); const scalar Cmu25 = pow(Cmu, 0.25); diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index c06ae66c71b75b1be51317afefa1a25ed324ba65..676850c3cdc61fa2fbd2670b7d05d387237728f9 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C @@ -38,6 +38,12 @@ namespace compressible namespace RASModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultPrt_(0.85); +//! @endcond fileScope + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // alphatWallFunctionFvPatchScalarField:: @@ -49,7 +55,7 @@ alphatWallFunctionFvPatchScalarField : fixedValueFvPatchScalarField(p, iF), mutName_("mut"), - Prt_(0.85) + Prt_(defaultPrt_) {} @@ -78,7 +84,7 @@ alphatWallFunctionFvPatchScalarField : fixedValueFvPatchScalarField(p, iF, dict), mutName_(dict.lookupOrDefault<word>("mut", "mut")), - Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)) + Prt_(dict.lookupOrDefault<scalar>("Prt", defaultPrt_)) {} @@ -122,7 +128,7 @@ void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const { fvPatchField<scalar>::write(os); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); - writeEntryIfDifferent<scalar>(os, "Prt", 0.85, Prt_); + writeEntryIfDifferent<scalar>(os, "Prt", defaultPrt_, Prt_); writeEntry("value", os); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index f68c7db44a54828a49e20aa7576f27fcdde3ef48..bafabf5943623f8a6e237cd4dd7f1a1e0a6a51bb 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -40,6 +40,14 @@ namespace compressible namespace RASModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void epsilonWallFunctionFvPatchScalarField::checkType() @@ -71,9 +79,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField rhoName_("rho"), muName_("mu"), mutName_("mut"), - Cmu_(0.09), - kappa_(0.41), - E_(9.8) + Cmu_(defaultCmu_), + kappa_(defaultKappa_), + E_(defaultE_) { checkType(); } @@ -116,9 +124,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField rhoName_(dict.lookupOrDefault<word>("rho", "rho")), muName_(dict.lookupOrDefault<word>("mu", "mu")), mutName_(dict.lookupOrDefault<word>("mut", "mut")), - Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)) + Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)), + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)) { checkType(); } @@ -247,9 +255,9 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); - writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); writeEntry("value", os); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C index 3413844d4453120f311cf7b623c0688649beb9dc..701a74291c009bc5dd73042932acf466b18c8965 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C @@ -40,6 +40,14 @@ namespace compressible namespace RASModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void mutWallFunctionFvPatchScalarField::checkType() @@ -107,9 +115,9 @@ tmp<scalarField> mutWallFunctionFvPatchScalarField::calcMut() const void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const { - writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); } @@ -122,9 +130,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), - Cmu_(0.09), - kappa_(0.41), - E_(9.8), + Cmu_(defaultCmu_), + kappa_(defaultKappa_), + E_(defaultE_), yPlusLam_(calcYPlusLam(kappa_, E_)) {} @@ -153,9 +161,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF, dict), - Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)), + Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)), + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)), yPlusLam_(calcYPlusLam(kappa_, E_)) {} diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index 950dd4593898d91ad06e5ced5026c0e36fc34b08..01489c3917b34db6fcacd2969feb74c2216d2259 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -40,6 +40,14 @@ namespace compressible namespace RASModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void omegaWallFunctionFvPatchScalarField::checkType() @@ -71,9 +79,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField GName_("RASModel::G"), muName_("mu"), mutName_("mut"), - Cmu_(0.09), - kappa_(0.41), - E_(9.8) + Cmu_(defaultCmu_), + kappa_(defaultKappa_), + E_(defaultE_) { checkType(); } @@ -116,9 +124,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField GName_(dict.lookupOrDefault<word>("G", "RASModel::G")), muName_(dict.lookupOrDefault<word>("mu", "mu")), mutName_(dict.lookupOrDefault<word>("mut", "mut")), - Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)) + Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)), + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)) { checkType(); } @@ -236,9 +244,9 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); - writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); writeEntry("value", os); } diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C index 6b65ce327569f7360ee53106e6969559dc447a11..aeabcca8a2e8a0a6011744e3a9ba0dbb1d19e56b 100644 --- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C @@ -38,6 +38,13 @@ namespace incompressible namespace LESModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // nuSgsWallFunctionFvPatchScalarField:: @@ -50,8 +57,8 @@ nuSgsWallFunctionFvPatchScalarField fixedValueFvPatchScalarField(p, iF), UName_("U"), nuName_("nu"), - kappa_(0.41), - E_(9.8) + kappa_(defaultKappa_), + E_(defaultE_) {} @@ -83,8 +90,8 @@ nuSgsWallFunctionFvPatchScalarField fixedValueFvPatchScalarField(p, iF, dict), UName_(dict.lookupOrDefault<word>("U", "U")), nuName_(dict.lookupOrDefault<word>("nu", "nu")), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)) + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)) {} @@ -189,8 +196,8 @@ void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const writeEntryIfDifferent<word>(os, "U", "U", UName_); writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); writeEntry("value", os); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index e59e51125cf34fef4746a8e7fa46339967bff4a6..e4b7c01b06c13f0b9d2a7eba68c2c131a77ef01b 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -38,6 +38,12 @@ namespace Foam namespace incompressible { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +//! @endcond fileScope + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // turbulentMixingLengthFrequencyInletFvPatchScalarField:: @@ -116,7 +122,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties"); const scalar Cmu = - rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09); + rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", defaultCmu_); const scalar Cmu25 = pow(Cmu, 0.25); @@ -137,7 +143,7 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::write fvPatchField<scalar>::write(os); os.writeKeyword("mixingLength") << mixingLength_ << token::END_STATEMENT << nl; - writeEntryIfDifferent<word>(os, "k", "k", kName_); + writeEntryIfDifferent<word>(os, "k", "k", kName_); writeEntry("value", os); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index a6e221842f405d19dd67384bd3f03a75e90f125c..e1786de41778f883606ee38ad6f37f2cf6552df6 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -40,6 +40,14 @@ namespace incompressible namespace RASModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void epsilonWallFunctionFvPatchScalarField::checkType() @@ -70,9 +78,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_("RASModel::G"), nuName_("nu"), nutName_("nut"), - Cmu_(0.09), - kappa_(0.41), - E_(9.8) + Cmu_(defaultCmu_), + kappa_(defaultKappa_), + E_(defaultE_) { checkType(); } @@ -113,9 +121,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(dict.lookupOrDefault<word>("G", "RASModel::G")), nuName_(dict.lookupOrDefault<word>("nu", "nu")), nutName_(dict.lookupOrDefault<word>("nut", "nut")), - Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)) + Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)), + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)) { checkType(); } @@ -235,9 +243,9 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nut", "nut", nutName_); - writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); writeEntry("value", os); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C index af131ecb9e3b98030f0fcfe6c61d0cf03c1f117a..466ce5580cbdd5cf522fe417467c01dedb04c32a 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C @@ -40,6 +40,14 @@ namespace incompressible namespace RASModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // void nutWallFunctionFvPatchScalarField::checkType() @@ -106,9 +114,9 @@ tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const { - writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); } @@ -121,9 +129,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF), - Cmu_(0.09), - kappa_(0.41), - E_(9.8), + Cmu_(defaultCmu_), + kappa_(defaultKappa_), + E_(defaultE_), yPlusLam_(calcYPlusLam(kappa_, E_)) { checkType(); @@ -156,9 +164,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField ) : fixedValueFvPatchScalarField(p, iF, dict), - Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)), + Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)), + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)), yPlusLam_(calcYPlusLam(kappa_, E_)) { checkType(); diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index 1c41104c372c2d86f7cb8e63870b848b19156c0f..1ba2d3d0db816b2e3549e90f45598d090e04cc44 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -40,6 +40,14 @@ namespace incompressible namespace RASModels { +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +//! @cond fileScope +static const scalar defaultCmu_(0.09); +static const scalar defaultKappa_(0.41); +static const scalar defaultE_(9.8); +//! @endcond fileScope + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void omegaWallFunctionFvPatchScalarField::checkType() @@ -70,9 +78,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField GName_("RASModel::G"), nuName_("nu"), nutName_("nut"), - Cmu_(0.09), - kappa_(0.41), - E_(9.8) + Cmu_(defaultCmu_), + kappa_(defaultKappa_), + E_(defaultE_) { checkType(); } @@ -113,9 +121,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField GName_(dict.lookupOrDefault<word>("G", "RASModel::G")), nuName_(dict.lookupOrDefault<word>("nu", "nu")), nutName_(dict.lookupOrDefault<word>("nut", "nut")), - Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)), - kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)), - E_(dict.lookupOrDefault<scalar>("E", 9.8)) + Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)), + kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)), + E_(dict.lookupOrDefault<scalar>("E", defaultE_)) { checkType(); } @@ -225,9 +233,9 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nut", "nut", nutName_); - writeEntryIfDifferent<scalar>(os, "Cmu", 0.09, Cmu_); - writeEntryIfDifferent<scalar>(os, "kappa", 0.41, kappa_); - writeEntryIfDifferent<scalar>(os, "E", 9.8, E_); + writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_); + writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_); + writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_); writeEntry("value", os); }