From dfddcad59764b0ec7e681af24c18f238ed92aed1 Mon Sep 17 00:00:00 2001 From: Henry <Henry> Date: Thu, 1 Aug 2013 22:18:54 +0100 Subject: [PATCH] TurbulenceModels: Do not correct nut if the turbulence model is switched-off --- src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C | 11 +++++------ .../turbulenceModels/RAS/kEpsilon/kEpsilon.C | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C index a1bd27d1bf1..704c8e40075 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C @@ -166,6 +166,11 @@ tmp<fvScalarMatrix> kEqn<BasicTurbulenceModel>::kSource() const template<class BasicTurbulenceModel> void kEqn<BasicTurbulenceModel>::correct() { + if (!this->turbulence_) + { + return; + } + // Local references const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; @@ -174,12 +179,6 @@ void kEqn<BasicTurbulenceModel>::correct() const volVectorField& U = this->U_; volScalarField& nut = this->nut_; - if (!this->turbulence_) - { - correctNut(); - return; - } - eddyViscosity<LESModel<BasicTurbulenceModel> >::correct(); volScalarField divU(fvc::div(fvc::absolute(phi/fvc::interpolate(rho), U))); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C index 56394d8e854..8f8820467cb 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C @@ -215,6 +215,11 @@ tmp<fvScalarMatrix> kEpsilon<BasicTurbulenceModel>::epsilonSource() const template<class BasicTurbulenceModel> void kEpsilon<BasicTurbulenceModel>::correct() { + if (!this->turbulence_) + { + return; + } + // Local references const alphaField& alpha = this->alpha_; const rhoField& rho = this->rho_; @@ -223,12 +228,6 @@ void kEpsilon<BasicTurbulenceModel>::correct() const volVectorField& U = this->U_; volScalarField& nut = this->nut_; - if (!this->turbulence_) - { - correctNut(); - return; - } - eddyViscosity<RASModel<BasicTurbulenceModel> >::correct(); volScalarField divU(fvc::div(fvc::absolute(phi/fvc::interpolate(rho), U))); -- GitLab