ENH: add virtual omega to turbulenceModels

STYLE: update dimensionSets in SpalartAllmaras

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::volScalarField>
+Foam::RASModels::kineticTheoryModel::omega() const
+{
+    NotImplemented;
+    return nullptr;
+}
+
+
 Foam::tmp<Foam::volSymmTensorField>
 Foam::RASModels::kineticTheoryModel::R() const
 {

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<volScalarField> epsilon() const;
 
+        //- Return the specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
 

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::volScalarField>
+Foam::RASModels::phasePressureModel::omega() const
+{
+    NotImplemented;
+    return nullptr;
+}
+
+
 Foam::tmp<Foam::volSymmTensorField>
 Foam::RASModels::phasePressureModel::R() const
 {

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<volScalarField> epsilon() const;
 
+        //- Return the specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
 

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::New
+            (
+                IOobject
+                (
+                    IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+                    this->runTime_.timeName(),
+                    this->mesh_
+                ),
+                epsilon_/(Cmu_*k_)
+            );
+        }
+
         virtual const volScalarField& q() const
         {
             return q_;

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<volScalarField> DeardorffDiffStress<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> DeardorffDiffStress<BasicTurbulenceModel>::omega() const
+{
+    volScalarField k(this->k());
+    volScalarField epsilon(this->Ce_*k*sqrt(k)/this->delta());
+
+    return tmp<volScalarField>::New
+    (
+        IOobject
+        (
+            IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+            this->runTime_.timeName(),
+            this->mesh_
+        ),
+        epsilon/(0.09*k)
+    );
+}
+
+
 template<class BasicTurbulenceModel>
 void DeardorffDiffStress<BasicTurbulenceModel>::correct()
 {

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<volScalarField> epsilon() const;
 
+        //- Return the specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Correct sub-grid stress, eddy-Viscosity and related properties
         virtual void correct();
 };

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<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> LESeddyViscosity<BasicTurbulenceModel>::omega() const
+{
+    tmp<volScalarField> tk(this->k());
+    tmp<volScalarField> tepsilon(this->epsilon());
+
+    auto tomega = tmp<volScalarField>::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

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<volScalarField> epsilon() const;
+
+        //- Return sub-grid specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
 };
 
 

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<volScalarField> Smagorinsky<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> Smagorinsky<BasicTurbulenceModel>::omega() const
+{
+    volScalarField k(this->k(fvc::grad(this->U_)));
+    volScalarField epsilon(this->Ce_*k*sqrt(k)/this->delta());
+
+    return tmp<volScalarField>::New
+    (
+        IOobject
+        (
+            IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+            this->runTime_.timeName(),
+            this->mesh_
+        ),
+        epsilon/(0.09*k)
+    );
+}
+
+
 template<class BasicTurbulenceModel>
 void Smagorinsky<BasicTurbulenceModel>::correct()
 {

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<volScalarField> epsilon() const;
 
+        //- Return sub-grid specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Correct Eddy-Viscosity and related properties
         virtual void correct();
 };

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<volScalarField> WALE<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> WALE<BasicTurbulenceModel>::omega() const
+{
+    volScalarField k(this->k(fvc::grad(this->U_)));
+    volScalarField epsilon(this->Ce_*k*sqrt(k)/this->delta());
+
+    return tmp<volScalarField>::New
+    (
+        IOobject
+        (
+            IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+            this->runTime_.timeName(),
+            this->mesh_
+        ),
+        epsilon/(0.09*k)
+    );
+}
+
+
+
 template<class BasicTurbulenceModel>
 void WALE<BasicTurbulenceModel>::correct()
 {

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<volScalarField> epsilon() const;
 
+        //- Return sub-grid specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Correct Eddy-Viscosity and related properties
         virtual void correct();
 };

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<volScalarField> dynamicKEqn<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> dynamicKEqn<BasicTurbulenceModel>::omega() const
+{
+    volScalarField epsilon(Ce()*k()*sqrt(k())/this->delta());
+
+    return tmp<volScalarField>::New
+    (
+        IOobject
+        (
+            IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+            this->runTime_.timeName(),
+            this->mesh_
+        ),
+        epsilon/(0.09*k())
+    );
+}
+
+
 template<class BasicTurbulenceModel>
 void dynamicKEqn<BasicTurbulenceModel>::correct()
 {

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<volScalarField> epsilon() const;
 
+        //- Return sub-grid specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {

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<volScalarField> kEqn<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> kEqn<BasicTurbulenceModel>::omega() const
+{
+    volScalarField epsilon(this->Ce_*k()*sqrt(k())/this->delta());
+
+    return tmp<volScalarField>::New
+    (
+        IOobject
+        (
+            IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+            this->runTime_.timeName(),
+            this->mesh_
+        ),
+        epsilon/(0.09*k())
+    );
+}
+
+
 template<class BasicTurbulenceModel>
 void kEqn<BasicTurbulenceModel>::correct()
 {

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<volScalarField> epsilon() const;
 
+        //- Return sub-grid specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::New
+            (
+                IOobject
+                (
+                    IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+                    this->mesh_.time().timeName(),
+                    this->mesh_
+                ),
+                epsilon_/(Cmu_*k_)
+            );
+        }
+
         //- Return the effective diffusivity for R
         tmp<volSymmTensorField> DREff() const;
 

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::New
+            (
+                IOobject
+                (
+                    IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+                    this->runTime_.timeName(),
+                    this->mesh_
+                ),
+                epsilon_/(Cmu_*k_)
+            );
+        }
+
         //- Return the effective diffusivity for R
         tmp<volSymmTensorField> DREff() const;
 

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<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::k() const
             this->mesh_
         ),
         this->mesh_,
-        dimensionedScalar(dimensionSet(0, 2, -2, 0, 0), Zero),
+        dimensionedScalar(sqr(dimLength)/sqr(dimTime), Zero),
         zeroGradientFvPatchField<scalar>::typeName
     );
 }
@@ -340,12 +340,34 @@ tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::epsilon() const
             this->mesh_
         ),
         this->mesh_,
-        dimensionedScalar(dimensionSet(0, 2, -3, 0, 0), Zero),
+        dimensionedScalar(sqr(dimLength)/pow3(dimTime), Zero),
         zeroGradientFvPatchField<scalar>::typeName
     );
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField> SpalartAllmaras<BasicTurbulenceModel>::omega() const
+{
+    WarningInFunction
+        << "Specific dissipation rate not defined for "
+        << "Spalart-Allmaras model. Returning zero field"
+        << endl;
+
+    return tmp<volScalarField>::New
+    (
+        IOobject
+        (
+            IOobject::groupName("omega", this->alphaRhoPhi_.group()),
+            this->runTime_.timeName(),
+            this->mesh_
+        ),
+        this->mesh_,
+        dimensionedScalar(dimless/dimTime, Zero)
+    );
+}
+
+
 template<class BasicTurbulenceModel>
 void SpalartAllmaras<BasicTurbulenceModel>::correct()
 {

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<volScalarField> epsilon() const;
 
+        //- Return the (estimated) specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct();
 };

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

src/TurbulenceModels/turbulenceModels/RAS/kEpsilonPhitF/kEpsilonPhitF.H

@@ -275,6 +275,21 @@ public:
             return epsilon_;
         }
 
+        //- Return the (estimated) specific dissipation rate
+        virtual tmp<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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<volScalarField> phit() const
         {

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+tmp<volScalarField>
+Stokes<BasicTurbulenceModel>::omega() const
+{
+    return tmp<volScalarField>::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<class BasicTurbulenceModel>
 tmp<volSymmTensorField>
 Stokes<BasicTurbulenceModel>::R() const

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<volScalarField> epsilon() const;
 
+        //- Return the specific dissipation rate, i.e. 0 for Stokes flow
+        virtual tmp<volScalarField> omega() const;
+
         //- Return the Reynolds stress tensor, i.e. 0 for Stokes flow
         virtual tmp<volSymmTensorField> R() const;
 

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<BasicTurbulenceModel>::epsilon() const
 }
 
 
+template<class BasicTurbulenceModel>
+Foam::tmp<Foam::volScalarField>
+Foam::laminarModel<BasicTurbulenceModel>::omega() const
+{
+    return tmp<volScalarField>::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<class BasicTurbulenceModel>
 Foam::tmp<Foam::volSymmTensorField>
 Foam::laminarModel<BasicTurbulenceModel>::R() const

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<volScalarField> epsilon() const;
 
+            //- Return the specific dissipation rate, i.e. 0 for laminar flow
+            virtual tmp<volScalarField> omega() const;
+
             //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
             virtual tmp<volSymmTensorField> R() const;
 

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<volScalarField> epsilon() const = 0;
 
+        //- Return the specific dissipation rate
+        virtual tmp<volScalarField> omega() const = 0;
+
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const = 0;
 

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<volScalarField> omega() const
+        {
+            return tmp<volScalarField>::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();
 };

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::volScalarField>
+Foam::RASModels::kineticTheoryModel::omega() const
+{
+    NotImplemented;
+    return nullptr;
+}
+
+
 Foam::tmp<Foam::volSymmTensorField>
 Foam::RASModels::kineticTheoryModel::R() const
 {

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<volScalarField> epsilon() const;
 
+        //- Return the specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;
 

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::volScalarField>
+Foam::RASModels::phasePressureModel::omega() const
+{
+    NotImplemented;
+    return nullptr;
+}
+
+
 Foam::tmp<Foam::volSymmTensorField>
 Foam::RASModels::phasePressureModel::R() const
 {

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<volScalarField> epsilon() const;
 
+        //- Return the specific dissipation rate
+        virtual tmp<volScalarField> omega() const;
+
         //- Return the Reynolds stress tensor
         virtual tmp<volSymmTensorField> R() const;