diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C index d800db1a679895f8dd45ee59b8f6b8f6c1a83354..185de6e469ed7280d154c7075b4ce015265ceead 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation - Copyright (C) 2016-2017, OpenCFD Ltd. + Copyright (C) 2016-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -501,7 +501,11 @@ void kOmegaSSTBase<BasicEddyViscosityModel>::correct() tmp<volTensorField> tgradU = fvc::grad(U); volScalarField S2(2*magSqr(symm(tgradU()))); - volScalarField::Internal GbyNu0((tgradU() && dev(twoSymm(tgradU())))); + volScalarField::Internal GbyNu0 + ( + this->type() + ":GbyNu", + (tgradU() && dev(twoSymm(tgradU()))) + ); volScalarField::Internal G(this->GName(), nut*GbyNu0); // Update omega and G at the wall @@ -519,6 +523,8 @@ void kOmegaSSTBase<BasicEddyViscosityModel>::correct() volScalarField::Internal gamma(this->gamma(F1)); volScalarField::Internal beta(this->beta(F1)); + GbyNu0 = GbyNu(GbyNu0, F23(), S2()); + // Turbulent frequency equation tmp<fvScalarMatrix> omegaEqn ( @@ -526,7 +532,7 @@ void kOmegaSSTBase<BasicEddyViscosityModel>::correct() + fvm::div(alphaRhoPhi, omega_) - fvm::laplacian(alpha*rho*DomegaEff(F1), omega_) == - alpha()*rho()*gamma*GbyNu(GbyNu0, F23(), S2()) + alpha()*rho()*gamma*GbyNu0 - fvm::SuSp((2.0/3.0)*alpha()*rho()*gamma*divU, omega_) - fvm::Sp(alpha()*rho()*beta*omega_(), omega_) - fvm::SuSp diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H index 467376aca4bf11539c124bed93d4e7eae4c0c0be..dfac30cea5443ac7833f6545c2492e10c908586a 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H @@ -230,7 +230,11 @@ protected: const volScalarField::Internal& F1 ) const { - return blend(F1, beta1_, beta2_); + return tmp<volScalarField::Internal>::New + ( + this->type() + ":beta", + blend(F1, beta1_, beta2_) + ); } tmp<volScalarField::Internal> gamma @@ -238,7 +242,11 @@ protected: const volScalarField::Internal& F1 ) const { - return blend(F1, gamma1_, gamma2_); + return tmp<volScalarField::Internal>::New + ( + this->type() + ":gamma", + blend(F1, gamma1_, gamma2_) + ); } virtual void correctNut(const volScalarField& S2); diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C index c77aeeaad463d37da51a977fce229dc0c2e432b5..6a234ccdb0523073c3e3b55e764d8e1ecf7733d7 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.C @@ -245,6 +245,7 @@ void kEpsilon<BasicTurbulenceModel>::correct() tmp<volTensorField> tgradU = fvc::grad(U); const volScalarField::Internal GbyNu ( + this->type() + ":GbyNu", tgradU().v() && dev(twoSymm(tgradU().v())) ); const volScalarField::Internal G(this->GName(), nut()*GbyNu);