ENH: Turbulence - moved DES models to DES directory

SpalartAllmarasDES now derived from DESModel class

src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C

@@ -68,7 +68,7 @@ tmp<volScalarField> SpalartAllmarasDDES<BasicTurbulenceModel>::fd
     const volScalarField& magGradU
 ) const
 {
-    return 1 - tanh(pow3(8*rd(magGradU)));
+    return 1 - tanh(pow(fdFactor_*rd(magGradU), fdExponent_));
 }
 
 
@@ -120,10 +120,46 @@ SpalartAllmarasDDES<BasicTurbulenceModel>::SpalartAllmarasDDES
         phi,
         transport,
         propertiesName
+    ),
+    fdFactor_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "fdFactor",
+            this->coeffDict_,
+            8
+        )
+    ),
+    fdExponent_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "fdExponent",
+            this->coeffDict_,
+            3
+        )
     )
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class BasicTurbulenceModel>
+bool SpalartAllmarasDDES<BasicTurbulenceModel>::read()
+{
+    if (SpalartAllmarasDES<BasicTurbulenceModel>::read())
+    {
+        fdFactor_.readIfPresent(this->coeffDict());
+        fdExponent_.readIfPresent(this->coeffDict());
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace LESModels

src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H

@@ -79,6 +79,15 @@ class SpalartAllmarasDDES
 
 protected:
 
+    // Protected data
+
+        //- fd function pre-factor
+        dimensionedScalar fdFactor_;
+
+        //- fd function exponent
+        dimensionedScalar fdExponent_;
+
+
     // Protected Member Functions
 
         //- Length scale
@@ -120,6 +129,12 @@ public:
     //- Destructor
     virtual ~SpalartAllmarasDDES()
     {}
+
+
+    // Member Functions
+
+        //- Read from dictionary
+        virtual bool read();
 };
 
 

src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C

@@ -197,7 +197,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
     const word& type
 )
 :
-    LESeddyViscosity<BasicTurbulenceModel>
+    DESModel<BasicTurbulenceModel>
     (
         type,
         alpha,
@@ -329,7 +329,7 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
 template<class BasicTurbulenceModel>
 bool SpalartAllmarasDES<BasicTurbulenceModel>::read()
 {
-    if (LESeddyViscosity<BasicTurbulenceModel>::read())
+    if (DESModel<BasicTurbulenceModel>::read())
     {
         sigmaNut_.readIfPresent(this->coeffDict());
         kappa_.readIfPresent(*this);
@@ -414,7 +414,7 @@ void SpalartAllmarasDES<BasicTurbulenceModel>::correct()
     const surfaceScalarField& alphaRhoPhi = this->alphaRhoPhi_;
     const volVectorField& U = this->U_;
 
-    LESeddyViscosity<BasicTurbulenceModel>::correct();
+    DESModel<BasicTurbulenceModel>::correct();
 
     const volScalarField chi(this->chi());
     const volScalarField fv1(this->fv1(chi));

src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H

@@ -47,7 +47,7 @@ SourceFiles
 #ifndef SpalartAllmarasDES_H
 #define SpalartAllmarasDES_H
 
-#include "LESeddyViscosity.H"
+#include "DESModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,7 +63,7 @@ namespace LESModels
 template<class BasicTurbulenceModel>
 class SpalartAllmarasDES
 :
-    public LESeddyViscosity<BasicTurbulenceModel>
+    public DESModel<BasicTurbulenceModel>
 {
     // Private Member Functions