Commit 74aec19f authored by andy's avatar andy
Browse files

ENH: Updated incompressible turbulence models

parent 1e7035b3
......@@ -166,7 +166,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_;
}
......
......@@ -353,7 +353,7 @@ void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU)
volScalarField L(sqrt(k_)/(pow025(Cmu_)*omega_));
volScalarField CDkOmega((2.0*alphaOmega2_)*(gradK & gradOmega)/omega_);
volScalarField F1(this->F1(CDkOmega));
volScalarField G(nuSgs_*S2);
volScalarField G(type() + ".G", nuSgs_*S2);
// Turbulent kinetic energy equation
{
......
......@@ -339,7 +339,7 @@ void LRR::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();
......
......@@ -252,7 +252,7 @@ void LamBremhorstKE::correct()
y_.correct();
}
volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
volScalarField G(type() + ".G", nut_*2*magSqr(symm(fvc::grad(U_))));
// Calculate parameters and coefficients for low-Reynolds number model
......
......@@ -386,7 +386,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();
......
......@@ -255,7 +255,7 @@ void LaunderSharmaKE::correct()
tmp<volScalarField> S2 = 2*magSqr(symm(fvc::grad(U_)));
volScalarField G("RASModel.G", nut_*S2);
volScalarField G(type() + ".G", nut_*S2);
const volScalarField E(2.0*nu()*nut_*fvc::magSqrGradGrad(U_));
const volScalarField D(2.0*nu()*magSqr(fvc::grad(sqrt(k_))));
......
......@@ -356,7 +356,7 @@ void LienCubicKE::correct()
volScalarField G
(
"RASModel.G",
type() + ".G",
Cmu_*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
);
......
......@@ -446,7 +446,7 @@ void LienCubicKELowRe::correct()
volScalarField G
(
"RASModel.G",
type() + ".G",
Cmu_*fMu*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
);
......
......@@ -319,7 +319,7 @@ void LienLeschzinerLowRe::correct()
const volScalarField f2(scalar(1) - 0.3*exp(-sqr(Rt)));
volScalarField G("RASModel.G", Cmu_*fMu*sqr(k_)/epsilon_*S2);
volScalarField G(type() + ".G", Cmu_*fMu*sqr(k_)/epsilon_*S2);
// Dissipation equation
......
......@@ -348,9 +348,8 @@ void NonlinearKEShih::correct()
volScalarField G
(
"RASModel.G",
Cmu_*sqr(k_)/epsilon_*S2
- (nonlinearStress_ && gradU)
type() + ".G",
Cmu_*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU)
);
#include "nonLinearWallFunctionsI.H"
......
......@@ -208,7 +208,7 @@ public:
}
//- Const access to the coefficients dictionary
const dictionary& coeffDict() const
virtual const dictionary& coeffDict() const
{
return coeffDict_;
}
......
......@@ -267,7 +267,7 @@ void RNGkEpsilon::correct()
}
const volScalarField S2(2*magSqr(symm(fvc::grad(U_))));
volScalarField G("RASModel.G", nut_*S2);
volScalarField G(type() + ".G", nut_*S2);
const volScalarField eta(sqrt(S2)*k_/epsilon_);
volScalarField R
......
......@@ -75,7 +75,7 @@ tmp<volScalarField> autoCreateNut
if (isA<wallFvPatch>(bm[patchI]))
{
nutBoundaryTypes[patchI] =
RASModels::nutkWallFunctionFvPatchScalarField::typeName;
nutkWallFunctionFvPatchScalarField::typeName;
}
else
{
......@@ -145,7 +145,7 @@ tmp<volScalarField> autoCreateLowReNut
if (isA<wallFvPatch>(bm[patchI]))
{
nutBoundaryTypes[patchI] =
RASModels::nutLowReWallFunctionFvPatchScalarField::typeName;
nutLowReWallFunctionFvPatchScalarField::typeName;
}
else
{
......@@ -191,7 +191,7 @@ tmp<volScalarField> autoCreateEpsilon
autoCreateWallFunctionField
<
scalar,
RASModels::epsilonWallFunctionFvPatchScalarField
epsilonWallFunctionFvPatchScalarField
>
(
fieldName,
......@@ -210,7 +210,7 @@ tmp<volScalarField> autoCreateOmega
autoCreateWallFunctionField
<
scalar,
RASModels::omegaWallFunctionFvPatchScalarField
omegaWallFunctionFvPatchScalarField
>
(
fieldName,
......@@ -229,7 +229,7 @@ tmp<volScalarField> autoCreateK
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
......@@ -248,7 +248,7 @@ tmp<volScalarField> autoCreateQ
autoCreateWallFunctionField
<
scalar,
RASModels::kqRWallFunctionFvPatchField<scalar>
kqRWallFunctionFvPatchField<scalar>
>
(
fieldName,
......@@ -267,7 +267,7 @@ tmp<volSymmTensorField> autoCreateR
autoCreateWallFunctionField
<
symmTensor,
RASModels::kqRWallFunctionFvPatchField<symmTensor>
kqRWallFunctionFvPatchField<symmTensor>
>
(
fieldName,
......
......@@ -235,7 +235,7 @@ void kEpsilon::correct()
return;
}
volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
volScalarField G(type() + ".G", nut_*2*magSqr(symm(fvc::grad(U_))));
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
......
......@@ -244,7 +244,7 @@ void kOmega::correct()
return;
}
volScalarField G("RASModel.G", nut_*2*magSqr(symm(fvc::grad(U_))));
volScalarField G(type() + ".G", nut_*2*magSqr(symm(fvc::grad(U_))));
// Update omega and G at the wall
omega_.boundaryField().updateCoeffs();
......
......@@ -364,7 +364,7 @@ void kOmegaSST::correct()
}
const volScalarField S2(2*magSqr(symm(fvc::grad(U_))));
volScalarField G("RASModel.G", nut_*S2);
volScalarField G(type() + ".G", nut_*S2);
// Update omega and G at the wall
omega_.boundaryField().updateCoeffs();
......
......@@ -311,7 +311,7 @@ void qZeta::correct()
tmp<volScalarField> S2 = 2*magSqr(symm(fvc::grad(U_)));
volScalarField G("RASModel.G", nut_/(2.0*q_)*S2);
volScalarField G(type() + ".G", nut_/(2.0*q_)*S2);
const volScalarField E(nu()*nut_/q_*fvc::magSqrGradGrad(U_));
......
......@@ -297,7 +297,7 @@ void realizableKE::correct()
const volScalarField eta(magS*k_/epsilon_);
tmp<volScalarField> C1 = max(eta/(scalar(5) + eta), scalar(0.43));
volScalarField G("RASModel.G", nut_*S2);
volScalarField G(type() + ".G", nut_*S2);
// Update epsilon and G at the wall
epsilon_.boundaryField().updateCoeffs();
......
......@@ -364,9 +364,9 @@ void v2f::correct()
const volTensorField gradU(fvc::grad(U_));
const volScalarField S2(2*magSqr(dev(symm(gradU))));
const volScalarField G("RASModel.G", nut_*S2);
const volScalarField G(type() + ".G", nut_*S2);
const volScalarField T(Ts());
const volScalarField L2("v2f.L2", sqr(Ls()));
const volScalarField L2(type() + ".L2", sqr(Ls()));
const volScalarField alpha
(
"v2f::alpha",
......
......@@ -77,6 +77,12 @@ autoPtr<laminar> laminar::New
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
const dictionary& laminar::coeffDict() const
{
return dictionary::null;
}
tmp<volScalarField> laminar::nut() const
{
return tmp<volScalarField>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment