Skip to content

GitLab

Commit 454374af authored by Andrew Heather's avatar Andrew Heather
Browse files

updating tubulence model io

parent 349ddc5f
Hide whitespace changes
Inline Side-by-side
src/turbulenceModels/compressible/LRR/LRR.C
View file @ 454374af
......@@ -55,23 +55,23 @@ LRR::LRR
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.09)),
Clrr1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clrr1", 1.8)),
Clrr2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clrr2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Ceps", 0.15)),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clrr1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr1", 1.8)),
Clrr2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clrr2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
couplingFactor_
(
turbulenceModelCoeffs_.lookupOrDefault<scalar>("couplingFactor", 0.0)
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0)
),
alphaR(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaR", 1.22)),
alphaR(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)),
alphaEps
(
turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaEps", 0.76923)
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
),
alphah(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0)),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
R_
(
......@@ -138,6 +138,8 @@ LRR::LRR
<< " is not in range 0 - 1" << nl
<< exit(FatalError);
}
printCoeffs();
}
......@@ -192,25 +194,21 @@ bool LRR::read()
{
if (turbulenceModel::read())
{
Cmu = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.09);
Clrr1 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clrr1", 1.8);
Clrr2 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clrr2", 0.6);
C1 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.44);
C2 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.92);
Cs = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cs", 0.25);
Ceps = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Ceps", 0.15);
alphaR = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaR", 1.22);
alphaEps = turbulenceModelCoeffs_.lookupOrDefault<scalar>
(
"alphaEps",
0.76923
);
alphah = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0);
couplingFactor_ = turbulenceModelCoeffs_.lookupOrDefault<scalar>
(
"couplingFactor",
0.0
);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr1", Clrr1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clrr2", Clrr2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>
(
"couplingFactor",
couplingFactor_
);
if (couplingFactor_ < 0.0 || couplingFactor_ > 1.0)
{
......
src/turbulenceModels/compressible/LRR/LRR.H
View file @ 454374af
......@@ -59,21 +59,21 @@ class LRR
{
// Private data
dimensionedScalar Cmu;
scalar Cmu;
dimensionedScalar Clrr1;
dimensionedScalar Clrr2;
scalar Clrr1;
scalar Clrr2;
dimensionedScalar C1;
dimensionedScalar C2;
dimensionedScalar Cs;
dimensionedScalar Ceps;
scalar C1;
scalar C2;
scalar Cs;
scalar Ceps;
scalar couplingFactor_;
dimensionedScalar alphaR;
dimensionedScalar alphaEps;
dimensionedScalar alphah;
scalar alphaR;
scalar alphaEps;
scalar alphah;
volSymmTensorField R_;
volScalarField k_;
......@@ -114,7 +114,7 @@ public:
//- Return the effective diffusivity for R
tmp<volScalarField> DREff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DREff", alphaR*mut_ + mu())
);
......@@ -123,7 +123,7 @@ public:
//- Return the effective diffusivity for epsilon
tmp<volScalarField> DepsilonEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DepsilonEff", alphaEps*mut_ + mu())
);
......@@ -132,7 +132,7 @@ public:
//- Return the effective turbulent thermal diffusivity
tmp<volScalarField> alphaEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("alphaEff", alphah*mut_ + alpha())
);
......
src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
View file @ 454374af
......@@ -57,25 +57,25 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.09)),
Clg1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clg1", 1.8)),
Clg2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clg2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Ceps", 0.15)),
C1Ref(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1Ref", 0.5)),
C2Ref(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2Ref", 0.3)),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
Clg1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg1", 1.8)),
Clg2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Clg2", 0.6)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
Cs(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cs", 0.25)),
Ceps(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Ceps", 0.15)),
C1Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1Ref", 0.5)),
C2Ref(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2Ref", 0.3)),
couplingFactor_
(
turbulenceModelCoeffs_.lookupOrDefault<scalar>("couplingFactor", 0.0)
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("couplingFactor", 0.0)
),
alphaR(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaR", 1.22)),
alphaR(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaR", 1.22)),
alphaEps
(
turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaEps", 0.76923)
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
),
alphah(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0)),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
y_(mesh_),
......@@ -144,6 +144,8 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
<< " is not in range 0 - 1" << nl
<< exit(FatalError);
}
printCoeffs();
}
......@@ -198,27 +200,23 @@ bool LaunderGibsonRSTM::read()
{
if (turbulenceModel::read())
{
Cmu = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.09);
Clg1 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clg1", 1.8);
Clg2 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Clg2", 0.6);
C1 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.44);
C2 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.92);
Cs = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cs", 0.25);
Ceps = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Ceps", 0.15);
C1Ref = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1Ref", 0.5);
C2Ref = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2Ref", 0.3);
alphaR = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaR", 1.22);
alphaEps = turbulenceModelCoeffs_.lookupOrDefault<scalar>
(
"alphaEps",
0.76923
);
alphah = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0);
couplingFactor_ = turbulenceModelCoeffs_.lookupOrDefault<scalar>
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg1", Clg1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Clg2", Clg2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cs", Cs);
turbulenceModelCoeffs_.readIfPresent<scalar>("Ceps", Ceps);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1Ref", C1Ref);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2Ref", C2Ref);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaR", alphaR);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>
(
"couplingFactor",
0.0
couplingFactor_
);
if (couplingFactor_ < 0.0 || couplingFactor_ > 1.0)
......
src/turbulenceModels/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
View file @ 454374af
......@@ -59,24 +59,24 @@ class LaunderGibsonRSTM
{
// Private data
dimensionedScalar Cmu;
scalar Cmu;
dimensionedScalar Clg1;
dimensionedScalar Clg2;
scalar Clg1;
scalar Clg2;
dimensionedScalar C1;
dimensionedScalar C2;
dimensionedScalar Cs;
dimensionedScalar Ceps;
scalar C1;
scalar C2;
scalar Cs;
scalar Ceps;
dimensionedScalar C1Ref;
dimensionedScalar C2Ref;
scalar C1Ref;
scalar C2Ref;
scalar couplingFactor_;
dimensionedScalar alphaR;
dimensionedScalar alphaEps;
dimensionedScalar alphah;
scalar alphaR;
scalar alphaEps;
scalar alphah;
wallDistReflection y_;
......@@ -121,7 +121,7 @@ public:
//- Return the effective diffusivity for R
tmp<volScalarField> DREff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DREff", alphaR*mut_ + mu())
);
......@@ -130,7 +130,7 @@ public:
//- Return the effective diffusivity for epsilon
tmp<volScalarField> DepsilonEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DepsilonEff", alphaEps*mut_ + mu())
);
......@@ -139,7 +139,7 @@ public:
//- Return the effective turbulent thermal diffusivity
tmp<volScalarField> alphaEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("alphaEff", alphah*mut_ + alpha())
);
......
src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.C
View file @ 454374af
......@@ -71,16 +71,16 @@ LaunderSharmaKE::LaunderSharmaKE
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.92)),
C3(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphak", 1.0)),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.44)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.92)),
C3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.0)),
alphaEps
(
turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaEps", 0.76923)
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
),
alphah(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0)),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
k_
(
......@@ -120,7 +120,9 @@ LaunderSharmaKE::LaunderSharmaKE
),
Cmu*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
)
{}
{
printCoeffs();
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
......@@ -179,16 +181,12 @@ bool LaunderSharmaKE::read()
{
if (turbulenceModel::read())
{
Cmu = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.09);
C1 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.44);
C2 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.92);
C3 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C3", -0.33);
alphaEps = turbulenceModelCoeffs_.lookupOrDefault<scalar>
(
"alphaEps",
0.76923
);
alphah = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C3", C3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
return true;
}
......
src/turbulenceModels/compressible/LaunderSharmaKE/LaunderSharmaKE.H
View file @ 454374af
......@@ -59,13 +59,13 @@ class LaunderSharmaKE
{
// Private data
dimensionedScalar Cmu;
dimensionedScalar C1;
dimensionedScalar C2;
dimensionedScalar C3;
dimensionedScalar alphak;
dimensionedScalar alphaEps;
dimensionedScalar alphah;
scalar Cmu;
scalar C1;
scalar C2;
scalar C3;
scalar alphak;
scalar alphaEps;
scalar alphah;
volScalarField k_;
volScalarField epsilon_;
......@@ -111,7 +111,7 @@ public:
//- Return the effective diffusivity for k
tmp<volScalarField> DkEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DkEff", alphak*mut_ + mu())
);
......@@ -120,7 +120,7 @@ public:
//- Return the effective diffusivity for epsilon
tmp<volScalarField> DepsilonEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DepsilonEff", alphaEps*mut_ + mu())
);
......@@ -129,7 +129,7 @@ public:
//- Return the effective turbulent thermal diffusivity
tmp<volScalarField> alphaEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("alphaEff", alphah*mut_ + alpha())
);
......
src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.C
View file @ 454374af
......@@ -55,15 +55,18 @@ RNGkEpsilon::RNGkEpsilon
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
Cmu(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.0845)),
C1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.42)),
C2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.68)),
C3(turbulenceModelCoeffs_.lookupOrDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphak", 1.39)),
alphaEps(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaEps", 1.39)),
alphah(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0)),
eta0(turbulenceModelCoeffs_.lookupOrDefault<scalar>("eta0", 4.38)),
beta(turbulenceModelCoeffs_.lookupOrDefault<scalar>("beta", 0.012)),
Cmu(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cmu", 0.0845)),
C1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C1", 1.42)),
C2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C2", 1.68)),
C3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("C3", -0.33)),
alphak(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphak", 1.39)),
alphaEps
(
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaEps", 1.39)
),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
eta0(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("eta0", 4.38)),
beta(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("beta", 0.012)),
k_
(
......@@ -105,6 +108,8 @@ RNGkEpsilon::RNGkEpsilon
)
{
# include "wallViscosityI.H"
printCoeffs();
}
......@@ -164,19 +169,15 @@ bool RNGkEpsilon::read()
{
if (turbulenceModel::read())
{
Cmu = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cmu", 0.0845);
C1 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C1", 1.42);
C2 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C2", 1.68);
C3 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("C3", -0.33);
alphak = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphak", 1.39);
alphaEps = turbulenceModelCoeffs_.lookupOrDefault<scalar>
(
"alphaEps",
1.39
);
alphah = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0);
eta0 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("eta0", 4.38);
beta = turbulenceModelCoeffs_.lookupOrDefault<scalar>("beta", 0.012);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cmu", Cmu);
turbulenceModelCoeffs_.readIfPresent<scalar>("C1", C1);
turbulenceModelCoeffs_.readIfPresent<scalar>("C2", C2);
turbulenceModelCoeffs_.readIfPresent<scalar>("C3", C3);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphak", alphak);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaEps", alphaEps);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
turbulenceModelCoeffs_.readIfPresent<scalar>("eta0", eta0);
turbulenceModelCoeffs_.readIfPresent<scalar>("beta", beta);
return true;
}
......
src/turbulenceModels/compressible/RNGkEpsilon/RNGkEpsilon.H
View file @ 454374af
......@@ -58,15 +58,15 @@ class RNGkEpsilon
{
// Private data
dimensionedScalar Cmu;
dimensionedScalar C1;
dimensionedScalar C2;
dimensionedScalar C3;
dimensionedScalar alphak;
dimensionedScalar alphaEps;
dimensionedScalar alphah;
dimensionedScalar eta0;
dimensionedScalar beta;
scalar Cmu;
scalar C1;
scalar C2;
scalar C3;
scalar alphak;
scalar alphaEps;
scalar alphah;
scalar eta0;
scalar beta;
volScalarField k_;
volScalarField epsilon_;
......@@ -106,7 +106,7 @@ public:
//- Return the effective diffusivity for k
tmp<volScalarField> DkEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DkEff", alphak*mut_ + mu())
);
......@@ -115,7 +115,7 @@ public:
//- Return the effective diffusivity for epsilon
tmp<volScalarField> DepsilonEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("DepsilonEff", alphaEps*mut_ + mu())
);
......@@ -124,7 +124,7 @@ public:
//- Return the effective turbulent thermal diffusivity
tmp<volScalarField> alphaEff() const
{
return tmp<volScalarField>
return tmp<volScalarField>
(
new volScalarField("alphaEff", alphah*mut_ + alpha())
);
......
src/turbulenceModels/compressible/SpalartAllmaras/SpalartAllmaras.C
View file @ 454374af
......@@ -115,16 +115,19 @@ SpalartAllmaras::SpalartAllmaras
:
turbulenceModel(typeName, rho, U, phi, thermophysicalModel),
alphaNut(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphaNut", 1.5)),
alphah(turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0)),
alphaNut
(
turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphaNut", 1.5)
),
alphah(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("alphah", 1.0)),
Cb1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cb1", 0.1355)),
Cb2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cb2", 0.622)),
Cb1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cb1", 0.1355)),
Cb2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cb2", 0.622)),
Cw1(Cb1/sqr(kappa_) + alphaNut*(1.0 + Cb2)),
Cw2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cw2", 0.3)),
Cw3(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cw3", 2.0)),
Cv1(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cv1", 7.1)),
Cv2(turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cv2", 5.0)),
Cw2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cw2", 0.3)),
Cw3(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cw3", 2.0)),
Cv1(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cv1", 7.1)),
Cv2(turbulenceModelCoeffs_.lookupOrAddDefault<scalar>("Cv2", 5.0)),
nuTilda_
(
......@@ -153,7 +156,9 @@ SpalartAllmaras::SpalartAllmaras
),
d_(mesh_)
{}
{
printCoeffs();
}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
......@@ -214,20 +219,16 @@ bool SpalartAllmaras::read()
{
if (turbulenceModel::read())
{
alphaNut = turbulenceModelCoeffs_.lookupOrDefault<scalar>
(
"alphaNut",
1.5
);
alphah = turbulenceModelCoeffs_.lookupOrDefault<scalar>("alphah", 1.0);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphaNut", alphaNut);
turbulenceModelCoeffs_.readIfPresent<scalar>("alphah", alphah);
Cb1 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cb1", 0.1355);
Cb2 = turbulenceModelCoeffs_.lookupOrDefault<scalar>("Cb2", 0.622);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cb1", Cb1);
turbulenceModelCoeffs_.readIfPresent<scalar>("Cb2", Cb2);