zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "define values for standardCmu, standardKappa, standardE in turbulenceModel.H"

Browse Source 
This reverts commit 54a8b6a152.
This commit is contained in:
Mark Olesen
2009-08-03 15:31:14 +02:00
parent e211ff7dab
commit 7a8a318312
25 changed files with 187 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H
View File

@ -27,7 +27,7 @@ Class
Description Description
Standard k-epsilon turbulence model with additional source terms 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: The default model coefficients correspond to the following:
@verbatim @verbatim
@ -47,10 +47,10 @@ Description
\f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to \f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to
interaction with unresolved obstacles. 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. 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 SourceFiles
PDRkEpsilon.C PDRkEpsilon.C

6
applications/utilities/postProcessing/turbulence/createTurbulenceFields/createTurbulenceFields.C
View File

@ -41,10 +41,6 @@ Source files:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
// turbulence constants - file-scope
static const scalar Cmu(0.09);
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
timeSelector::addOptions(); timeSelector::addOptions();
@ -108,6 +104,8 @@ int main(int argc, char *argv[])
if (!IOobject("omega", runTime.timeName(), mesh).headerOk()) if (!IOobject("omega", runTime.timeName(), mesh).headerOk())
{ {
const scalar Cmu = 0.09;
Info<< "creating omega" << endl; Info<< "creating omega" << endl;
volScalarField omega volScalarField omega
( (

24
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
View File

@ -46,6 +46,12 @@ scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxExp_ = 50.0;
scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01; scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01;
label alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10; 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 * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -115,9 +121,9 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF), fixedValueFvPatchScalarField(p, iF),
Prt_(standardPrt), Prt_(defaultPrt_),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE) E_(defaultE_)
{ {
checkType(); checkType();
} }
@ -148,9 +154,9 @@ alphaSgsJayatillekeWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF, dict), fixedValueFvPatchScalarField(p, iF, dict),
Prt_(dict.lookupOrDefault<scalar>("Prt", standardPrt)), Prt_(dict.lookupOrDefault<scalar>("Prt", defaultPrt_)),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)) E_(dict.lookupOrDefault<scalar>("E", defaultE_))
{ {
checkType(); checkType();
} }
@ -312,9 +318,9 @@ void alphaSgsJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fvPatchField<scalar>::write(os); fvPatchField<scalar>::write(os);
writeEntryIfDifferent<scalar>(os, "Prt", standardPrt, Prt_); writeEntryIfDifferent<scalar>(os, "Prt", defaultPrt_, Prt_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
writeEntry("value", os); writeEntry("value", os);
} }

6
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
View File

@ -93,12 +93,6 @@ class alphaSgsJayatillekeWallFunctionFvPatchScalarField
public: public:
// Public data
//- Standard value for turbulent Prandtl number %Prt
static const scalar standardPrt = 0.85;
//- Runtime type information //- Runtime type information
TypeName("alphaSgsJayatillekeWallFunction"); TypeName("alphaSgsJayatillekeWallFunction");

4
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
View File

@ -67,7 +67,7 @@ alphaSgsWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF), fixedValueFvPatchScalarField(p, iF),
Prt_(standardPrt) Prt_(0.85)
{ {
checkType(); checkType();
} }
@ -96,7 +96,7 @@ alphaSgsWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF, dict), fixedValueFvPatchScalarField(p, iF, dict),
Prt_(dict.lookupOrDefault<scalar>("Prt", standardPrt)) Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
{ {
checkType(); checkType();
} }

6
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
View File

@ -70,12 +70,6 @@ class alphaSgsWallFunctionFvPatchScalarField
public: public:
// Public data
//- Standard value for turbulent Prandtl number %Prt
static const scalar standardPrt = 0.85;
//- Runtime type information //- Runtime type information
TypeName("alphaSgsWallFunction"); TypeName("alphaSgsWallFunction");

20
src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
View File

@ -39,6 +39,14 @@ namespace compressible
namespace LESModels namespace LESModels
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
//! @cond fileScope
static const scalar defaultKappa_(0.41);
static const scalar defaultE_(9.8);
//! @endcond fileScope
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
@ -51,8 +59,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
UName_("U"), UName_("U"),
rhoName_("rho"), rhoName_("rho"),
muName_("mu"), muName_("mu"),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE) E_(defaultE_)
{} {}
@ -84,8 +92,8 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
UName_(dict.lookupOrDefault<word>("U", "U")), UName_(dict.lookupOrDefault<word>("U", "U")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")), rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
muName_(dict.lookupOrDefault<word>("mu", "mu")), muName_(dict.lookupOrDefault<word>("mu", "mu")),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)) 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, "rho", "rho", rhoName_);
writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
writeEntry("value", os); writeEntry("value", os);
} }

12
src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View File

@ -183,7 +183,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
) )
), ),
yr_(mesh_), y_(mesh_),
R_ R_
( (
@ -371,7 +371,7 @@ void LaunderGibsonRSTM::correct()
if (mesh_.changing()) if (mesh_.changing())
{ {
yr_.correct(); y_.correct();
} }
volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_)); volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
@ -436,10 +436,10 @@ void LaunderGibsonRSTM::correct()
// wall reflection terms // wall reflection terms
+ symm + symm
( (
I*((yr_.n() & reflect) & yr_.n()) I*((y_.n() & reflect) & y_.n())
- 1.5*(yr_.n()*(reflect & yr_.n()) - 1.5*(y_.n()*(reflect & y_.n())
+ (yr_.n() & reflect)*yr_.n()) + (y_.n() & reflect)*y_.n())
)*pow(Cmu_, 0.75)*rho_*pow(k_, 1.5)/(kappa_*yr_*epsilon_) )*pow(Cmu_, 0.75)*rho_*pow(k_, 1.5)/(kappa_*y_*epsilon_)
); );
REqn().relax(); REqn().relax();

4
src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
View File

@ -42,10 +42,10 @@ Description
C2Ref 0.3; C2Ref 0.3;
Cs 0.25; Cs 0.25;
Ceps 0.15; Ceps 0.15;
sigmah 1.0; // only for compressible
sigmaEps 1.3; sigmaEps 1.3;
sigmaR 0.81967; sigmaR 0.81967;
couplingFactor 0.0; couplingFactor 0.0;
Prt 1.0; // only for compressible
} }
@endverbatim @endverbatim
@ -105,7 +105,7 @@ class LaunderGibsonRSTM
// Fields // Fields
wallDistReflection yr_; wallDistReflection y_;
volSymmTensorField R_; volSymmTensorField R_;
volScalarField k_; volScalarField k_;

1
src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
View File

@ -40,7 +40,6 @@ Description
alphah 1.0; // only for compressible alphah 1.0; // only for compressible
alphahk 1.0; // only for compressible alphahk 1.0; // only for compressible
alphaEps 0.76923; alphaEps 0.76923;
Prt 1.0; // only for compressible
} }
@endverbatim @endverbatim

7
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
View File

@ -110,11 +110,8 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
// Lookup Cmu corresponding to the turbulence model selected // Lookup Cmu corresponding to the turbulence model selected
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties"); const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu = rasModel.coeffDict().lookupOrDefault<scalar> const scalar Cmu =
( rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
"Cmu",
turbulenceModel::standardCmu
);
const scalar Cmu75 = pow(Cmu, 0.75); const scalar Cmu75 = pow(Cmu, 0.75);

13
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
View File

@ -38,6 +38,12 @@ namespace Foam
namespace compressible namespace compressible
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
//! @cond fileScope
static const scalar defaultCmu_(0.09);
//! @endcond fileScope
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
turbulentMixingLengthFrequencyInletFvPatchScalarField:: turbulentMixingLengthFrequencyInletFvPatchScalarField::
@ -115,11 +121,8 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
// Lookup Cmu corresponding to the turbulence model selected // Lookup Cmu corresponding to the turbulence model selected
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties"); const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu = rasModel.coeffDict().lookupOrDefault<scalar> const scalar Cmu =
( rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", defaultCmu_);
"Cmu",
turbulenceModel::standardCmu
);
const scalar Cmu25 = pow(Cmu, 0.25); const scalar Cmu25 = pow(Cmu, 0.25);

12
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
View File

@ -38,6 +38,12 @@ namespace compressible
namespace RASModels namespace RASModels
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
//! @cond fileScope
static const scalar defaultPrt_(0.85);
//! @endcond fileScope
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
alphatWallFunctionFvPatchScalarField:: alphatWallFunctionFvPatchScalarField::
@ -49,7 +55,7 @@ alphatWallFunctionFvPatchScalarField
: :
fixedValueFvPatchScalarField(p, iF), fixedValueFvPatchScalarField(p, iF),
mutName_("mut"), mutName_("mut"),
Prt_(standardPrt) Prt_(defaultPrt_)
{} {}
@ -78,7 +84,7 @@ alphatWallFunctionFvPatchScalarField
: :
fixedValueFvPatchScalarField(p, iF, dict), fixedValueFvPatchScalarField(p, iF, dict),
mutName_(dict.lookupOrDefault<word>("mut", "mut")), mutName_(dict.lookupOrDefault<word>("mut", "mut")),
Prt_(dict.lookupOrDefault<scalar>("Prt", standardPrt)) Prt_(dict.lookupOrDefault<scalar>("Prt", defaultPrt_))
{} {}
@ -122,7 +128,7 @@ void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
{ {
fvPatchField<scalar>::write(os); fvPatchField<scalar>::write(os);
writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
writeEntryIfDifferent<scalar>(os, "Prt", standardPrt, Prt_); writeEntryIfDifferent<scalar>(os, "Prt", defaultPrt_, Prt_);
writeEntry("value", os); writeEntry("value", os);
} }

7
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
View File

@ -28,7 +28,6 @@ Class
Description Description
Boundary condition for turbulent thermal diffusivity when using wall Boundary condition for turbulent thermal diffusivity when using wall
functions functions
- replicates OpenFOAM v1.5 (and earlier) behaviour - replicates OpenFOAM v1.5 (and earlier) behaviour
- Turbulent Prandtl number defaults to 0.85 if unspecified - Turbulent Prandtl number defaults to 0.85 if unspecified
@ -70,12 +69,6 @@ class alphatWallFunctionFvPatchScalarField
public: public:
// Public data
//- Standard value for turbulent Prandtl number %Prt
static const scalar standardPrt = 0.85;
//- Runtime type information //- Runtime type information
TypeName("compressible::alphatWallFunction"); TypeName("compressible::alphatWallFunction");

26
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
View File

@ -40,6 +40,14 @@ namespace compressible
namespace RASModels 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 * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void epsilonWallFunctionFvPatchScalarField::checkType() void epsilonWallFunctionFvPatchScalarField::checkType()
@ -71,9 +79,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
rhoName_("rho"), rhoName_("rho"),
muName_("mu"), muName_("mu"),
mutName_("mut"), mutName_("mut"),
Cmu_(turbulenceModel::standardCmu), Cmu_(defaultCmu_),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE) E_(defaultE_)
{ {
checkType(); checkType();
} }
@ -116,9 +124,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
rhoName_(dict.lookupOrDefault<word>("rho", "rho")), rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
muName_(dict.lookupOrDefault<word>("mu", "mu")), muName_(dict.lookupOrDefault<word>("mu", "mu")),
mutName_(dict.lookupOrDefault<word>("mut", "mut")), mutName_(dict.lookupOrDefault<word>("mut", "mut")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", turbulenceModel::standardCmu)), Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)) E_(dict.lookupOrDefault<scalar>("E", defaultE_))
{ {
checkType(); checkType();
} }
@ -247,9 +255,9 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
writeEntryIfDifferent<scalar>(os, "Cmu", turbulenceModel::standardCmu, Cmu_); writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
writeEntry("value", os); writeEntry("value", os);
} }

26
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
View File

@ -40,6 +40,14 @@ namespace compressible
namespace RASModels 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 * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void mutWallFunctionFvPatchScalarField::checkType() void mutWallFunctionFvPatchScalarField::checkType()
@ -107,9 +115,9 @@ tmp<scalarField> mutWallFunctionFvPatchScalarField::calcMut() const
void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{ {
writeEntryIfDifferent<scalar>(os, "Cmu", turbulenceModel::standardCmu, Cmu_); writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
} }
@ -122,9 +130,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF), fixedValueFvPatchScalarField(p, iF),
Cmu_(turbulenceModel::standardCmu), Cmu_(defaultCmu_),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE), E_(defaultE_),
yPlusLam_(calcYPlusLam(kappa_, E_)) yPlusLam_(calcYPlusLam(kappa_, E_))
{} {}
@ -153,9 +161,9 @@ mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF, dict), fixedValueFvPatchScalarField(p, iF, dict),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", turbulenceModel::standardCmu)), Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)), E_(dict.lookupOrDefault<scalar>("E", defaultE_)),
yPlusLam_(calcYPlusLam(kappa_, E_)) yPlusLam_(calcYPlusLam(kappa_, E_))
{} {}

26
src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
View File

@ -40,6 +40,14 @@ namespace compressible
namespace RASModels 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 * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void omegaWallFunctionFvPatchScalarField::checkType() void omegaWallFunctionFvPatchScalarField::checkType()
@ -71,9 +79,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
GName_("RASModel::G"), GName_("RASModel::G"),
muName_("mu"), muName_("mu"),
mutName_("mut"), mutName_("mut"),
Cmu_(turbulenceModel::standardCmu), Cmu_(defaultCmu_),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE) E_(defaultE_)
{ {
checkType(); checkType();
} }
@ -116,9 +124,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
GName_(dict.lookupOrDefault<word>("G", "RASModel::G")), GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
muName_(dict.lookupOrDefault<word>("mu", "mu")), muName_(dict.lookupOrDefault<word>("mu", "mu")),
mutName_(dict.lookupOrDefault<word>("mut", "mut")), mutName_(dict.lookupOrDefault<word>("mut", "mut")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", turbulenceModel::standardCmu)), Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)) E_(dict.lookupOrDefault<scalar>("E", defaultE_))
{ {
checkType(); checkType();
} }
@ -236,9 +244,9 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "mu", "mu", muName_); writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
writeEntryIfDifferent<word>(os, "mut", "mut", mutName_); writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
writeEntryIfDifferent<scalar>(os, "Cmu", turbulenceModel::standardCmu, Cmu_); writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
writeEntry("value", os); writeEntry("value", os);
} }

12
src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
View File

@ -98,18 +98,6 @@ private:
public: 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 //- Runtime type information
TypeName("turbulenceModel"); TypeName("turbulenceModel");

20
src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
View File

@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "nuSgsWallFunctionFvPatchScalarField.H" #include "nuSgsWallFunctionFvPatchScalarField.H"
#include "LESModel.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volFields.H" #include "volFields.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -39,6 +38,13 @@ namespace incompressible
namespace LESModels namespace LESModels
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
//! @cond fileScope
static const scalar defaultKappa_(0.41);
static const scalar defaultE_(9.8);
//! @endcond fileScope
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
nuSgsWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField::
@ -51,8 +57,8 @@ nuSgsWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(p, iF), fixedValueFvPatchScalarField(p, iF),
UName_("U"), UName_("U"),
nuName_("nu"), nuName_("nu"),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE) E_(defaultE_)
{} {}
@ -84,8 +90,8 @@ nuSgsWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(p, iF, dict), fixedValueFvPatchScalarField(p, iF, dict),
UName_(dict.lookupOrDefault<word>("U", "U")), UName_(dict.lookupOrDefault<word>("U", "U")),
nuName_(dict.lookupOrDefault<word>("nu", "nu")), nuName_(dict.lookupOrDefault<word>("nu", "nu")),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)) E_(dict.lookupOrDefault<scalar>("E", defaultE_))
{} {}
@ -190,8 +196,8 @@ void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "U", "U", UName_); writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
writeEntry("value", os); writeEntry("value", os);
} }

13
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
View File

@ -38,6 +38,12 @@ namespace Foam
namespace incompressible namespace incompressible
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
//! @cond fileScope
static const scalar defaultCmu_(0.09);
//! @endcond fileScope
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
turbulentMixingLengthFrequencyInletFvPatchScalarField:: turbulentMixingLengthFrequencyInletFvPatchScalarField::
@ -115,11 +121,8 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
// Lookup Cmu corresponding to the turbulence model selected // Lookup Cmu corresponding to the turbulence model selected
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties"); const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
const scalar Cmu = rasModel.coeffDict().lookupOrDefault<scalar> const scalar Cmu =
( rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", defaultCmu_);
"Cmu",
turbulenceModel::standardCmu
);
const scalar Cmu25 = pow(Cmu, 0.25); const scalar Cmu25 = pow(Cmu, 0.25);

26
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
View File

@ -40,6 +40,14 @@ namespace incompressible
namespace RASModels 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 * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void epsilonWallFunctionFvPatchScalarField::checkType() void epsilonWallFunctionFvPatchScalarField::checkType()
@ -70,9 +78,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
GName_("RASModel::G"), GName_("RASModel::G"),
nuName_("nu"), nuName_("nu"),
nutName_("nut"), nutName_("nut"),
Cmu_(turbulenceModel::standardCmu), Cmu_(defaultCmu_),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE) E_(defaultE_)
{ {
checkType(); checkType();
} }
@ -113,9 +121,9 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
GName_(dict.lookupOrDefault<word>("G", "RASModel::G")), GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
nuName_(dict.lookupOrDefault<word>("nu", "nu")), nuName_(dict.lookupOrDefault<word>("nu", "nu")),
nutName_(dict.lookupOrDefault<word>("nut", "nut")), nutName_(dict.lookupOrDefault<word>("nut", "nut")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", turbulenceModel::standardCmu)), Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)) E_(dict.lookupOrDefault<scalar>("E", defaultE_))
{ {
checkType(); checkType();
} }
@ -235,9 +243,9 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
writeEntryIfDifferent<word>(os, "nut", "nut", nutName_); writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
writeEntryIfDifferent<scalar>(os, "Cmu", turbulenceModel::standardCmu, Cmu_); writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
writeEntry("value", os); writeEntry("value", os);
} }

26
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
View File

@ -40,6 +40,14 @@ namespace incompressible
namespace RASModels 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 * * * * * * * * * * * // // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void nutWallFunctionFvPatchScalarField::checkType() void nutWallFunctionFvPatchScalarField::checkType()
@ -106,9 +114,9 @@ tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const
void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
{ {
writeEntryIfDifferent<scalar>(os, "Cmu", turbulenceModel::standardCmu, Cmu_); writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
} }
@ -121,9 +129,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF), fixedValueFvPatchScalarField(p, iF),
Cmu_(turbulenceModel::standardCmu), Cmu_(defaultCmu_),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE), E_(defaultE_),
yPlusLam_(calcYPlusLam(kappa_, E_)) yPlusLam_(calcYPlusLam(kappa_, E_))
{ {
checkType(); checkType();
@ -156,9 +164,9 @@ nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
) )
: :
fixedValueFvPatchScalarField(p, iF, dict), fixedValueFvPatchScalarField(p, iF, dict),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", turbulenceModel::standardCmu)), Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)), E_(dict.lookupOrDefault<scalar>("E", defaultE_)),
yPlusLam_(calcYPlusLam(kappa_, E_)) yPlusLam_(calcYPlusLam(kappa_, E_))
{ {
checkType(); checkType();

26
src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
View File

@ -40,6 +40,14 @@ namespace incompressible
namespace RASModels 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 * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void omegaWallFunctionFvPatchScalarField::checkType() void omegaWallFunctionFvPatchScalarField::checkType()
@ -70,9 +78,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
GName_("RASModel::G"), GName_("RASModel::G"),
nuName_("nu"), nuName_("nu"),
nutName_("nut"), nutName_("nut"),
Cmu_(turbulenceModel::standardCmu), Cmu_(defaultCmu_),
kappa_(turbulenceModel::standardKappa), kappa_(defaultKappa_),
E_(turbulenceModel::standardE) E_(defaultE_)
{ {
checkType(); checkType();
} }
@ -113,9 +121,9 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
GName_(dict.lookupOrDefault<word>("G", "RASModel::G")), GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
nuName_(dict.lookupOrDefault<word>("nu", "nu")), nuName_(dict.lookupOrDefault<word>("nu", "nu")),
nutName_(dict.lookupOrDefault<word>("nut", "nut")), nutName_(dict.lookupOrDefault<word>("nut", "nut")),
Cmu_(dict.lookupOrDefault<scalar>("Cmu", turbulenceModel::standardCmu)), Cmu_(dict.lookupOrDefault<scalar>("Cmu", defaultCmu_)),
kappa_(dict.lookupOrDefault<scalar>("kappa", turbulenceModel::standardKappa)), kappa_(dict.lookupOrDefault<scalar>("kappa", defaultKappa_)),
E_(dict.lookupOrDefault<scalar>("E", turbulenceModel::standardE)) E_(dict.lookupOrDefault<scalar>("E", defaultE_))
{ {
checkType(); checkType();
} }
@ -225,9 +233,9 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_); writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
writeEntryIfDifferent<word>(os, "nut", "nut", nutName_); writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
writeEntryIfDifferent<scalar>(os, "Cmu", turbulenceModel::standardCmu, Cmu_); writeEntryIfDifferent<scalar>(os, "Cmu", defaultCmu_, Cmu_);
writeEntryIfDifferent<scalar>(os, "kappa", turbulenceModel::standardKappa, kappa_); writeEntryIfDifferent<scalar>(os, "kappa", defaultKappa_, kappa_);
writeEntryIfDifferent<scalar>(os, "E", turbulenceModel::standardE, E_); writeEntryIfDifferent<scalar>(os, "E", defaultE_, E_);
writeEntry("value", os); writeEntry("value", os);
} }

12
src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
View File

@ -96,18 +96,6 @@ private:
public: 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 //- Runtime type information
TypeName("turbulenceModel"); TypeName("turbulenceModel");