songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ENH: Updated compressible turbulence models

Browse Source
This commit is contained in:
andy 2012-11-27 17:10:55 +00:00
parent 2ea1949003
commit 1e7035b32d
14 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/turbulenceModels/compressible/LES/LESModel/LESModel.H
View File

@ -169,7 +169,7 @@ public:
//- Const access to the coefficients dictionary,
// which provides info. about choice of models,
// and all related data (particularly model coefficients).
inline const dictionary& coeffDict() const
virtual const dictionary& coeffDict() const
{
return coeffDict_;
}

2
src/turbulenceModels/compressible/RAS/LRR/LRR.C
View File

@ -342,7 +342,7 @@ void LRR::correct()
RASModel::correct();
volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
volScalarField G("RASModel.G", 0.5*mag(tr(P)));
volScalarField G(type() + ".G", 0.5*mag(tr(P)));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();

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

@ -379,7 +379,7 @@ void LaunderGibsonRSTM::correct()
}
volSymmTensorField P(-twoSymm(R_ & fvc::grad(U_)));
volScalarField G("RASModel.G", 0.5*mag(tr(P)));
volScalarField G(type() + ".G", 0.5*mag(tr(P)));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();

2
src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
View File

@ -304,7 +304,7 @@ void LaunderSharmaKE::correct()
}
tmp<volTensorField> tgradU = fvc::grad(U_);
volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
volScalarField G(type() + ".G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();

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

@ -209,7 +209,7 @@ public:
}
//- Const access to the coefficients dictionary
const dictionary& coeffDict() const
virtual const dictionary& coeffDict() const
{
return coeffDict_;
}

2
src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
View File

@ -303,7 +303,7 @@ void RNGkEpsilon::correct()
volScalarField S2((tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
volScalarField G("RASModel.G", mut_*S2);
volScalarField G(type() + ".G", mut_*S2);
volScalarField eta(sqrt(mag(S2))*k_/epsilon_);
volScalarField eta3(eta*sqr(eta));

16
src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
View File

@ -76,7 +76,7 @@ tmp<volScalarField> autoCreateAlphat
if (isA<wallFvPatch>(bm[patchI]))
{
alphatBoundaryTypes[patchI] =
RASModels::alphatWallFunctionFvPatchScalarField::typeName;
alphatWallFunctionFvPatchScalarField::typeName;
}
else
{
@ -146,7 +146,7 @@ tmp<volScalarField> autoCreateMut
if (isA<wallFvPatch>(bm[patchI]))
{
mutBoundaryTypes[patchI] =
RASModels::mutkWallFunctionFvPatchScalarField::typeName;
mutkWallFunctionFvPatchScalarField::typeName;
}
else
{
@ -216,7 +216,7 @@ tmp<volScalarField> autoCreateLowReMut
if (isA<wallFvPatch>(bm[patchI]))
{
mutBoundaryTypes[patchI] =
RASModels::mutLowReWallFunctionFvPatchScalarField::typeName;
mutLowReWallFunctionFvPatchScalarField::typeName;
}
else
{
@ -262,7 +262,7 @@ tmp<volScalarField> autoCreateEpsilon
autoCreateWallFunctionField
<
scalar,
RASModels::epsilonWallFunctionFvPatchScalarField
epsilonWallFunctionFvPatchScalarField
>
(
fieldName,
@ -281,7 +281,7 @@ tmp<volScalarField> autoCreateOmega
autoCreateWallFunctionField
<
scalar,
RASModels::omegaWallFunctionFvPatchScalarField
omegaWallFunctionFvPatchScalarField
>
(
fieldName,
@ -300,7 +300,7 @@ tmp<volScalarField> autoCreateK
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
@ -319,7 +319,7 @@ tmp<volScalarField> autoCreateQ
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
@ -338,7 +338,7 @@ tmp<volSymmTensorField> autoCreateR
autoCreateWallFunctionField
<
symmTensor,
RASModels::kqRWallFunctionFvPatchField<symmTensor>
kqRWallFunctionFvPatchField<symmTensor>
>
(
fieldName,

2
src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
View File

@ -281,7 +281,7 @@ void kEpsilon::correct()
}
tmp<volTensorField> tgradU = fvc::grad(U_);
volScalarField G("RASModel.G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
volScalarField G(type() + ".G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
tgradU.clear();
// Update epsilon and G at the wall

2
src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
View File

@ -392,7 +392,7 @@ void kOmegaSST::correct()
tmp<volTensorField> tgradU = fvc::grad(U_);
volScalarField S2(2*magSqr(symm(tgradU())));
volScalarField GbyMu((tgradU() && dev(twoSymm(tgradU()))));
volScalarField G("RASModel.G", mut_*GbyMu);
volScalarField G(type() + ".G", mut_*GbyMu);
tgradU.clear();
// Update omega and G at the wall

2
src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
View File

@ -321,7 +321,7 @@ void realizableKE::correct()
volScalarField eta(magS*k_/epsilon_);
volScalarField C1(max(eta/(scalar(5) + eta), scalar(0.43)));
volScalarField G("RASModel.G", mut_*(gradU && dev(twoSymm(gradU))));
volScalarField G(type() + ".G", mut_*(gradU && dev(twoSymm(gradU))));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();

2
src/turbulenceModels/compressible/RAS/v2f/v2f.C
View File

@ -398,7 +398,7 @@ void v2f::correct()
const volTensorField gradU(fvc::grad(U_));
const volScalarField S2(2*magSqr(dev(symm(gradU))));
const volScalarField G("RASModel.G", mut_*S2);
const volScalarField G(type() + ".G", mut_*S2);
const volScalarField T(Ts());
const volScalarField L2("v2f.L2", sqr(Ls()));
const volScalarField alpha

6
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
View File

@ -79,6 +79,12 @@ autoPtr<laminar> laminar::New
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const dictionary& laminar::coeffDict() const
{
return dictionary::null;
}
tmp<volScalarField> laminar::mut() const
{
return tmp<volScalarField>

3
src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
View File

@ -91,6 +91,9 @@ public:
// Member Functions
//- Const access to the coefficients dictionary
virtual const dictionary& coeffDict() const;
//- Return the turbulence viscosity, i.e. 0 for laminar flow
virtual tmp<volScalarField> mut() const;

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

@ -158,6 +158,9 @@ public:
// Member Functions
//- Const access to the coefficients dictionary
virtual const dictionary& coeffDict() const = 0;
//- Access function to density field
const volScalarField& rho() const
{