diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C index 0a1015cfdb751d1f63a9072b8704ac4750c3556a..5f94e2731de904228c3004909faa6ed4fd012305 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C @@ -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() ); } diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C index 6045b886abe4b784dfe46df8fb11590f7cdbdaf3..449eb03e153965b061530a1065cb608e0d428a70 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTDES/kOmegaSSTDES.C @@ -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()); diff --git a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C index 3c4bb99ce77c6208e237e0fc1b20bab17f974d7e..9b12fb86a169448c0fbeab995f5b432ebfc18376 100644 --- a/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C +++ b/src/TurbulenceModels/turbulenceModels/DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C @@ -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)); } diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C index 4353b5a7481e9a12bbcadd36c4912fc5634d8121..14443ac5376c9654c31c0c825d34f12f76cf021d 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C @@ -82,10 +82,9 @@ kOmegaSST<BasicTurbulenceModel>::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 eaa4bd76526274ba15f7808782e79748e5523270..9684892ea9abd3d2f26771ac5305b6b90f75d4aa 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<fvScalarMatrix> kSource() const; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C index 7f14345c13f6547308620be2f328fd9412180fdd..498d6f0173eeab6bd1015d252cb8e99e577bf969 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C @@ -175,6 +175,7 @@ kOmegaSSTSAS<BasicTurbulenceModel>::kOmegaSSTSAS { if (type == typeName) { + correctNut(); this->printCoeffs(type); } }