From 93fbd41785fa50b8e7b4dd3bfa906b3eacb2ed96 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 3 Feb 2017 10:52:35 +0000
Subject: [PATCH] kOmegaSSTBase: make correctNut(S2, F2) virtual kOmegaSSTSato:
Change correctNut() to correctNut(S2, F2)
Resolves bug-report https://bugs.openfoam.org/view.php?id=2450
---
.../RAS/kOmegaSSTSato/kOmegaSSTSato.C | 16 ++++++++--------
.../RAS/kOmegaSSTSato/kOmegaSSTSato.H | 13 +++++++++----
.../Base/kOmegaSST/kOmegaSSTBase.C | 2 +-
.../Base/kOmegaSST/kOmegaSSTBase.H | 8 ++++++--
4 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
index 7f0af09be62..505d794a1e5 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -130,8 +130,13 @@ kOmegaSSTSato<BasicTurbulenceModel>::gasTurbulence() const
template<class BasicTurbulenceModel>
-void kOmegaSSTSato<BasicTurbulenceModel>::correctNut()
+void kOmegaSSTSato<BasicTurbulenceModel>::correctNut
+(
+ const volScalarField& S2,
+ const volScalarField& F2
+)
{
+ InfoInFunction;
const PhaseCompressibleTurbulenceModel<transportModel>& gasTurbulence =
this->gasTurbulence();
@@ -141,12 +146,7 @@ void kOmegaSSTSato<BasicTurbulenceModel>::correctNut()
);
this->nut_ =
- this->a1_*this->k_
- /max
- (
- this->a1_*this->omega_,
- this->F23()*sqrt(2.0)*mag(symm(fvc::grad(this->U_)))
- )
+ this->a1_*this->k_/max(this->a1_*this->omega_, this->b1_*F2*sqrt(S2))
+ sqr(1 - exp(-yPlus/16.0))
*Cmub_*gasTurbulence.transport().d()*gasTurbulence.alpha()
*(mag(this->U_ - gasTurbulence.U()));
diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
index 4a95eb1aba6..37fd2a8b4c7 100644
--- a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
+++ b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -68,8 +68,8 @@ Description
to specify the near-wall omega as appropriate.
The blending functions (15) and (16) are not currently used because of the
- uncertainty in their origin, range of applicability and that is y+ becomes
- sufficiently small blending u_tau in this manner clearly becomes nonsense.
+ uncertainty in their origin, range of applicability and that as y+ becomes
+ sufficiently small blending u_tau in this manner is clearly nonsense.
The default model coefficients correspond to the following:
\verbatim
@@ -156,7 +156,12 @@ protected:
// Protected Member Functions
- virtual void correctNut();
+ virtual void correctNut
+ (
+ const volScalarField& S2,
+ const volScalarField& F2
+ );
+
public:
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
index c6c65b51bcd..8832e2bd346 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
index 72301b67928..4001b77e046 100644
--- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
+++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -215,7 +215,11 @@ protected:
return blend(F1, gamma1_, gamma2_);
}
- void correctNut(const volScalarField& S2, const volScalarField& F2);
+ virtual void correctNut
+ (
+ const volScalarField& S2,
+ const volScalarField& F2
+ );
virtual void correctNut();
--
GitLab