diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H index 3ce0df94f0..8c5a737b12 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -168,21 +168,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H index 9082922fcd..5159cda99f 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienCubicKE/LienCubicKE.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -191,21 +191,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H index b23cafccbf..c169ab0685 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LienLeschziner/LienLeschziner.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -179,21 +179,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H index 89489dda40..b9e98c743c 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/ShihQuadraticKE/ShihQuadraticKE.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -166,21 +166,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(0.09*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H index a6fca5aa91..1417a8b8b0 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/qZeta/qZeta.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2015 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -197,21 +197,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - virtual const volScalarField& q() const { return q_; diff --git a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H index e0388523de..e365d2aa86 100644 --- a/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H +++ b/src/TurbulenceModels/phaseCompressible/RAS/mixtureKEpsilon/mixtureKEpsilon.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -248,21 +248,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H index dfac30cea5..ef2528fdcb 100644 --- a/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H +++ b/src/TurbulenceModels/turbulenceModels/Base/kOmegaSST/kOmegaSSTBase.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2017-2019 OpenCFD Ltd. + Copyright (C) 2017-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -346,25 +346,6 @@ public: return k_; } - //- Return the turbulence kinetic energy dissipation rate - virtual tmp epsilon() const - { - return tmp - ( - new volScalarField - ( - IOobject - ( - "epsilon", - this->mesh_.time().timeName(), - this->mesh_ - ), - betaStar_*k_*omega_, - omega_.boundaryField().types() - ) - ); - } - //- Return the turbulence kinetic energy dissipation rate virtual tmp omega() const { diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C index ea5c87f35b..3d70d2d323 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C +++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -28,6 +28,7 @@ License #include "DeardorffDiffStress.H" #include "fvOptions.H" +#include "calculatedFvPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -140,48 +141,6 @@ bool DeardorffDiffStress::read() } -template -tmp DeardorffDiffStress::epsilon() const -{ - volScalarField k(this->k()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - this->Ce_*k*sqrt(k)/this->delta() - ) - ); -} - - -template -tmp DeardorffDiffStress::omega() const -{ - volScalarField k(this->k()); - volScalarField epsilon(this->Ce_*k*sqrt(k)/this->delta()); - - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon/(0.09*k) - ); -} - - template void DeardorffDiffStress::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H index 35b878b8ad..b7b65d1879 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H +++ b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -150,12 +150,6 @@ public: //- Read model coefficients if they have changed virtual bool read(); - //- Return the turbulence kinetic energy dissipation rate - virtual tmp epsilon() const; - - //- Return the specific dissipation rate - virtual tmp omega() const; - //- Correct sub-grid stress, eddy-Viscosity and related properties virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C index b3a9440ebf..d93635c97a 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C @@ -70,6 +70,15 @@ Foam::LESModel::LESModel turbulence_(LESDict_.getOrDefault("turbulence", true)), printCoeffs_(LESDict_.getOrDefault("printCoeffs", false)), coeffDict_(LESDict_.optionalSubDict(type + "Coeffs")), + Ce_ + ( + dimensioned::getOrAddToDict + ( + "Ce", + LESDict_, + 1.048 + ) + ), kMin_ ( dimensioned::getOrAddToDict @@ -188,6 +197,8 @@ bool Foam::LESModel::read() delta_().read(LESDict_); + Ce_.readIfPresent(LESDict_); + kMin_.readIfPresent(LESDict_); return true; @@ -197,6 +208,43 @@ bool Foam::LESModel::read() } +template +Foam::tmp +Foam::LESModel::epsilon() const +{ + return tmp::New + ( + IOobject + ( + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->mesh_.time().timeName(), + this->mesh_ + ), + this->Ce()*pow(this->k(), 1.5)/this->delta() + ); +} + + +template +Foam::tmp +Foam::LESModel::omega() const +{ + const scalar betaStar = 0.09; + const dimensionedScalar k0(sqr(dimLength/dimTime), SMALL); + + return tmp::New + ( + IOobject + ( + IOobject::groupName("omega", this->alphaRhoPhi_.group()), + this->mesh_.time().timeName(), + this->mesh_ + ), + this->epsilon()/(betaStar*(this->k() + k0)) + ); +} + + template void Foam::LESModel::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H index 005d120f99..75280a748d 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2017 OpenFOAM Foundation + Copyright (C) 2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -60,10 +61,9 @@ class LESModel : public BasicTurbulenceModel { - protected: - // Protected data + // Protected Data //- LES coefficients dictionary dictionary LESDict_; @@ -77,6 +77,9 @@ protected: //- Model coefficients dictionary dictionary coeffDict_; + //- Empirical model constant + dimensionedScalar Ce_; + //- Lower limit of k dimensionedScalar kMin_; @@ -182,6 +185,12 @@ public: return coeffDict_; } + // Return the empirical model constant + const dimensionedScalar& Ce() const noexcept + { + return Ce_; + } + //- Return the lower allowable limit for k (default: SMALL) const dimensionedScalar& kMin() const { @@ -220,6 +229,12 @@ public: return this->nut(patchi) + this->nu(patchi); } + //- Return the turbulence kinetic energy dissipation rate + virtual tmp epsilon() const; + + //- Return the specific dissipation rate + virtual tmp omega() const; + //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C index a52bea945b..cde62a270e 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2017 OpenFOAM Foundation - Copyright (C) 2016-2020 OpenCFD Ltd. + Copyright (C) 2016-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -27,7 +27,6 @@ License \*---------------------------------------------------------------------------*/ #include "LESeddyViscosity.H" -#include "zeroGradientFvPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -61,16 +60,6 @@ LESeddyViscosity::LESeddyViscosity phi, transport, propertiesName - ), - - Ce_ - ( - dimensioned::getOrAddToDict - ( - "Ce", - this->coeffDict_, - 1.048 - ) ) {} @@ -82,8 +71,6 @@ bool LESeddyViscosity::read() { if (eddyViscosity>::read()) { - Ce_.readIfPresent(this->coeffDict()); - return true; } @@ -91,57 +78,6 @@ bool LESeddyViscosity::read() } -template -tmp LESeddyViscosity::epsilon() const -{ - tmp tk(this->k()); - - tmp tepsilon - ( - new volScalarField - ( - IOobject - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - Ce_*tk()*sqrt(tk())/this->delta(), - zeroGradientFvPatchField::typeName - ) - ); - volScalarField& epsilon = tepsilon.ref(); - epsilon.correctBoundaryConditions(); - - return tepsilon; -} - - -template -tmp LESeddyViscosity::omega() const -{ - tmp tk(this->k()); - tmp tepsilon(this->epsilon()); - - auto tomega = tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - tepsilon()/(0.09*tk()) - ); - auto& omega = tomega.ref(); - omega.correctBoundaryConditions(); - - return tomega; -} - - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // } // End namespace LESModels diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H index 8b675f5e78..03dd92e780 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H +++ b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -69,13 +69,6 @@ class LESeddyViscosity void operator=(const LESeddyViscosity&) = delete; -protected: - - // Protected data - - dimensionedScalar Ce_; - - public: typedef typename BasicTurbulenceModel::alphaField alphaField; @@ -107,12 +100,6 @@ public: //- Read model coefficients if they have changed virtual bool read(); - - //- Return sub-grid dissipation rate - virtual tmp epsilon() const; - - //- Return sub-grid specific dissipation rate - virtual tmp omega() const; }; diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C index c99bd9e3f9..846812bfd7 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C +++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -139,46 +139,6 @@ bool Smagorinsky::read() } -template -tmp Smagorinsky::epsilon() const -{ - volScalarField k(this->k(fvc::grad(this->U_))); - - return tmp - ( - new volScalarField - ( - IOobject - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - this->Ce_*k*sqrt(k)/this->delta() - ) - ); -} - - -template -tmp Smagorinsky::omega() const -{ - volScalarField k(this->k(fvc::grad(this->U_))); - volScalarField epsilon(this->Ce_*k*sqrt(k)/this->delta()); - - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon/(0.09*k) - ); -} - - template void Smagorinsky::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H index 7734dbed62..b1cbddabec 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H +++ b/src/TurbulenceModels/turbulenceModels/LES/Smagorinsky/Smagorinsky.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -162,12 +162,6 @@ public: return k(fvc::grad(this->U_)); } - //- Return sub-grid dissipation rate - virtual tmp epsilon() const; - - //- Return sub-grid specific dissipation rate - virtual tmp omega() const; - //- Correct Eddy-Viscosity and related properties virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C index 053dc1b5c7..1c82926867 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C +++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2015-2017 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -170,49 +170,6 @@ bool WALE::read() } -template -tmp WALE::epsilon() const -{ - volScalarField k(this->k(fvc::grad(this->U_))); - - return tmp - ( - new volScalarField - ( - IOobject - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - this->Ce_*k*sqrt(k)/this->delta() - ) - ); -} - - -template -tmp WALE::omega() const -{ - volScalarField k(this->k(fvc::grad(this->U_))); - volScalarField epsilon(this->Ce_*k*sqrt(k)/this->delta()); - - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon/(0.09*k) - ); -} - - - template void WALE::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H index bd26031918..8576e52cdd 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H +++ b/src/TurbulenceModels/turbulenceModels/LES/WALE/WALE.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2015-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -154,12 +154,6 @@ public: return k(fvc::grad(this->U_)); } - //- Return sub-grid dissipation rate - virtual tmp epsilon() const; - - //- Return sub-grid specific dissipation rate - virtual tmp omega() const; - //- Correct Eddy-Viscosity and related properties virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C index 24b780562b..5b173b01aa 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -219,45 +219,6 @@ bool dynamicKEqn::read() } -template -tmp dynamicKEqn::epsilon() const -{ - return tmp - ( - new volScalarField - ( - IOobject - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - Ce()*k()*sqrt(k())/this->delta() - ) - ); -} - - -template -tmp dynamicKEqn::omega() const -{ - volScalarField epsilon(Ce()*k()*sqrt(k())/this->delta()); - - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon/(0.09*k()) - ); -} - - template void dynamicKEqn::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H index 37767aae72..3cb8abe472 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H +++ b/src/TurbulenceModels/turbulenceModels/LES/dynamicKEqn/dynamicKEqn.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -178,12 +178,6 @@ public: return k_; } - //- Return sub-grid dissipation rate - virtual tmp epsilon() const; - - //- Return sub-grid specific dissipation rate - virtual tmp omega() const; - //- Return the effective diffusivity for k tmp DkEff() const { diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C index d00b814973..72517115a5 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -139,45 +139,6 @@ bool kEqn::read() } -template -tmp kEqn::epsilon() const -{ - return tmp - ( - new volScalarField - ( - IOobject - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - this->Ce_*k()*sqrt(k())/this->delta() - ) - ); -} - - -template -tmp kEqn::omega() const -{ - volScalarField epsilon(this->Ce_*k()*sqrt(k())/this->delta()); - - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon/(0.09*k()) - ); -} - - template void kEqn::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H index 7950650bb2..c5b767d9cb 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H +++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -148,12 +148,6 @@ public: return k_; } - //- Return sub-grid dissipation rate - virtual tmp epsilon() const; - - //- Return sub-grid specific dissipation rate - virtual tmp omega() const; - //- Return the effective diffusivity for k tmp DkEff() const { diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H index fd217bd97b..95bf220cf0 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/LRR/LRR.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -199,21 +199,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->mesh_.time().timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Return the effective diffusivity for R tmp DREff() const; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H index 6181cbcf2c..28c5a864da 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/LaunderSharmaKE/LaunderSharmaKE.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -202,21 +202,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C index aab33e9e5b..90f9a15d6b 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C @@ -187,6 +187,44 @@ bool Foam::RASModel::read() return false; } +template +Foam::tmp +Foam::RASModel::epsilon() const +{ + const scalar Cmu = 0.09; + + return tmp::New + ( + IOobject + ( + IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), + this->mesh_.time().timeName(), + this->mesh_ + ), + Cmu*this->k()*this->omega() + ); +} + + +template +Foam::tmp +Foam::RASModel::omega() const +{ + const scalar betaStar = 0.09; + const dimensionedScalar k0(sqr(dimLength/dimTime), SMALL); + + return tmp::New + ( + IOobject + ( + IOobject::groupName("omega", this->alphaRhoPhi_.group()), + this->mesh_.time().timeName(), + this->mesh_ + ), + this->epsilon()/(betaStar*(this->k() + k0)) + ); +} + template void Foam::RASModel::correct() diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H index 382c27ec3b..6c74c26d90 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2017 OpenFOAM Foundation + Copyright (C) 2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -228,6 +229,12 @@ public: return this->nut(patchi) + this->nu(patchi); } + //- Return the turbulence kinetic energy dissipation rate + virtual tmp epsilon() const; + + //- Return the specific dissipation rate + virtual tmp omega() const; + //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H index b529d1e637..c9ad06d90f 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -202,21 +202,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H index ea15615636..45327d7414 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/SSG/SSG.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2015-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -190,21 +190,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Return the effective diffusivity for R tmp DREff() const; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H index ab7f2a80e3..88feb67a4a 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -200,21 +200,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.H index 8551a30af0..bae33aae53 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -275,21 +275,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Return the normalised wall-normal fluctuating velocity scale field virtual tmp phit() const { diff --git a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H index 0fe0b1b13e..2a3aef70f9 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kOmega/kOmega.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -179,25 +179,6 @@ public: return omega_; } - //- Return the turbulence kinetic energy dissipation rate - virtual tmp epsilon() const - { - return tmp - ( - new volScalarField - ( - IOobject - ( - "epsilon", - this->mesh_.time().timeName(), - this->mesh_ - ), - Cmu_*k_*omega_, - omega_.boundaryField().types() - ) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H index 116b2ab49e..2e1eb12f38 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -198,21 +198,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(0.09*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C index dd9e6b0a0f..04b0a8f683 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2017 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -145,90 +145,6 @@ Stokes::nuEff } -template -tmp -Stokes::k() const -{ - return tmp::New - ( - IOobject - ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - this->mesh_, - dimensionedScalar(sqr(this->U_.dimensions()), Zero) - ); -} - - -template -tmp -Stokes::epsilon() const -{ - return tmp::New - ( - IOobject - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - this->mesh_, - dimensionedScalar(sqr(this->U_.dimensions())/dimTime, Zero) - ); -} - - -template -tmp -Stokes::omega() const -{ - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - this->mesh_, - dimensionedScalar(dimless/dimTime, Zero) - ); -} - - -template -tmp -Stokes::R() const -{ - return tmp::New - ( - IOobject - ( - IOobject::groupName("R", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE, - false - ), - this->mesh_, - dimensionedSymmTensor(sqr(this->U_.dimensions()), Zero) - ); -} - - template void Stokes::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H index 7c91668b5b..606614393c 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation - Copyright (C) 2019-2020 OpenCFD Ltd. + Copyright (C) 2019-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -126,19 +126,6 @@ public: //- Return the effective viscosity on patch virtual tmp nuEff(const label patchi) const; - //- Return the turbulence kinetic energy, i.e. 0 for Stokes flow - virtual tmp k() const; - - //- Return the turbulence kinetic energy dissipation rate, - //- i.e. 0 for Stokes flow - virtual tmp epsilon() const; - - //- Return the specific dissipation rate, i.e. 0 for Stokes flow - virtual tmp omega() const; - - //- Return the Reynolds stress tensor, i.e. 0 for Stokes flow - virtual tmp R() const; - //- Correct the Stokes viscosity virtual void correct(); }; diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C index 17e1ddf0e2..5ae3460593 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2018-2020 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -157,45 +157,6 @@ generalizedNewtonian::nuEff } -template -tmp -generalizedNewtonian::k() const -{ - return volScalarField::New - ( - IOobject::groupName("k", this->alphaRhoPhi_.group()), - this->mesh_, - dimensionedScalar(sqr(this->U_.dimensions()), Zero) - ); -} - - -template -tmp -generalizedNewtonian::epsilon() const -{ - return volScalarField::New - ( - IOobject::groupName("epsilon", this->alphaRhoPhi_.group()), - this->mesh_, - dimensionedScalar(sqr(this->U_.dimensions())/dimTime, Zero) - ); -} - - -template -tmp -generalizedNewtonian::R() const -{ - return volSymmTensorField::New - ( - IOobject::groupName("R", this->alphaRhoPhi_.group()), - this->mesh_, - dimensionedSymmTensor(sqr(this->U_.dimensions()), Zero) - ); -} - - template void generalizedNewtonian::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H index 36f2cfbd4c..fd88ec6db8 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/generalizedNewtonian/generalizedNewtonian.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2018-2020 OpenFOAM Foundation + Copyright (C) 2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -135,15 +136,6 @@ public: //- Return the effective viscosity on patch virtual tmp nuEff(const label patchi) const; - //- Return the turbulence kinetic energy - virtual tmp k() const; - - //- Return the turbulence kinetic energy dissipation rate, - virtual tmp epsilon() const; - - //- Return the Reynolds stress tensor - virtual tmp R() const; - //- Correct the generalizedNewtonian viscosity virtual void correct(); }; diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H index d70563f0de..9724724b1e 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2018 OpenFOAM Foundation - Copyright (C) 2020 OpenCFD Ltd. + Copyright (C) 2020-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -226,21 +226,6 @@ public: return epsilon_; } - //- Return the (estimated) specific dissipation rate - virtual tmp omega() const - { - return tmp::New - ( - IOobject - ( - IOobject::groupName("omega", this->alphaRhoPhi_.group()), - this->runTime_.timeName(), - this->mesh_ - ), - epsilon_/(Cmu_*k_) - ); - } - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct(); };