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

ENH: Turbulence model updates

Browse Source
This commit is contained in:
Andrew Heather
2015-11-30 17:51:23 +00:00
parent 43f91a1415
commit ea62de36dc
6 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
View File

@ -119,28 +119,13 @@ tmp<volScalarField> SpalartAllmarasIDDES<BasicTurbulenceModel>::dTilda
tmp<volScalarField> fAmp = 1 - max(ft(magGradU), fl(magGradU));
tmp<volScalarField> fRestore = max(fHill - 1, scalar(0))*fAmp;
// IGNORING ft2 terms
const volScalarField Psi
(
sqrt
(
min
(
scalar(100),
(
1
- this->Cb1_*this->fv2(chi, fv1)
/(this->Cw1_*sqr(this->kappa_)*fwStar_)
)/max(SMALL, fv1)
)
)
);
const volScalarField psi(this->psi(chi, fv1));
return max
(
dimensionedScalar("SMALL", dimLength, SMALL),
fHyb*(1 + fRestore*Psi)*this->y_
+ (1 - fHyb)*this->psi(chi, fv1)*this->CDES_*Psi*this->delta()
fHyb*(1 + fRestore*psi)*this->y_
+ (1 - fHyb)*psi*this->CDES_*this->delta()
);
}

1
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C
View File

@ -137,6 +137,7 @@ bool kOmegaSSTDES<BasicTurbulenceModel>::read()
{
if (kOmegaSSTBase<DESModel<BasicTurbulenceModel> >::read())
{
kappa_.readIfPresent(this->coeffDict());
CDESkom_.readIfPresent(this->coeffDict());
CDESkeps_.readIfPresent(this->coeffDict());

6
src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C
View File

@ -54,11 +54,7 @@ const IDDESDelta& kOmegaSSTIDDES<BasicTurbulenceModel>::setDelta() const
template<class BasicTurbulenceModel>
tmp<volScalarField> kOmegaSSTIDDES<BasicTurbulenceModel>::alpha() const
{
return max
(
0.25 - this->y_/static_cast<const volScalarField&>(IDDESDelta_.hmax()),
scalar(-5)
);
return max(0.25 - this->y_/IDDESDelta_.hmax(), scalar(-5));
}

3
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C
View File

@ -82,10 +82,9 @@ kOmegaSST<BasicTurbulenceModel>::kOmegaSST
propertiesName
)
{
correctNut();
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
}
}

2
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H
View File

@ -199,7 +199,7 @@ protected:
return blend(F1, gamma1_, gamma2_);
}
void correctNut(const volScalarField& S2);
virtual void correctNut(const volScalarField& S2);
virtual void correctNut();
virtual tmp<fvScalarMatrix> kSource() const;

1
src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C
View File

@ -175,6 +175,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS
{
if (type == typeName)
{
this->correctNut();
this->printCoeffs(type);
}
}