diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index 0a1015cfdb..5f94e2731d 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -119,28 +119,13 @@ tmp SpalartAllmarasIDDES::dTilda tmp fAmp = 1 - max(ft(magGradU), fl(magGradU)); tmp 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() ); } diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C index 6045b886ab..449eb03e15 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C @@ -137,6 +137,7 @@ bool kOmegaSSTDES::read() { if (kOmegaSSTBase >::read()) { + kappa_.readIfPresent(this->coeffDict()); CDESkom_.readIfPresent(this->coeffDict()); CDESkeps_.readIfPresent(this->coeffDict()); diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C index 3c4bb99ce7..9b12fb86a1 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C @@ -54,11 +54,7 @@ const IDDESDelta& kOmegaSSTIDDES::setDelta() const template tmp kOmegaSSTIDDES::alpha() const { - return max - ( - 0.25 - this->y_/static_cast(IDDESDelta_.hmax()), - scalar(-5) - ); + return max(0.25 - this->y_/IDDESDelta_.hmax(), scalar(-5)); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C index 4353b5a748..14443ac537 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C @@ -82,10 +82,9 @@ kOmegaSST::kOmegaSST propertiesName ) { - correctNut(); - if (type == typeName) { + correctNut(); this->printCoeffs(type); } } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H index eaa4bd7652..9684892ea9 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSSTBase.H @@ -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 kSource() const; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C index 7f14345c13..f2b9951ba6 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -175,6 +175,7 @@ kOmegaSSTSAS::kOmegaSSTSAS { if (type == typeName) { + this->correctNut(); this->printCoeffs(type); } }