Commit e5168727 authored by Henry Weller's avatar Henry Weller
Browse files

TurbulenceModels: Correct nut during construction for single-phase solvers only.

For multiphase solvers the phase construction is not complete at this point.
parent 85c79d83
......@@ -180,8 +180,15 @@ LamBremhorstKE::LamBremhorstKE
if (type == typeName)
{
correctNut();
printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -330,8 +330,15 @@ LienCubicKE::LienCubicKE
if (type == typeName)
{
correctNut();
printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -224,8 +224,15 @@ LienLeschziner::LienLeschziner
if (type == typeName)
{
correctNut();
printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -222,8 +222,15 @@ ShihQuadraticKE::ShihQuadraticKE
if (type == typeName)
{
correctNut();
printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -207,8 +207,15 @@ qZeta::qZeta
if (type == typeName)
{
correctNut();
printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -106,10 +106,10 @@ LaheyKEpsilon<BasicTurbulenceModel>::LaheyKEpsilon
{
if (type == typeName)
{
this->printCoeffs(type);
// Cannot correct nut yet: construction of the phases is not complete
// correctNut();
this->printCoeffs(type);
}
}
......
......@@ -110,9 +110,16 @@ DeardorffDiffStress<BasicTurbulenceModel>::DeardorffDiffStress
{
if (type == typeName)
{
this->boundNormalStress(this->R_);
correctNut();
this->printCoeffs(type);
this->boundNormalStress(this->R_);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -113,8 +113,15 @@ Smagorinsky<BasicTurbulenceModel>::Smagorinsky
{
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -318,8 +318,15 @@ SpalartAllmarasDES<BasicTurbulenceModel>::SpalartAllmarasDES
{
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -143,8 +143,15 @@ WALE<BasicTurbulenceModel>::WALE
{
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -185,8 +185,15 @@ dynamicKEqn<BasicTurbulenceModel>::dynamicKEqn
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -122,8 +122,15 @@ dynamicLagrangian<BasicTurbulenceModel>::dynamicLagrangian
{
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -113,8 +113,15 @@ kEqn<BasicTurbulenceModel>::kEqn
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -200,11 +200,19 @@ LRR<BasicTurbulenceModel>::LRR
{
if (type == typeName)
{
this->printCoeffs(type);
this->boundNormalStress(this->R_);
bound(epsilon_, this->epsilonMin_);
k_ = 0.5*tr(this->R_);
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -204,8 +204,15 @@ LaunderSharmaKE<BasicTurbulenceModel>::LaunderSharmaKE
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -205,8 +205,15 @@ RNGkEpsilon<BasicTurbulenceModel>::RNGkEpsilon
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -209,11 +209,19 @@ SSG<BasicTurbulenceModel>::SSG
{
if (type == typeName)
{
this->printCoeffs(type);
this->boundNormalStress(this->R_);
bound(epsilon_, this->epsilonMin_);
k_ = 0.5*tr(this->R_);
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -255,8 +255,15 @@ SpalartAllmaras<BasicTurbulenceModel>::SpalartAllmaras
{
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -188,7 +188,14 @@ kEpsilon<BasicTurbulenceModel>::kEpsilon
if (type == typeName)
{
this->printCoeffs(type);
correctNut();
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
......@@ -147,8 +147,15 @@ kOmega<BasicTurbulenceModel>::kOmega
if (type == typeName)
{
correctNut();
this->printCoeffs(type);
// Correct nut for single-phase solvers only.
// For multiphase solvers the phase construction is not complete
// at this point.
if (isType<geometricOneField>(alpha))
{
correctNut();
}
}
}
......
Supports Markdown
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