From ea62de36dcbffdcd3200b7a86717c6bda47df933 Mon Sep 17 00:00:00 2001
From: Andrew Heather <a.heather@opencfd.co.uk>
Date: Mon, 30 Nov 2015 17:51:23 +0000
Subject: [PATCH] ENH: Turbulence model updates
---
.../SpalartAllmarasIDDES.C | 21 +++----------------
.../DES/kOmegaSSTDES/kOmegaSSTDES.C | 1 +
.../DES/kOmegaSSTIDDES/kOmegaSSTIDDES.C | 6 +-----
.../RAS/kOmegaSST/kOmegaSST.C | 3 +--
.../RAS/kOmegaSST/kOmegaSSTBase.H | 2 +-
.../RAS/kOmegaSSTSAS/kOmegaSSTSAS.C | 1 +
6 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/TurbulenceModels/turbulenceModels/DES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
index 0a1015cfdb7..5f94e2731de 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 6045b886abe..449eb03e153 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 3c4bb99ce77..9b12fb86a16 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 4353b5a7481..14443ac5376 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 eaa4bd76526..9684892ea9a 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 7f14345c13f..f2b9951ba67 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)
{
+ this->correctNut();
this->printCoeffs(type);
}
}
--
GitLab