From 54a8b6a152f9c26cc99390215fa85663bbb29d12 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Sat, 1 Aug 2009 09:36:34 +0200
Subject: [PATCH] define values for standardCmu, standardKappa, standardE in
 turbulenceModel.H

---
 .../turbulence/PDRkEpsilon/PDRkEpsilon.H      |  6 ++---
 .../solvers/multiphase/bubbleFoam/kEpsilon.H  |  2 +-
 .../createTurbulenceFields.C                  |  6 +++--
 ...ayatillekeWallFunctionFvPatchScalarField.C | 24 +++++++----------
 ...ayatillekeWallFunctionFvPatchScalarField.H |  6 +++++
 .../alphaSgsWallFunctionFvPatchScalarField.C  |  4 +--
 .../alphaSgsWallFunctionFvPatchScalarField.H  |  6 +++++
 .../muSgsWallFunctionFvPatchScalarField.C     | 20 +++++---------
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C | 12 ++++-----
 .../RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H |  4 +--
 .../RAS/LaunderSharmaKE/LaunderSharmaKE.H     |  1 +
 ...thDissipationRateInletFvPatchScalarField.C |  7 +++--
 ...ngLengthFrequencyInletFvPatchScalarField.C | 13 ++++------
 .../alphatWallFunctionFvPatchScalarField.C    | 12 +++------
 .../alphatWallFunctionFvPatchScalarField.H    |  7 +++++
 .../epsilonWallFunctionFvPatchScalarField.C   | 26 +++++++------------
 .../mutWallFunctionFvPatchScalarField.C       | 26 +++++++------------
 .../omegaWallFunctionFvPatchScalarField.C     | 26 +++++++------------
 .../turbulenceModel/turbulenceModel.H         | 12 +++++++++
 .../nuSgsWallFunctionFvPatchScalarField.C     | 20 +++++---------
 ...ngLengthFrequencyInletFvPatchScalarField.C | 13 ++++------
 .../epsilonWallFunctionFvPatchScalarField.C   | 26 +++++++------------
 .../nutWallFunctionFvPatchScalarField.C       | 26 +++++++------------
 .../omegaWallFunctionFvPatchScalarField.C     | 26 +++++++------------
 .../turbulenceModel/turbulenceModel.H         | 12 +++++++++
 25 files changed, 156 insertions(+), 187 deletions(-)

diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
index 5e919efcc44..92615f765d4 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
@@ -27,7 +27,7 @@ Class
 
 Description
     Standard k-epsilon turbulence model with additional source terms
-    corresponding to PDR basic drag model (\link basic.H \endlink)
+    corresponding to PDR basic drag model (@link basic.H @endlink)
 
     The default model coefficients correspond to the following:
     @verbatim
@@ -47,10 +47,10 @@ Description
     \f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to
     interaction with unresolved obstacles.
 
-    In the \f$ \epsilon  \f$ equation \f$ C_{1} G_{R} \f$ is added as a source
+    In the \f$ \epsilon \f$ equation, \f$ C_{1} G_{R} \f$ is added as a source
     term.
 
-    In the \f$ \kappa \f$ equation \f$ G_{R} \f$ is added as a source term.
+    In the \f$ \kappa \f$ equation, \f$ G_{R} \f$ is added as a source term.
 
 SourceFiles
     PDRkEpsilon.C
diff --git a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
index 576e3253abf..84dadd7acb5 100644
--- a/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
+++ b/applications/solvers/multiphase/bubbleFoam/kEpsilon.H
@@ -1,4 +1,4 @@
-if(turbulence)
+if (turbulence)
 {
     if (mesh.changing())
     {
diff --git a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
index 02a8cbd3ab7..f094418ecc9 100644
--- a/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
+++ b/applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
@@ -41,6 +41,10 @@ Source files:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+// turbulence constants - file-scope
+static const scalar Cmu(0.09);
+
+
 int main(int argc, char *argv[])
 {
     timeSelector::addOptions();
@@ -104,8 +108,6 @@ int main(int argc, char *argv[])
 
         if (!IOobject("omega", runTime.timeName(), mesh).headerOk())
         {
-            const scalar Cmu = 0.09;
-
             Info<< "creating omega" << endl;
             volScalarField omega
             (
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 66fb1ae6e8f..c972574631d 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
@@ -46,12 +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  * * * * * * * * * * * //
 
@@ -121,9 +115,9 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    Prt_(defaultPrt_),
-    kappa_(defaultKappa_),
-    E_(defaultE_)
+    Prt_(standardPrt),
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE)
 {
     checkType();
 }
@@ -154,9 +148,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", standardPrt)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE))
 {
     checkType();
 }
@@ -318,9 +312,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", standardPrt, Prt_);
+    writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_);
 
     writeEntry("value", os);
 }
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
index e7f6184d814..40e81e7feb2 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
@@ -93,6 +93,12 @@ class alphaSgsJayatillekeWallFunctionFvPatchScalarField
 
 public:
 
+    // Public data
+
+        //- Standard value for turbulent Prandtl number %Prt
+        static const scalar standardPrt = 0.85;
+
+
     //- Runtime type information
     TypeName("alphaSgsJayatillekeWallFunction");
 
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
index f2c944220a2..8786eb996df 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
@@ -67,7 +67,7 @@ alphaSgsWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    Prt_(0.85)
+    Prt_(standardPrt)
 {
     checkType();
 }
@@ -96,7 +96,7 @@ alphaSgsWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF, dict),
-    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
+    Prt_(dict.lookupOrDefault<scalar>("Prt", standardPrt))
 {
     checkType();
 }
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
index fb738498e75..c178f2455fc 100644
--- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
@@ -70,6 +70,12 @@ class alphaSgsWallFunctionFvPatchScalarField
 
 public:
 
+    // Public data
+
+        //- Standard value for turbulent Prandtl number %Prt
+        static const scalar standardPrt = 0.85;
+
+
     //- Runtime type information
     TypeName("alphaSgsWallFunction");
 
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 e6c779a105b..c8f2dbb14b2 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_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE)
 {}
 
 
@@ -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", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE))
 {}
 
 
@@ -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", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_);
 
     writeEntry("value", os);
 }
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 6d8e6593361..a592a449708 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -183,7 +183,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
         )
     ),
 
-    y_(mesh_),
+    yr_(mesh_),
 
     R_
     (
@@ -371,7 +371,7 @@ void LaunderGibsonRSTM::correct()
 
     if (mesh_.changing())
     {
-        y_.correct();
+        yr_.correct();
     }
 
     volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
@@ -436,10 +436,10 @@ void LaunderGibsonRSTM::correct()
         // wall reflection terms
       + symm
         (
-            I*((y_.n() & reflect) & y_.n())
-          - 1.5*(y_.n()*(reflect & y_.n())
-          + (y_.n() & reflect)*y_.n())
-        )*pow(Cmu_, 0.75)*rho_*pow(k_, 1.5)/(kappa_*y_*epsilon_)
+            I*((yr_.n() & reflect) & yr_.n())
+          - 1.5*(yr_.n()*(reflect & yr_.n())
+          + (yr_.n() & reflect)*yr_.n())
+        )*pow(Cmu_, 0.75)*rho_*pow(k_, 1.5)/(kappa_*yr_*epsilon_)
     );
 
     REqn().relax();
diff --git a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 00db2c304f9..426f964d6a9 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -42,10 +42,10 @@ Description
             C2Ref       0.3;
             Cs          0.25;
             Ceps        0.15;
-            sigmah      1.0;    // only for compressible
             sigmaEps    1.3;
             sigmaR      0.81967;
             couplingFactor  0.0;
+            Prt         1.0;    // only for compressible
         }
     @endverbatim
 
@@ -105,7 +105,7 @@ class LaunderGibsonRSTM
 
         // Fields
 
-            wallDistReflection y_;
+            wallDistReflection yr_;
 
             volSymmTensorField R_;
             volScalarField k_;
diff --git a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index b7c972a662c..c70b558f1b6 100644
--- a/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -40,6 +40,7 @@ Description
             alphah      1.0;    // only for compressible
             alphahk     1.0;    // only for compressible
             alphaEps    0.76923;
+            Prt         1.0;    // only for compressible
         }
     @endverbatim
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index d83cd7bfc25..df420b90b23 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -110,8 +110,11 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
     // Lookup Cmu corresponding to the turbulence model selected
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu =
-        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
+    const scalar Cmu = rasModel.coeffDict().lookupOrDefault<scalar>
+    (
+        "Cmu",
+        turbulenceModel::standardCmu
+    );
 
     const scalar Cmu75 = pow(Cmu, 0.75);
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 1beb48840a6..ebe9f7a8bca 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::
@@ -121,8 +115,11 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     // Lookup Cmu corresponding to the turbulence model selected
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu =
-        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", defaultCmu_);
+    const scalar Cmu = rasModel.coeffDict().lookupOrDefault<scalar>
+    (
+        "Cmu",
+        turbulenceModel::standardCmu
+    );
 
     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 676850c3cdc..b4ca0d02992 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_(standardPrt)
 {}
 
 
@@ -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", standardPrt))
 {}
 
 
@@ -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", standardPrt, Prt_);
     writeEntry("value", os);
 }
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
index 4f21ba6472e..1c1be04d544 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -28,6 +28,7 @@ Class
 Description
     Boundary condition for turbulent thermal diffusivity when using wall
     functions
+
     - replicates OpenFOAM v1.5 (and earlier) behaviour
     - Turbulent Prandtl number defaults to 0.85 if unspecified
 
@@ -69,6 +70,12 @@ class alphatWallFunctionFvPatchScalarField
 
 public:
 
+    // Public data
+
+        //- Standard value for turbulent Prandtl number %Prt
+        static const scalar standardPrt = 0.85;
+
+
     //- Runtime type information
     TypeName("compressible::alphatWallFunction");
 
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 bafabf59436..4106462d167 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_(turbulenceModel::standardCmu),
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE)
 {
     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", turbulenceModel::standardCmu)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE))
 {
     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", turbulenceModel::standardCmu, Cmu_);
+    writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, 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 701a74291c0..7475fabadad 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.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 mutWallFunctionFvPatchScalarField::checkType()
@@ -115,9 +107,9 @@ tmp<scalarField> mutWallFunctionFvPatchScalarField::calcMut() const
 
 void mutWallFunctionFvPatchScalarField::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", turbulenceModel::standardCmu, Cmu_);
+    writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_);
 }
 
 
@@ -130,9 +122,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    Cmu_(defaultCmu_),
-    kappa_(defaultKappa_),
-    E_(defaultE_),
+    Cmu_(turbulenceModel::standardCmu),
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE),
     yPlusLam_(calcYPlusLam(kappa_, E_))
 {}
 
@@ -161,9 +153,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
 )
 :
     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", turbulenceModel::standardCmu)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)),
     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 01489c3917b..467b5377402 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_(turbulenceModel::standardCmu),
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE)
 {
     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", turbulenceModel::standardCmu)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE))
 {
     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", turbulenceModel::standardCmu, Cmu_);
+    writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_);
 
     writeEntry("value", os);
 }
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
index 97638e5e49c..13f7d821c4b 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
@@ -98,6 +98,18 @@ private:
 
 public:
 
+    // Public data
+
+        //- Standard value for turbulence constant %Cmu
+        static const scalar standardCmu = 0.09;
+
+        //- Standard value for turbulence constant %kappa
+        static const scalar standardKappa = 0.41;
+
+        //- Standard value for turbulence constant %E
+        static const scalar standardE = 9.8;
+
+
     //- Runtime type information
     TypeName("turbulenceModel");
 
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 aeabcca8a2e..50a5e179581 100644
--- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "nuSgsWallFunctionFvPatchScalarField.H"
+#include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -38,13 +39,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 +51,8 @@ nuSgsWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     UName_("U"),
     nuName_("nu"),
-    kappa_(defaultKappa_),
-    E_(defaultE_)
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE)
 {}
 
 
@@ -90,8 +84,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", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE))
 {}
 
 
@@ -196,8 +190,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", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, 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 e4b7c01b06c..cdd6282d322 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::
@@ -121,8 +115,11 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     // Lookup Cmu corresponding to the turbulence model selected
     const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    const scalar Cmu =
-        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", defaultCmu_);
+    const scalar Cmu = rasModel.coeffDict().lookupOrDefault<scalar>
+    (
+        "Cmu",
+        turbulenceModel::standardCmu
+    );
 
     const scalar Cmu25 = pow(Cmu, 0.25);
 
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 e1786de4177..c94355d0dfa 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_(turbulenceModel::standardCmu),
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE)
 {
     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", turbulenceModel::standardCmu)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE))
 {
     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", turbulenceModel::standardCmu, Cmu_);
+    writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, 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 466ce5580cb..2821580a370 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.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 nutWallFunctionFvPatchScalarField::checkType()
@@ -114,9 +106,9 @@ tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const
 
 void nutWallFunctionFvPatchScalarField::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", turbulenceModel::standardCmu, Cmu_);
+    writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_);
 }
 
 
@@ -129,9 +121,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 )
 :
     fixedValueFvPatchScalarField(p, iF),
-    Cmu_(defaultCmu_),
-    kappa_(defaultKappa_),
-    E_(defaultE_),
+    Cmu_(turbulenceModel::standardCmu),
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE),
     yPlusLam_(calcYPlusLam(kappa_, E_))
 {
     checkType();
@@ -164,9 +156,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
 )
 :
     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", turbulenceModel::standardCmu)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)),
     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 1ba2d3d0db8..27434d44083 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_(turbulenceModel::standardCmu),
+    kappa_(turbulenceModel::standardKappa),
+    E_(turbulenceModel::standardE)
 {
     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", turbulenceModel::standardCmu)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)),
+    E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE))
 {
     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", turbulenceModel::standardCmu, Cmu_);
+    writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_);
+    writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_);
 
     writeEntry("value", os);
 }
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
index 1474e5dfa34..7b769998b88 100644
--- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
@@ -96,6 +96,18 @@ private:
 
 public:
 
+    // Public data
+
+        //- Standard value for turbulence constant %Cmu
+        static const scalar standardCmu = 0.09;
+
+        //- Standard value for turbulence constant %kappa
+        static const scalar standardKappa = 0.41;
+
+        //- Standard value for turbulence constant %E
+        static const scalar standardE = 9.8;
+
+
     //- Runtime type information
     TypeName("turbulenceModel");
 
-- 
GitLab