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(); };