ENH: Turbulence model updates

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(this->psi(chi, fv1));
-    const volScalarField Psi
-    (
-        sqrt
-        (
-            min
-            (
-                scalar(100),
-                (
-                    1
-                  - this->Cb1_*this->fv2(chi, fv1)
-                   /(this->Cw1_*sqr(this->kappa_)*fwStar_)
-                 )/max(SMALL, fv1)
-            )
-        )
-    );
 
     return max
     (
         dimensionedScalar("SMALL", dimLength, SMALL),
-        fHyb*(1 + fRestore*Psi)*this->y_
+        fHyb*(1 + fRestore*psi)*this->y_
-      + (1 - fHyb)*this->psi(chi, fv1)*this->CDES_*Psi*this->delta()
+      + (1 - fHyb)*psi*this->CDES_*this->delta()
     );
 }
 

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());
 

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
+    return max(0.25 - this->y_/IDDESDelta_.hmax(), scalar(-5));
-    (
-        0.25 - this->y_/static_cast<const volScalarField&>(IDDESDelta_.hmax()),
-        scalar(-5)
-    );
 }
 
 

src/TurbulenceModels/turbulenceModels/RAS/kOmegaSST/kOmegaSST.C

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

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;

src/TurbulenceModels/turbulenceModels/RAS/kOmegaSSTSAS/kOmegaSSTSAS.C

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