From 240587029a42a792be633992cfc276117ab33178 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 23 Mar 2010 14:31:06 +0100
Subject: [PATCH] BUG: Corrected reading of the lower-limit of epsilon and
 omega (RAS models)

ENH: Fixed documentation comments for the k0, epsilon0, omega0

BUG: omegaSmall was not being used in compressible RAS models
---
 .../compressible/RAS/RASModel/RASModel.C         |  6 +++---
 .../compressible/RAS/RASModel/RASModel.H         | 16 +++++++---------
 .../compressible/RAS/kOmegaSST/kOmegaSST.C       | 12 ++++++++++--
 .../RAS/LienCubicKELowRe/LienCubicKELowRe.C      | 10 ++++------
 .../incompressible/RAS/RASModel/RASModel.C       |  4 ++--
 .../incompressible/RAS/RASModel/RASModel.H       | 12 +++++-------
 .../incompressible/RAS/kOmegaSST/kOmegaSST.C     |  8 +++++---
 7 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index ffab28703b5..e5aa9167025 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,9 +82,9 @@ RASModel::RASModel
     coeffDict_(subOrEmptyDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
-    epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
+    epsilon0_("epsilon0", k0_.dimensions()/dimTime, SMALL),
     epsilonSmall_("epsilonSmall", epsilon0_.dimensions(), SMALL),
-    omega0_("omega", dimless/dimTime, SMALL),
+    omega0_("omega0", dimless/dimTime, SMALL),
     omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 883fa0825a3..d5a12902ccf 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -185,35 +185,33 @@ public:
 
         // Access
 
-            //- Return the value of k0 which k is not allowed to be less than
+            //- Return the lower allowable limit for k
             const dimensionedScalar& k0() const
             {
                 return k0_;
             }
 
-            //- Return the value of epsilon0 which epsilon is not allowed to be
-            //  less than
+            //- Return the lower allowable limit for epsilon
             const dimensionedScalar& epsilon0() const
             {
                 return epsilon0_;
             }
 
             //- Return the value of epsilonSmall which is added to epsilon when
-            //  calculating nut
+            //  calculating mut
             const dimensionedScalar& epsilonSmall() const
             {
                 return epsilonSmall_;
             }
 
-            //- Return the value of omega0 which epsilon is not allowed to be
-            //  less than
+            //- Return the lower allowable limit for omega
             const dimensionedScalar& omega0() const
             {
                 return omega0_;
             }
 
-            //- Return the value of omegaSmall which is added to epsilon when
-            //  calculating nut
+            //- Return the value of omegaSmall which is added to omega when
+            //  calculating mut
             const dimensionedScalar& omegaSmall() const
             {
                 return omegaSmall_;
diff --git a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index d7627f35e00..23e9f0569fc 100644
--- a/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -258,7 +258,15 @@ kOmegaSST::kOmegaSST
         autoCreateAlphat("alphat", mesh_)
     )
 {
-    mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
+    mut_ =
+    (
+        a1_*rho_*k_
+      / max
+        (
+            a1_*(omega_ + omegaSmall_),
+            F2()*sqrt(magSqr(symm(fvc::grad(U_))))
+        )
+    );
     mut_.correctBoundaryConditions();
 
     alphat_ = mut_/Prt_;
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 2146553f0f6..886b984f572 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -281,11 +281,9 @@ LienCubicKELowRe::LienCubicKELowRe
     )
 {
     nut_ = Cmu_
-       *(
-            scalar(1) - exp(-Am_*yStar_))
-           /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL
-        )
-       *sqr(k_)/(epsilon_ + epsilonSmall_)
+      * (scalar(1) - exp(-Am_*yStar_))
+      / (scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)
+      * sqr(k_)/(epsilon_ + epsilonSmall_)
         // cubic term C5, implicit part
       + max
         (
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 1803075428c..8944f94c233 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -81,7 +81,7 @@ RASModel::RASModel
     coeffDict_(subOrEmptyDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
-    epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
+    epsilon0_("epsilon0", k0_.dimensions()/dimTime, SMALL),
     epsilonSmall_("epsilonSmall", epsilon0_.dimensions(), SMALL),
     omega0_("omega0", dimless/dimTime, SMALL),
     omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index ce57c6690ed..a8eab758f04 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -176,14 +176,13 @@ public:
 
         // Access
 
-            //- Return the value of k0 which k is not allowed to be less than
+            //- Return lower allowable limit for k
             const dimensionedScalar& k0() const
             {
                 return k0_;
             }
 
-            //- Return the value of epsilon0 which epsilon is not allowed to be
-            //  less than
+            //- Return the lower allowable limit for epsilon
             const dimensionedScalar& epsilon0() const
             {
                 return epsilon0_;
@@ -196,14 +195,13 @@ public:
                 return epsilonSmall_;
             }
 
-            //- Return the value of omega0 which epsilon is not allowed to be
-            //  less than
+            //- Return the lower allowable limit for omega0
             const dimensionedScalar& omega0() const
             {
                 return omega0_;
             }
 
-            //- Return the value of omegaSmall which is added to epsilon when
+            //- Return the value of omegaSmall which is added to omega when
             //  calculating nut
             const dimensionedScalar& omegaSmall() const
             {
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index 99721f6a12a..8323a23011d 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2009 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -237,12 +237,14 @@ kOmegaSST::kOmegaSST
     )
 {
     nut_ =
+    (
         a1_*k_
-       /max
+      / max
         (
             a1_*(omega_ + omegaSmall_),
             F2()*mag(symm(fvc::grad(U_)))
-        );
+        )
+    );
     nut_.correctBoundaryConditions();
 
     printCoeffs();
-- 
GitLab