diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index 75a5af0386..ec11a77878 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -233,6 +233,14 @@ Foam::RASModels::kineticTheoryModel::epsilon() const } +Foam::tmp +Foam::RASModels::kineticTheoryModel::omega() const +{ + NotImplemented; + return nullptr; +} + + Foam::tmp Foam::RASModels::kineticTheoryModel::R() const { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index 8df93bb990..3fe5101b6e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -205,6 +206,9 @@ public: //- Return the turbulence kinetic energy dissipation rate virtual tmp epsilon() const; + //- Return the specific dissipation rate + virtual tmp omega() const; + //- Return the Reynolds stress tensor virtual tmp R() const; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 5c3638257d..e12ac4292b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -119,6 +120,14 @@ Foam::RASModels::phasePressureModel::epsilon() const } +Foam::tmp +Foam::RASModels::phasePressureModel::omega() const +{ + NotImplemented; + return nullptr; +} + + Foam::tmp Foam::RASModels::phasePressureModel::R() const { diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index 29f03d581e..51c1673aff 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -164,6 +165,9 @@ public: //- Return the turbulence kinetic energy dissipation rate virtual tmp epsilon() const; + //- Return the specific dissipation rate + virtual tmp omega() const; + //- Return the Reynolds stress tensor virtual tmp R() const; diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/TurbulenceModels/incompressible/turbulentTransportModels/RAS/LamBremhorstKE/LamBremhorstKE.H index 243c8c996a..3ce0df94f0 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -168,6 +168,21 @@ 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 c78528b777..9082922fcd 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -191,6 +191,21 @@ 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 a890f6d046..b23cafccbf 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -179,6 +179,21 @@ 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 48a6a7a79e..89489dda40 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -166,6 +166,21 @@ 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 b034ae6bb9..a6fca5aa91 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -197,6 +197,21 @@ 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 eafa702200..e0388523de 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -248,6 +248,21 @@ 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/LES/DeardorffDiffStress/DeardorffDiffStress.C b/src/TurbulenceModels/turbulenceModels/LES/DeardorffDiffStress/DeardorffDiffStress.C index e46fd17cea..29162e82e4 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -163,6 +163,25 @@ tmp DeardorffDiffStress::epsilon() const } +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 feccff31f6..35b878b8ad 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -153,6 +153,9 @@ public: //- 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/LESeddyViscosity/LESeddyViscosity.C b/src/TurbulenceModels/turbulenceModels/LES/LESeddyViscosity/LESeddyViscosity.C index 1b3ecc405e..f5d9d1e153 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-2019 OpenCFD Ltd. + Copyright (C) 2016-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -119,6 +119,29 @@ tmp LESeddyViscosity::epsilon() const } +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 31c01e1d29..8b675f5e78 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -110,6 +110,9 @@ public: //- 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 edf5c4d7a1..0ba8f86164 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -160,6 +160,25 @@ tmp Smagorinsky::epsilon() const } +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 02f938b812..7734dbed62 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -165,6 +165,9 @@ public: //- 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 51cc9198f3..98a01a9ac2 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -193,6 +193,26 @@ tmp WALE::epsilon() const } +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 7730d6cdfb..bd26031918 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -157,6 +157,9 @@ public: //- 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 38c79de0be..24b780562b 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -240,6 +240,24 @@ tmp dynamicKEqn::epsilon() const } +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 de58835444..37767aae72 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -181,6 +181,9 @@ public: //- 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 48210577bc..482b5d636d 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C +++ b/src/TurbulenceModels/turbulenceModels/LES/kEqn/kEqn.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2017 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -159,6 +160,24 @@ tmp kEqn::epsilon() const } +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 df3df51c44..7950650bb2 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -151,6 +151,9 @@ public: //- 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 4d887144e9..fd217bd97b 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -199,6 +199,21 @@ 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 e7895be8aa..6181cbcf2c 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -202,6 +202,21 @@ 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/RNGkEpsilon/RNGkEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/RNGkEpsilon/RNGkEpsilon.H index bc56285120..b529d1e637 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -202,6 +202,21 @@ 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 2cfc6e4bd4..ea15615636 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -190,6 +190,21 @@ 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/SpalartAllmaras/SpalartAllmaras.C b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C index b7fa4b2d35..b4b797d2a9 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -317,7 +317,7 @@ tmp SpalartAllmaras::k() const this->mesh_ ), this->mesh_, - dimensionedScalar(dimensionSet(0, 2, -2, 0, 0), Zero), + dimensionedScalar(sqr(dimLength)/sqr(dimTime), Zero), zeroGradientFvPatchField::typeName ); } @@ -340,12 +340,34 @@ tmp SpalartAllmaras::epsilon() const this->mesh_ ), this->mesh_, - dimensionedScalar(dimensionSet(0, 2, -3, 0, 0), Zero), + dimensionedScalar(sqr(dimLength)/pow3(dimTime), Zero), zeroGradientFvPatchField::typeName ); } +template +tmp SpalartAllmaras::omega() const +{ + WarningInFunction + << "Specific dissipation rate not defined for " + << "Spalart-Allmaras model. Returning zero field" + << endl; + + return tmp::New + ( + IOobject + ( + IOobject::groupName("omega", this->alphaRhoPhi_.group()), + this->runTime_.timeName(), + this->mesh_ + ), + this->mesh_, + dimensionedScalar(dimless/dimTime, Zero) + ); +} + + template void SpalartAllmaras::correct() { diff --git a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H index 6a75f9453c..853bf82c3d 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/SpalartAllmaras/SpalartAllmaras.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2016 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -199,6 +199,9 @@ public: //- Return the turbulence kinetic energy dissipation rate virtual tmp epsilon() const; + //- Return the (estimated) 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/kEpsilon/kEpsilon.H b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilon/kEpsilon.H index f8f99e2632..ab7f2a80e3 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -200,6 +200,21 @@ 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 cf45e2ea3d..8551a30af0 100644 --- a/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.H +++ b/src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.H @@ -275,6 +275,21 @@ 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/realizableKE/realizableKE.H b/src/TurbulenceModels/turbulenceModels/RAS/realizableKE/realizableKE.H index 8a4d17897a..116b2ab49e 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -198,6 +198,21 @@ 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 e435a78b8b..dd9e6b0a0f 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2017 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -186,6 +187,27 @@ Stokes::epsilon() const } +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 diff --git a/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H b/src/TurbulenceModels/turbulenceModels/laminar/Stokes/Stokes.H index a2da356cd3..7c91668b5b 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 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -133,6 +133,9 @@ public: //- 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; diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C index 7a20b4d133..914060f5b2 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2016-2017 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -283,6 +283,27 @@ Foam::laminarModel::epsilon() const } +template +Foam::tmp +Foam::laminarModel::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 Foam::tmp Foam::laminarModel::R() const diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H index a137e4832a..664646e542 100644 --- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H +++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2016 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -179,6 +180,9 @@ public: // i.e. 0 for laminar flow virtual tmp epsilon() const; + //- Return the specific dissipation rate, i.e. 0 for laminar flow + virtual tmp omega() const; + //- Return the Reynolds stress tensor, i.e. 0 for laminar flow virtual tmp R() const; diff --git a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H index e31a1fbbd4..3e7a07eccb 100644 --- a/src/TurbulenceModels/turbulenceModels/turbulenceModel.H +++ b/src/TurbulenceModels/turbulenceModels/turbulenceModel.H @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2015 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -204,6 +204,9 @@ public: //- Return the turbulence kinetic energy dissipation rate virtual tmp epsilon() const = 0; + //- Return the specific dissipation rate + virtual tmp omega() const = 0; + //- Return the Reynolds stress tensor virtual tmp R() const = 0; diff --git a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H index 8458b4942a..d70563f0de 100644 --- a/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H +++ b/src/atmosphericModels/kEpsilonLopesdaCosta/kEpsilonLopesdaCosta.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2018 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -225,6 +226,21 @@ 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/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C index bab465cb41..c05c181264 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C +++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C @@ -6,7 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2018 OpenFOAM Foundation - Copyright (C) 2019 OpenCFD Ltd. + Copyright (C) 2019-2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -233,6 +233,14 @@ Foam::RASModels::kineticTheoryModel::epsilon() const } +Foam::tmp +Foam::RASModels::kineticTheoryModel::omega() const +{ + NotImplemented; + return nullptr; +} + + Foam::tmp Foam::RASModels::kineticTheoryModel::R() const { diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H index aae82f2066..3f63275a24 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H +++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2011-2018 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -205,6 +206,9 @@ public: //- Return the turbulence kinetic energy dissipation rate virtual tmp epsilon() const; + //- Return the specific dissipation rate + virtual tmp omega() const; + //- Return the Reynolds stress tensor virtual tmp R() const; diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C index 6a46eaef8b..268c117b35 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C +++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.C @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2018 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -113,6 +114,14 @@ Foam::RASModels::phasePressureModel::epsilon() const } +Foam::tmp +Foam::RASModels::phasePressureModel::omega() const +{ + NotImplemented; + return nullptr; +} + + Foam::tmp Foam::RASModels::phasePressureModel::R() const { diff --git a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H index c1c064e45c..6aeb253f09 100644 --- a/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H +++ b/src/phaseSystemModels/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/phasePressureModel/phasePressureModel.H @@ -6,6 +6,7 @@ \\/ M anipulation | ------------------------------------------------------------------------------- Copyright (C) 2013-2018 OpenFOAM Foundation + Copyright (C) 2020 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -160,6 +161,9 @@ public: //- Return the turbulence kinetic energy dissipation rate virtual tmp epsilon() const; + //- Return the specific dissipation rate + virtual tmp omega() const; + //- Return the Reynolds stress tensor virtual tmp R() const;