From b4ab6141b2fd8ea27f95459cd92418e49795f026 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Fri, 27 Nov 2015 15:06:39 +0000
Subject: [PATCH] ENH: Turbulence - moved DES models to DES directory
SpalartAllmarasDES now derived from DESModel class
---
.../SpalartAllmarasDDES/SpalartAllmarasDDES.C | 38 ++++++++++++++++++-
.../SpalartAllmarasDDES/SpalartAllmarasDDES.H | 15 ++++++++
.../SpalartAllmarasDES/SpalartAllmarasDES.C | 6 +--
.../SpalartAllmarasDES/SpalartAllmarasDES.H | 4 +-
.../SpalartAllmarasIDDES.C | 0
.../SpalartAllmarasIDDES.H | 0
6 files changed, 57 insertions(+), 6 deletions(-)
rename src/TurbulenceModels/turbulenceModels/{LES => DES}/SpalartAllmarasDDES/SpalartAllmarasDDES.C (81%)
rename src/TurbulenceModels/turbulenceModels/{LES => DES}/SpalartAllmarasDDES/SpalartAllmarasDDES.H (94%)
rename src/TurbulenceModels/turbulenceModels/{LES => DES}/SpalartAllmarasDES/SpalartAllmarasDES.C (98%)
rename src/TurbulenceModels/turbulenceModels/{LES => DES}/SpalartAllmarasDES/SpalartAllmarasDES.H (98%)
rename src/TurbulenceModels/turbulenceModels/{LES => DES}/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C (100%)
rename src/TurbulenceModels/turbulenceModels/{LES => DES}/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H (100%)
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
similarity index 81%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
index 186970ca613..075b61388d1 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
+++ b/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
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
similarity index 94%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
index addcb635a4c..80fb8c3cef5 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
+++ b/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();
};
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
similarity index 98%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.C
index 53e22dd3847..d1b0da83418 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.C
+++ b/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));
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
similarity index 98%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasDES/SpalartAllmarasDES.H
index 4c512487a3f..3a560be0c8e 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasDES/SpalartAllmarasDES.H
+++ b/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
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
similarity index 100%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
diff --git a/src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
similarity index 100%
rename from src/TurbulenceModels/turbulenceModels/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
rename to src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
--
GitLab