Commit 24058702 authored by Mark Olesen's avatar Mark Olesen
Browse files

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
parent f1d03a38
......@@ -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_)
......
......@@ -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_;
......
......@@ -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_;
......
......@@ -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
(
......
......@@ -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),
......
......@@ -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
{
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment