diff --git a/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C b/src/TurbulenceModels/phaseCompressible/RAS/kOmegaSSTSato/kOmegaSSTSato.C index 7f0af09be6231f6b798329e18fdec3d538a8572f..505d794a1e58249343461d3ad4a803a9d3659f1d 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 4a95eb1aba60429f8751d15e72c2dc848dd870cc..37fd2a8b4c705f55b7dde7b8f329e3b4db0f87e5 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 c6c65b51bcd12cc4f56bbfb2ba44ee835e7693e3..8832e2bd3469b7907382197eefc855ec6783e040 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 72301b679280874f32eba791fc6c47737cfb506d..4001b77e046b673f60e014ffe25eb956bbc33db2 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();