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