diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index ffab28703b52976b621b8dd3506ded787962e2e6..e5aa916702560e1a51c6820b7e1944bf66e98ad2 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 883fa0825a32e106dadd870c853f38ec3319a061..d5a12902ccf5cf14c1b786823707d29d9fc6f902 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 d7627f35e00e636e2a89b12995e2f9aecd72cdd1..23e9f0569fc299e3bb97b80ed8223f7d8dfd9b5e 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 2146553f0f6b758230156e68243fdb28af9b598c..886b984f57215d0db703f14b437817969ebca825 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 1803075428c9e1ac2a8b9b0317fe9f9ef6f49b79..8944f94c2334c4c2124006867042000d997eeece 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 ce57c6690edae2da612bbbef2fc0f3dda1357cda..a8eab758f04c719dd31b2ed28e51454a660128b3 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 99721f6a12afb044c4a00d20b8068a706ba1adf8..8323a23011d63d69c34a01ec84226025be6025f4 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();