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

reverted kappa and E back to dimensionedScalar, using new lookup functionality

Browse Source
This commit is contained in:
andy
2008-06-24 13:09:57 +01:00
committed by graham
parent a96b0970c1
commit a91f1315f0
20 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/turbulenceModels/RAS/compressible/RASModel/RASModel.C
View File

@ -89,14 +89,24 @@ RASModel::RASModel
kappa_ kappa_
( (
subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar> dimensioned<scalar>::lookupOrAddToDict
( (
"kappa", "kappa",
subDict("wallFunctionCoeffs"),
0.4187 0.4187
) )
), ),
E_(subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>("E", 9.0)), E_
yPlusLam_(yPlusLam(kappa_, E_)), (
dimensioned<scalar>::lookupOrAddToDict
(
"E",
subDict("wallFunctionCoeffs"),
9.0
)
),
yPlusLam_(yPlusLam(kappa_.value(), E_.value())),
k0_("k0", dimVelocity*dimVelocity, SMALL), k0_("k0", dimVelocity*dimVelocity, SMALL),
epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL), epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
@ -171,10 +181,10 @@ bool RASModel::read()
lookup("turbulence") >> turbulence_; lookup("turbulence") >> turbulence_;
coeffDict_ = subDict(type() + "Coeffs"); coeffDict_ = subDict(type() + "Coeffs");
subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_); kappa_.readIfPresent(subDict("wallFunctionCoeffs"));
subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_); E_.readIfPresent(subDict("wallFunctionCoeffs"));
yPlusLam_ = yPlusLam(kappa_, E_); yPlusLam_ = yPlusLam(kappa_.value(), E_.value());
readIfPresent("k0", k0_); readIfPresent("k0", k0_);
readIfPresent("epsilon0", epsilon0_); readIfPresent("epsilon0", epsilon0_);

8
src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
View File

@ -91,8 +91,8 @@ protected:
Switch printCoeffs_; Switch printCoeffs_;
dictionary coeffDict_; dictionary coeffDict_;
scalar kappa_; dimensionedScalar kappa_;
scalar E_; dimensionedScalar E_;
scalar yPlusLam(const scalar kappa, const scalar E); scalar yPlusLam(const scalar kappa, const scalar E);
scalar yPlusLam_; scalar yPlusLam_;
@ -226,13 +226,13 @@ public:
//- Return kappa for use in wall-functions //- Return kappa for use in wall-functions
scalar kappa() const dimensionedScalar kappa() const
{ {
return kappa_; return kappa_;
} }
//- Return E for use in wall-functions //- Return E for use in wall-functions
scalar E() const dimensionedScalar E() const
{ {
return E_; return E_;
} }

4
src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallFunctionsI.H
View File

@ -89,7 +89,7 @@ Description
omega_[faceCelli] += omega_[faceCelli] +=
sqrt(k_[faceCelli]) sqrt(k_[faceCelli])
/(Cmu25*kappa_*y_[faceCelli]); /(Cmu25*kappa_.value()*y_[faceCelli]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
@ -97,7 +97,7 @@ Description
(mutw[facei] + muw[facei]) (mutw[facei] + muw[facei])
*magFaceGradU[facei] *magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli]) *Cmu25*sqrt(k_[faceCelli])
/(kappa_*y_[faceCelli]); /(kappa_.value()*y_[faceCelli]);
} }
} }
} }

2
src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallViscosityI.H
View File

@ -58,7 +58,7 @@ Description
{ {
mutw[facei] = mutw[facei] =
muw[facei] muw[facei]
*(yPlus*kappa_/log(E_*yPlus) - 1); *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
} }
else else
{ {

4
src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
View File

@ -123,8 +123,8 @@ void mutStandardRoughWallFunctionFvPatchScalarField::evaluate
const RASModel& rasModel const RASModel& rasModel
= db().lookupObject<RASModel>("RASProperties"); = db().lookupObject<RASModel>("RASProperties");
const scalar kappa = rasModel.kappa(); const scalar kappa = rasModel.kappa().value();
const scalar E = rasModel.E(); const scalar E = rasModel.E().value();
const scalar yPlusLam = 11.225; const scalar yPlusLam = 11.225;
// The reciprical of the distance to the adjacent cell centre. // The reciprical of the distance to the adjacent cell centre.

4
src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
View File

@ -90,7 +90,7 @@ Description
epsilon_[faceCelli] += epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5) Cmu75*pow(k_[faceCelli], 1.5)
/(kappa_*RASModel::y_[patchi][facei]); /(kappa_.value()*RASModel::y_[patchi][facei]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
@ -98,7 +98,7 @@ Description
(mutw[facei] + muw[facei]) (mutw[facei] + muw[facei])
*magFaceGradU[facei] *magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli]) *Cmu25*sqrt(k_[faceCelli])
/(kappa_*RASModel::y_[patchi][facei]); /(kappa_.value()*RASModel::y_[patchi][facei]);
} }
} }
} }

2
src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
View File

@ -58,7 +58,7 @@ Description
{ {
mutw[facei] = mutw[facei] =
muw[facei] muw[facei]
*(yPlus*kappa_/log(E_*yPlus) - 1); *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
} }
else else
{ {

2
src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
View File

@ -43,7 +43,7 @@
epsilon_[faceCelli] += epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5) Cmu75*pow(k_[faceCelli], 1.5)
/( /(
kappa_*y_[faceCelli] kappa_.value()*y_[faceCelli]
*(1.0 - exp(-Aepsilon_.value()*yStar_[faceCelli])) *(1.0 - exp(-Aepsilon_.value()*yStar_[faceCelli]))
) )
*exp(-Amu_.value()*sqr(yStar_[faceCelli])); *exp(-Amu_.value()*sqr(yStar_[faceCelli]));

2
src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
View File

@ -43,7 +43,7 @@
epsilon_[faceCelli] += epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5) Cmu75*pow(k_[faceCelli], 1.5)
/( /(
kappa_*y_[faceCelli] kappa_.value()*y_[faceCelli]
*(1.0 - exp(-Aepsilon*yStar_[faceCelli])) *(1.0 - exp(-Aepsilon*yStar_[faceCelli]))
) )
*exp(-Amu*sqr(yStar_[faceCelli])); *exp(-Amu*sqr(yStar_[faceCelli]));

28
src/turbulenceModels/RAS/incompressible/RASModel/RASModel.C
View File

@ -85,14 +85,24 @@ RASModel::RASModel
kappa_ kappa_
( (
subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar> dimensioned<scalar>::lookupOrAddToDict
( (
"kappa", "kappa",
subDict("wallFunctionCoeffs"),
0.4187 0.4187
) )
), ),
E_(subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>("E", 9.0)), E_
yPlusLam_(yPlusLam(kappa_, E_)), (
dimensioned<scalar>::lookupOrAddToDict
(
"E",
subDict("wallFunctionCoeffs"),
9.0
)
),
yPlusLam_(yPlusLam(kappa_.value(), E_.value())),
k0_("k0", dimVelocity*dimVelocity, SMALL), k0_("k0", dimVelocity*dimVelocity, SMALL),
epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL), epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
@ -168,14 +178,14 @@ bool RASModel::read()
lookup("turbulence") >> turbulence_; lookup("turbulence") >> turbulence_;
coeffDict_ = subDict(type() + "Coeffs"); coeffDict_ = subDict(type() + "Coeffs");
subDict("wallFunctionCoeffs").readIfPresent<scalar>("kappa", kappa_); kappa_.readIfPresent(subDict("wallFunctionCoeffs"));
subDict("wallFunctionCoeffs").readIfPresent<scalar>("E", E_); E_.readIfPresent(subDict("wallFunctionCoeffs"));
yPlusLam_ = yPlusLam(kappa_, E_); yPlusLam_ = yPlusLam(kappa_.value(), E_.value());
readIfPresent("k0", k0_); k0_.readIfPresent(*this);
readIfPresent("epsilon0", epsilon0_); epsilon0_.readIfPresent(*this);
readIfPresent("epsilonSmall", epsilonSmall_); epsilonSmall_.readIfPresent(*this);
return true; return true;
} }

8
src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
View File

@ -88,8 +88,8 @@ protected:
Switch printCoeffs_; Switch printCoeffs_;
dictionary coeffDict_; dictionary coeffDict_;
scalar kappa_; dimensionedScalar kappa_;
scalar E_; dimensionedScalar E_;
scalar yPlusLam(const scalar kappa, const scalar E); scalar yPlusLam(const scalar kappa, const scalar E);
scalar yPlusLam_; scalar yPlusLam_;
@ -213,13 +213,13 @@ public:
//- Return kappa for use in wall-functions //- Return kappa for use in wall-functions
scalar kappa() const dimensionedScalar kappa() const
{ {
return kappa_; return kappa_;
} }
//- Return E for use in wall-functions //- Return E for use in wall-functions
scalar E() const dimensionedScalar E() const
{ {
return E_; return E_;
} }

4
src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallFunctionsI.H
View File

@ -87,7 +87,7 @@ Description
omega_[faceCelli] += omega_[faceCelli] +=
sqrt(k_[faceCelli]) sqrt(k_[faceCelli])
/(Cmu25*kappa_*y_[faceCelli]); /(Cmu25*kappa_.value()*y_[faceCelli]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
@ -95,7 +95,7 @@ Description
(nutw[facei] + nuw[facei]) (nutw[facei] + nuw[facei])
*magFaceGradU[facei] *magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli]) *Cmu25*sqrt(k_[faceCelli])
/(kappa_*y_[faceCelli]); /(kappa_.value()*y_[faceCelli]);
} }
} }
} }

2
src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallViscosityI.H
View File

@ -55,7 +55,7 @@ Description
{ {
nutw[facei] = nutw[facei] =
nuw[facei] nuw[facei]
*(yPlus*kappa_/log(E_*yPlus) - 1); *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
} }
else else
{ {

4
src/turbulenceModels/RAS/incompressible/wallFunctions/nonLinearWallFunctionsI.H
View File

@ -89,7 +89,7 @@ Description
epsilon_[faceCelli] += epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5) Cmu75*pow(k_[faceCelli], 1.5)
/(kappa_*y_[patchi][facei]); /(kappa_.value()*y_[patchi][facei]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
@ -97,7 +97,7 @@ Description
(nutw[facei] + nuw[facei]) (nutw[facei] + nuw[facei])
*magFaceGradU[facei] *magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli]) *Cmu25*sqrt(k_[faceCelli])
/(kappa_*y_[patchi][facei]) /(kappa_.value()*y_[patchi][facei])
- (nonlinearStress_[faceCelli] && gradU_[faceCelli]); - (nonlinearStress_[faceCelli] && gradU_[faceCelli]);
} }
} }

4
src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
View File

@ -123,8 +123,8 @@ void nutStandardRoughWallFunctionFvPatchScalarField::evaluate
const RASModel& rasModel const RASModel& rasModel
= db().lookupObject<RASModel>("RASProperties"); = db().lookupObject<RASModel>("RASProperties");
const scalar kappa = rasModel.kappa(); const scalar kappa = rasModel.kappa().value();
const scalar E = rasModel.E(); const scalar E = rasModel.E().value();
const scalar yPlusLam = 11.225; const scalar yPlusLam = 11.225;
// The reciprical of the distance to the adjacent cell centre. // The reciprical of the distance to the adjacent cell centre.

6
src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
View File

@ -108,9 +108,9 @@ void nutStandardWallFunctionFvPatchScalarField::evaluate
const RASModel& rasModel const RASModel& rasModel
= db().lookupObject<RASModel>("RASProperties"); = db().lookupObject<RASModel>("RASProperties");
scalar kappa = rasModel.kappa(); scalar kappa = rasModel.kappa().value();
scalar E = rasModel.E(); scalar E = rasModel.E().value();
scalar yPlusLam = rasModel.E(); scalar yPlusLam = rasModel.E().value();
const scalarField& ry = patch().deltaCoeffs(); const scalarField& ry = patch().deltaCoeffs();

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

@ -100,8 +100,8 @@ void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes)
const RASModel& rasModel const RASModel& rasModel
= db().lookupObject<RASModel>("RASProperties"); = db().lookupObject<RASModel>("RASProperties");
scalar kappa = rasModel.kappa(); scalar kappa = rasModel.kappa().value();
scalar E = rasModel.E(); scalar E = rasModel.E().value();
const scalarField& ry = patch().deltaCoeffs(); const scalarField& ry = patch().deltaCoeffs();

4
src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
View File

@ -88,7 +88,7 @@ Description
epsilon_[faceCelli] += epsilon_[faceCelli] +=
Cmu75*pow(k_[faceCelli], 1.5) Cmu75*pow(k_[faceCelli], 1.5)
/(kappa_*RASModel::y_[patchi][facei]); /(kappa_.value()*RASModel::y_[patchi][facei]);
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
@ -96,7 +96,7 @@ Description
(nutw[facei] + nuw[facei]) (nutw[facei] + nuw[facei])
*magFaceGradU[facei] *magFaceGradU[facei]
*Cmu25*sqrt(k_[faceCelli]) *Cmu25*sqrt(k_[faceCelli])
/(kappa_*RASModel::y_[patchi][facei]); /(kappa_.value()*RASModel::y_[patchi][facei]);
} }
} }
} }

2
src/turbulenceModels/RAS/incompressible/wallFunctions/wallNonlinearViscosityI.H
View File

@ -55,7 +55,7 @@ Description
if (yPlus > yPlusLam_) if (yPlus > yPlusLam_)
{ {
nutw[facei] = nuw[facei] nutw[facei] = nuw[facei]
*(yPlus*kappa_/log(E_*yPlus) - 1); *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
} }
else else
{ {

2
src/turbulenceModels/RAS/incompressible/wallFunctions/wallViscosityI.H
View File

@ -55,7 +55,7 @@ Description
{ {
nutw[facei] = nutw[facei] =
nuw[facei] nuw[facei]
*(yPlus*kappa_/log(E_*yPlus) - 1); *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
} }
else else
{ {