diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 6777535c7bf318cfdd08fa23e66c80f0d21ac981..88e3bb166ccce12802e945824aa4efac3fe278a9 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -118,13 +118,13 @@ LRR::LRR
0.15
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
couplingFactor_
@@ -266,7 +266,7 @@ bool LRR::read()
C2_.readIfPresent(coeffDict());
Cs_.readIfPresent(coeffDict());
Ceps_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
couplingFactor_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
index f8e23f1ae61d56b9ca885133060c29f977e515a6..3727b8846467becbd8671a09d9652e32c34bb582 100644
--- a/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
@@ -40,9 +40,7 @@ Description
C2 1.92;
Cs 0.25;
Ceps 0.15;
- alphah 1.0; // only for compressible
- alphaEps 0.76923;
- alphaR 1.22; // only for compressible
+ sigmaEps 1.3;
couplingFactor 0.0; // only for incompressible
}
@endverbatim
@@ -76,23 +74,28 @@ class LRR
{
// Private data
- dimensionedScalar Cmu_;
+ // Model coefficients
- dimensionedScalar Clrr1_;
- dimensionedScalar Clrr2_;
+ dimensionedScalar Cmu_;
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar Cs_;
- dimensionedScalar Ceps_;
- dimensionedScalar alphaEps_;
+ dimensionedScalar Clrr1_;
+ dimensionedScalar Clrr2_;
- dimensionedScalar couplingFactor_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar Cs_;
+ dimensionedScalar Ceps_;
+ dimensionedScalar sigmaEps_;
- volSymmTensorField R_;
- volScalarField k_;
- volScalarField epsilon_;
- volScalarField nut_;
+ dimensionedScalar couplingFactor_;
+
+
+ // Fields
+
+ volSymmTensorField R_;
+ volScalarField k_;
+ volScalarField epsilon_;
+ volScalarField nut_;
public:
@@ -138,7 +141,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 8eb230792f5087e2a02014537963a79f3cbc6969..5d282cf3322536d5840944f1a4c3c991230c0a24 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -81,13 +81,13 @@ LamBremhorstKE::LamBremhorstKE
1.92
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
"alphaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
@@ -207,7 +207,7 @@ bool LamBremhorstKE::read()
Cmu_.readIfPresent(coeffDict());
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
return true;
}
@@ -239,8 +239,7 @@ void LamBremhorstKE::correct()
Rt_ = sqr(k_)/(nu()*epsilon_);
volScalarField Ry = sqrt(k_)*y_/nu();
- fMu_ = sqr(scalar(1) - exp(-0.0165*Ry))
- *(scalar(1) + 20.5/(Rt_ + SMALL));
+ fMu_ = sqr(scalar(1) - exp(-0.0165*Ry))*(scalar(1) + 20.5/(Rt_ + SMALL));
volScalarField f1 = scalar(1) + pow(0.05/(fMu_ + SMALL), 3);
volScalarField f2 = scalar(1) - exp(-sqr(Rt_));
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
index b241d2da38b11bc9cbd727305c74d50ee47d0e80..fad278186b904605d85162b6d87bc7fedd097548 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -62,7 +62,7 @@ class LamBremhorstKE
dimensionedScalar Cmu_;
dimensionedScalar C1_;
dimensionedScalar C2_;
- dimensionedScalar alphaEps_;
+ dimensionedScalar sigmaEps_;
volScalarField k_;
volScalarField epsilon_;
@@ -118,7 +118,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 805bc3d4536c467b0935dbb49ce44619b48ea686..7230b20dc970ee8da4a0a425366fd42a0d37260d 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -64,6 +64,15 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
0.09
)
),
+ kappa_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "kappa",
+ coeffDict_,
+ 0.41
+ )
+ ),
Clg1_
(
dimensioned<scalar>::lookupOrAddToDict
@@ -118,22 +127,22 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
0.15
)
),
- alphaR_
+ sigmaR_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaR",
+ "sigmaR",
coeffDict_,
- 1.22
+ 0.81967
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
C1Ref_
@@ -215,7 +224,7 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
autoCreateNut("nut", mesh_)
)
{
- nut_ == Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+ nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
nut_.correctBoundaryConditions();
if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
@@ -290,8 +299,8 @@ bool LaunderGibsonRSTM::read()
C2_.readIfPresent(coeffDict());
Cs_.readIfPresent(coeffDict());
Ceps_.readIfPresent(coeffDict());
- alphaR_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmaR_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
C1Ref_.readIfPresent(coeffDict());
C2Ref_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index cb6f04491da73b5643ae0b8507b466a608d51d78..a28e0cb6e4fc7ec2c912413354577c7de0b72a91 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -33,6 +33,7 @@ Description
LaunderGibsonRSTMCoeffs
{
Cmu 0.09;
+ kappa 0.41;
Clg1 1.8;
Clg2 0.6;
C1 1.44;
@@ -41,9 +42,8 @@ Description
C2Ref 0.3;
Cs 0.25;
Ceps 0.15;
- alphah 1.0; // only for compressible
- alphaEps 0.76923;
- alphaR 1.22;
+ sigmaEps 1.3;
+ sigmaR 0.81967;
couplingFactor 0.0;
}
@endverbatim
@@ -78,29 +78,35 @@ class LaunderGibsonRSTM
{
// Private data
- dimensionedScalar Cmu_;
+ // Model coefficients
- dimensionedScalar Clg1_;
- dimensionedScalar Clg2_;
+ dimensionedScalar Cmu_;
+ dimensionedScalar kappa_;
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar Cs_;
- dimensionedScalar Ceps_;
- dimensionedScalar alphaR_;
- dimensionedScalar alphaEps_;
+ dimensionedScalar Clg1_;
+ dimensionedScalar Clg2_;
- dimensionedScalar C1Ref_;
- dimensionedScalar C2Ref_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar Cs_;
+ dimensionedScalar Ceps_;
+ dimensionedScalar sigmaR_;
+ dimensionedScalar sigmaEps_;
- dimensionedScalar couplingFactor_;
+ dimensionedScalar C1Ref_;
+ dimensionedScalar C2Ref_;
- wallDistReflection yr_;
+ dimensionedScalar couplingFactor_;
- volSymmTensorField R_;
- volScalarField k_;
- volScalarField epsilon_;
- volScalarField nut_;
+
+ // Fields
+
+ wallDistReflection yr_;
+
+ volSymmTensorField R_;
+ volScalarField k_;
+ volScalarField epsilon_;
+ volScalarField nut_;
public:
@@ -137,7 +143,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DREff", alphaR_*nut_ + nu())
+ new volScalarField("DREff", nut_/sigmaR_ + nu())
);
}
@@ -146,7 +152,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index fa0841645fcd536fd1454204bbf432c4f0fa47fa..c21c9676b6166cad5d9bb724066d31e0453245e2 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -27,6 +27,8 @@ License
#include "LaunderSharmaKE.H"
#include "addToRunTimeSelectionTable.H"
+#include "backwardsCompatibilityWallFunctions.H"
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@@ -95,13 +97,13 @@ LaunderSharmaKE::LaunderSharmaKE
1.92
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
@@ -131,8 +133,22 @@ LaunderSharmaKE::LaunderSharmaKE
mesh_
),
- nut_(Cmu_*fMu()*sqr(k_)/(epsilonTilda_ + epsilonSmall_))
+ nut_
+ (
+ IOobject
+ (
+ "nut",
+ runTime_.timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ autoCreateNut("nut", mesh_)
+ )
{
+ nut_ = Cmu_*fMu()*sqr(k_)/(epsilonTilda_ + epsilonSmall_);
+ nut_.correctBoundaryConditions();
+
printCoeffs();
}
@@ -197,7 +213,7 @@ bool LaunderSharmaKE::read()
Cmu_.readIfPresent(coeffDict());
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
return true;
}
@@ -261,6 +277,7 @@ void LaunderSharmaKE::correct()
// Re-calculate viscosity
nut_ = Cmu_*fMu()*sqr(k_)/epsilonTilda_;
+ nut_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 5c64d4325379204b2bab70866aeba93cd4890e3a..0eb2ce304d67644e51f47afc5d86989287402fb0 100644
--- a/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -37,9 +37,7 @@ Description
C1 1.44;
C2 1.92;
C3 -0.33;
- alphah 1.0; // only for compressible
- alphahk 1.0; // only for compressible
- alphaEps 0.76923;
+ sigmaEps 1.3;
}
@endverbatim
@@ -72,15 +70,19 @@ class LaunderSharmaKE
{
// Private data
- dimensionedScalar Cmu_;
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar alphaEps_;
+ // Model coefficients
- volScalarField k_;
- volScalarField epsilonTilda_;
+ dimensionedScalar Cmu_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmaEps_;
- volScalarField nut_;
+
+ // Fields
+
+ volScalarField k_;
+ volScalarField epsilonTilda_;
+ volScalarField nut_;
// Private member functions
@@ -132,7 +134,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index bc864c546a880ae8f2309a8e528925a2b53bfd3f..c786116bd9dd1652bcdd24027a8b18074312610b 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -72,22 +72,22 @@ LienCubicKE::LienCubicKE
1.92
)
),
- alphak_
+ sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphak",
+ "sigmak",
coeffDict_,
1.0
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
A1_
@@ -293,8 +293,8 @@ bool LienCubicKE::read()
{
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphak_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmak_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
A1_.readIfPresent(coeffDict());
A2_.readIfPresent(coeffDict());
Ctau1_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index 21a500e33d1f2e2fa20eabff29fbfdf657c81982..8a3d969467413a71438cc23bee347d8d8a1c78f2 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -57,30 +57,35 @@ class LienCubicKE
{
// Private data
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar alphak_;
- dimensionedScalar alphaEps_;
- dimensionedScalar A1_;
- dimensionedScalar A2_;
- dimensionedScalar Ctau1_;
- dimensionedScalar Ctau2_;
- dimensionedScalar Ctau3_;
- dimensionedScalar alphaKsi_;
+ // Model coefficients
- volScalarField k_;
- volScalarField epsilon_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmak_;
+ dimensionedScalar sigmaEps_;
+ dimensionedScalar A1_;
+ dimensionedScalar A2_;
+ dimensionedScalar Ctau1_;
+ dimensionedScalar Ctau2_;
+ dimensionedScalar Ctau3_;
+ dimensionedScalar alphaKsi_;
- volTensorField gradU_;
- volScalarField eta_;
- volScalarField ksi_;
- volScalarField Cmu_;
- volScalarField fEta_;
- volScalarField C5viscosity_;
- volScalarField nut_;
+ // Fields
- volSymmTensorField nonlinearStress_;
+ volScalarField k_;
+ volScalarField epsilon_;
+
+ volTensorField gradU_;
+ volScalarField eta_;
+ volScalarField ksi_;
+ volScalarField Cmu_;
+ volScalarField fEta_;
+ volScalarField C5viscosity_;
+
+ volScalarField nut_;
+
+ volSymmTensorField nonlinearStress_;
public:
@@ -117,7 +122,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DkEff", alphak_*nut_ + nu())
+ new volScalarField("DkEff", nut_/sigmak_ + nu())
);
}
@@ -126,7 +131,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 63323abad0a40061dde7d757b0cb9727b32649b7..2fdb30e8cf9fbfe68c7e602ee8ad566988b53234 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -71,22 +71,22 @@ LienCubicKELowRe::LienCubicKELowRe
1.92
)
),
- alphak_
+ sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphak",
+ "sigmak",
coeffDict_,
1.0
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
A1_
@@ -152,6 +152,15 @@ LienCubicKELowRe::LienCubicKELowRe
0.09
)
),
+ kappa_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "kappa",
+ coeffDict_,
+ 0.41
+ )
+ ),
Am_
(
dimensioned<scalar>::lookupOrAddToDict
@@ -337,8 +346,8 @@ bool LienCubicKELowRe::read()
{
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphak_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmak_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
A1_.readIfPresent(coeffDict());
A2_.readIfPresent(coeffDict());
Ctau1_.readIfPresent(coeffDict());
@@ -346,6 +355,7 @@ bool LienCubicKELowRe::read()
Ctau3_.readIfPresent(coeffDict());
alphaKsi_.readIfPresent(coeffDict());
CmuWall_.readIfPresent(coeffDict());
+ kappa_.readIfPresent(coeffDict());
Am_.readIfPresent(coeffDict());
Aepsilon_.readIfPresent(coeffDict());
Amu_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
index d692063511ca21c586aa270321d2b5c78bec4838..27a19de4f0c1bf3921b0de392756feebc4e54aa0 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
@@ -73,40 +73,47 @@ class LienCubicKELowRe
{
// Private data
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar alphak_;
- dimensionedScalar alphaEps_;
- dimensionedScalar A1_;
- dimensionedScalar A2_;
- dimensionedScalar Ctau1_;
- dimensionedScalar Ctau2_;
- dimensionedScalar Ctau3_;
- dimensionedScalar alphaKsi_;
+ // Model coefficients
- dimensionedScalar CmuWall_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmak_;
+ dimensionedScalar sigmaEps_;
+ dimensionedScalar A1_;
+ dimensionedScalar A2_;
+ dimensionedScalar Ctau1_;
+ dimensionedScalar Ctau2_;
+ dimensionedScalar Ctau3_;
+ dimensionedScalar alphaKsi_;
- dimensionedScalar Am_;
- dimensionedScalar Aepsilon_;
- dimensionedScalar Amu_;
+ dimensionedScalar CmuWall_;
+ dimensionedScalar kappa_;
- volScalarField k_;
- volScalarField epsilon_;
+ dimensionedScalar Am_;
+ dimensionedScalar Aepsilon_;
+ dimensionedScalar Amu_;
- wallDist y_;
- volTensorField gradU_;
- volScalarField eta_;
- volScalarField ksi_;
- volScalarField Cmu_;
- volScalarField fEta_;
- volScalarField C5viscosity_;
+ // Fields
- volScalarField yStar_;
+ volScalarField k_;
+ volScalarField epsilon_;
- volScalarField nut_;
+ wallDist y_;
+
+ volTensorField gradU_;
+ volScalarField eta_;
+ volScalarField ksi_;
+ volScalarField Cmu_;
+ volScalarField fEta_;
+ volScalarField C5viscosity_;
+
+ volScalarField yStar_;
+
+ volScalarField nut_;
+
+ volSymmTensorField nonlinearStress_;
- volSymmTensorField nonlinearStress_;
public:
@@ -142,7 +149,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DkEff", alphak_*nut_ + nu())
+ new volScalarField("DkEff", nut_/sigmak_ + nu())
);
}
@@ -151,7 +158,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index b8b8ab7dbe6851497cc9cd56adb73708ac8b7f88..50a9aecf89434cc25dd2018a599ad94f397084a5 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -53,20 +53,87 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
:
RASModel(typeName, U, phi, lamTransportModel),
- C1(coeffDict_.lookupOrAddDefault<scalar>("C1", 1.44)),
- C2(coeffDict_.lookupOrAddDefault<scalar>("C2", 1.92)),
- alphak(coeffDict_.lookupOrAddDefault<scalar>("alphak", 1.0)),
- alphaEps
+ C1_
(
- coeffDict_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "C1",
+ coeffDict_,
+ 1.44
+ )
+ ),
+ C2_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "C2",
+ coeffDict_,
+ 1.92
+ )
+ ),
+ sigmak_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "sigmak",
+ coeffDict_,
+ 1.0
+ )
+ ),
+ sigmaEps_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "sigmaEps",
+ coeffDict_,
+ 1.3
+ )
+ ),
+ Cmu_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "Cmu",
+ coeffDict_,
+ 0.09
+ )
+ ),
+ kappa_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "kappa",
+ coeffDict_,
+ 0.41
+ )
+ ),
+ Am_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "Am",
+ coeffDict_,
+ 0.016
+ )
+ ),
+ Aepsilon_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "Aepsilon",
+ coeffDict_,
+ 0.263
+ )
),
- Cmu(coeffDict_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
- Am(coeffDict_.lookupOrAddDefault<scalar>("Am", 0.016)),
- Aepsilon
+ Amu_
(
- coeffDict_.lookupOrAddDefault<scalar>("Aepsilon", 0.263)
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "Amu",
+ coeffDict_,
+ 0.00222
+ )
),
- Amu(coeffDict_.lookupOrAddDefault<scalar>("Amu", 0.00222)),
k_
(
@@ -100,8 +167,8 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
nut_
(
- Cmu*(scalar(1) - exp(-Am*yStar_))
- /(scalar(1) - exp(-Aepsilon*yStar_) + SMALL)*sqr(k_)
+ Cmu_*(scalar(1) - exp(-Am_*yStar_))
+ /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)*sqr(k_)
/(epsilon_ + epsilonSmall_)
)
{
@@ -169,14 +236,14 @@ bool LienLeschzinerLowRe::read()
{
if (RASModel::read())
{
- coeffDict().readIfPresent<scalar>("C1", C1);
- coeffDict().readIfPresent<scalar>("C2", C2);
- coeffDict().readIfPresent<scalar>("alphak", alphak);
- coeffDict().readIfPresent<scalar>("alphaEps", alphaEps);
- coeffDict().readIfPresent<scalar>("Cmu", Cmu);
- coeffDict().readIfPresent<scalar>("Am", Am);
- coeffDict().readIfPresent<scalar>("Aepsilon", Aepsilon);
- coeffDict().readIfPresent<scalar>("Amu", Amu);
+ C1_.readIfPresent(coeffDict());
+ C2_.readIfPresent(coeffDict());
+ sigmak_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
+ Cmu_.readIfPresent(coeffDict());
+ Am_.readIfPresent(coeffDict());
+ Aepsilon_.readIfPresent(coeffDict());
+ Amu_.readIfPresent(coeffDict());
return true;
}
@@ -201,7 +268,7 @@ void LienLeschzinerLowRe::correct()
y_.correct();
}
- scalar Cmu75 = pow(Cmu, 0.75);
+ scalar Cmu75 = pow(Cmu_.value(), 0.75);
volTensorField gradU = fvc::grad(U_);
@@ -212,12 +279,12 @@ void LienLeschzinerLowRe::correct()
volScalarField Rt = sqr(k_)/(nu()*epsilon_);
volScalarField fMu =
- (scalar(1) - exp(-Am*yStar_))
- /(scalar(1) - exp(-Aepsilon*yStar_) + SMALL);
+ (scalar(1) - exp(-Am_*yStar_))
+ /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL);
volScalarField f2 = scalar(1) - 0.3*exp(-sqr(Rt));
- volScalarField G = Cmu*fMu*sqr(k_)/epsilon_*S2;
+ volScalarField G = Cmu_*fMu*sqr(k_)/epsilon_*S2;
// Dissipation equation
@@ -227,12 +294,12 @@ void LienLeschzinerLowRe::correct()
+ fvm::div(phi_, epsilon_)
- fvm::laplacian(DepsilonEff(), epsilon_)
==
- C1*G*epsilon_/k_
+ C1_*G*epsilon_/k_
// E-term
- + C2*f2*Cmu75*pow(k_, scalar(0.5))
- /(kappa_*y_*(scalar(1) - exp(-Aepsilon*yStar_)))
- *exp(-Amu*sqr(yStar_))*epsilon_
- - fvm::Sp(C2*f2*epsilon_/k_, epsilon_)
+ + C2_*f2*Cmu75*pow(k_, scalar(0.5))
+ /(kappa_*y_*(scalar(1) - exp(-Aepsilon_*yStar_)))
+ *exp(-Amu_*sqr(yStar_))*epsilon_
+ - fvm::Sp(C2_*f2*epsilon_/k_, epsilon_)
);
epsEqn().relax();
@@ -262,7 +329,7 @@ void LienLeschzinerLowRe::correct()
// Re-calculate viscosity
- nut_ = Cmu*fMu*sqr(k_)/epsilon_;
+ nut_ = Cmu_*fMu*sqr(k_)/epsilon_;
}
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index 90cd525bfcc65ef6db8e524a4e22656358430aa9..0951ae2904b5c7ad7db4c61cba6bb06174d953fd 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -59,24 +59,30 @@ class LienLeschzinerLowRe
{
// Private data
- scalar C1;
- scalar C2;
- scalar alphak;
- scalar alphaEps;
- scalar Cmu;
+ // Model coefficients
- scalar Am;
- scalar Aepsilon;
- scalar Amu;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmak_;
+ dimensionedScalar sigmaEps_;
+ dimensionedScalar Cmu_;
+ dimensionedScalar kappa_;
- volScalarField k_;
- volScalarField epsilon_;
+ dimensionedScalar Am_;
+ dimensionedScalar Aepsilon_;
+ dimensionedScalar Amu_;
- wallDist y_;
- volScalarField yStar_;
+ // Fields
- volScalarField nut_;
+ volScalarField k_;
+ volScalarField epsilon_;
+
+ wallDist y_;
+
+ volScalarField yStar_;
+
+ volScalarField nut_;
public:
@@ -112,7 +118,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DkEff", alphak*nut_ + nu())
+ new volScalarField("DkEff", nut_/sigmak_ + nu())
);
}
@@ -121,7 +127,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
index a998d3af8e092ecb639f6fac1fae615ad0bd828a..1c3f7f8a41d89d42daca218d6e18888497cc486d 100644
--- a/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
@@ -5,7 +5,7 @@
labelList cellBoundaryFaceCount(epsilon_.size(), 0);
//- use constant Cmu for epsilon in the near-wall cell
- scalar Cmu75 = pow(Cmu, 0.75);
+ scalar Cmu75 = pow(Cmu_.value(), 0.75);
const fvPatchList& patches = mesh_.boundary();
@@ -44,9 +44,9 @@
Cmu75*pow(k_[faceCelli], 1.5)
/(
kappa_.value()*y_[faceCelli]
- *(1.0 - exp(-Aepsilon*yStar_[faceCelli]))
+ *(1.0 - exp(-Aepsilon_.value()*yStar_[faceCelli]))
)
- *exp(-Amu*sqr(yStar_[faceCelli]));
+ *exp(-Amu_.value()*sqr(yStar_[faceCelli]));
}
}
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index 7ca59b6e6ebbc10cce1fffbf7895c386fa86acb7..04c46bd7b9a3f086e5a901a899103b575884bec1 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -71,22 +71,22 @@ NonlinearKEShih::NonlinearKEShih
1.92
)
),
- alphak_
+ sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphak",
+ "sigmak",
coeffDict_,
1.0
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
A1_
@@ -144,6 +144,25 @@ NonlinearKEShih::NonlinearKEShih
)
),
+ kappa_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "kappa_",
+ coeffDict_,
+ 0.41
+ )
+ ),
+ E_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "E",
+ coeffDict_,
+ 9.0
+ )
+ ),
+
k_
(
IOobject
@@ -196,7 +215,7 @@ NonlinearKEShih::NonlinearKEShih
)
)
{
-# include "wallNonlinearViscosityI.H"
+ #include "wallNonlinearViscosityI.H"
printCoeffs();
}
@@ -264,8 +283,8 @@ bool NonlinearKEShih::read()
{
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphak_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmak_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
A1_.readIfPresent(coeffDict());
A2_.readIfPresent(coeffDict());
Ctau1_.readIfPresent(coeffDict());
@@ -273,6 +292,9 @@ bool NonlinearKEShih::read()
Ctau3_.readIfPresent(coeffDict());
alphaKsi_.readIfPresent(coeffDict());
+ kappa_.readIfPresent(coeffDict());
+ E_.readIfPresent(coeffDict());
+
return true;
}
else
@@ -300,7 +322,7 @@ void NonlinearKEShih::correct()
Cmu_*sqr(k_)/epsilon_*S2
- (nonlinearStress_ && gradU_);
-# include "nonLinearWallFunctionsI.H"
+ #include "nonLinearWallFunctionsI.H"
// Dissipation equation
tmp<fvScalarMatrix> epsEqn
@@ -315,7 +337,7 @@ void NonlinearKEShih::correct()
epsEqn().relax();
-# include "wallDissipationI.H"
+ #include "wallDissipationI.H"
solve(epsEqn);
bound(epsilon_, epsilon0_);
@@ -347,7 +369,7 @@ void NonlinearKEShih::correct()
nut_ = Cmu_*sqr(k_)/epsilon_;
-# include "wallNonlinearViscosityI.H"
+ #include "wallNonlinearViscosityI.H"
nonlinearStress_ = symm
(
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
index 366a3a5fb1a2e08bc5fc41f0fe4032c8f6efc32a..cf2277ec1adf97ac34ff7165a0fb8acc624b7610 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
@@ -49,7 +49,7 @@ namespace RASModels
{
/*---------------------------------------------------------------------------*\
- Class NonlinearKEShih Declaration
+ Class NonlinearKEShih Declaration
\*---------------------------------------------------------------------------*/
class NonlinearKEShih
@@ -58,29 +58,38 @@ class NonlinearKEShih
{
// Private data
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar alphak_;
- dimensionedScalar alphaEps_;
- dimensionedScalar A1_;
- dimensionedScalar A2_;
- dimensionedScalar Ctau1_;
- dimensionedScalar Ctau2_;
- dimensionedScalar Ctau3_;
- dimensionedScalar alphaKsi_;
+ // Model coefficients
- volScalarField k_;
- volScalarField epsilon_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmak_;
+ dimensionedScalar sigmaEps_;
+ dimensionedScalar A1_;
+ dimensionedScalar A2_;
+ dimensionedScalar Ctau1_;
+ dimensionedScalar Ctau2_;
+ dimensionedScalar Ctau3_;
+ dimensionedScalar alphaKsi_;
- volTensorField gradU_;
- volScalarField eta_;
- volScalarField ksi_;
- volScalarField Cmu_;
- volScalarField fEta_;
+ dimensionedScalar kappa_;
+ dimensionedScalar E_;
- volScalarField nut_;
- volSymmTensorField nonlinearStress_;
+ // Fields
+
+ volScalarField k_;
+ volScalarField epsilon_;
+
+ volTensorField gradU_;
+ volScalarField eta_;
+ volScalarField ksi_;
+ volScalarField Cmu_;
+ volScalarField fEta_;
+
+ volScalarField nut_;
+
+ volSymmTensorField nonlinearStress_;
+
public:
@@ -116,7 +125,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DkEff", alphak_*nut_ + nu())
+ new volScalarField("DkEff", nut_/sigmak_ + nu())
);
}
@@ -125,7 +134,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C
index 35210399fff0f535b7e98cb9b556d474d8b21287..440b3d8374690321c0c22e64a04a43fa89b609b5 100644
--- a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.C
@@ -27,6 +27,8 @@ License
#include "QZeta.H"
#include "addToRunTimeSelectionTable.H"
+#include "backwardsCompatibilityWallFunctions.H"
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
@@ -105,13 +107,13 @@ QZeta::QZeta
1.92
)
),
- alphaZeta_
+ sigmaZeta_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaZeta",
+ "sigmaZeta",
coeffDict_,
- 0.76923
+ 1.3
)
),
anisotropic_
@@ -178,8 +180,22 @@ QZeta::QZeta
epsilon_.boundaryField().types()
),
- nut_(Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_))
+ nut_
+ (
+ IOobject
+ (
+ "nut",
+ runTime_.timeName(),
+ mesh_,
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ autoCreateNut("nut", mesh_)
+ )
{
+ nut_ = Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+ nut_.correctBoundaryConditions();
+
printCoeffs();
}
@@ -244,7 +260,7 @@ bool QZeta::read()
Cmu_.readIfPresent(coeffDict());
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphaZeta_.readIfPresent(coeffDict());
+ sigmaZeta_.readIfPresent(coeffDict());
anisotropic_.readIfPresent("anisotropic", coeffDict());
return true;
@@ -267,7 +283,7 @@ void QZeta::correct()
volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));
- volScalarField G = nut_/(2.0*q_)*S2;
+ volScalarField G("RASModel::G", nut_/(2.0*q_)*S2);
volScalarField E = nu()*nut_/q_*fvc::magSqrGradGrad(U_);
@@ -315,6 +331,7 @@ void QZeta::correct()
// Re-calculate viscosity
nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
+ nut_.correctBoundaryConditions();
}
diff --git a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H
index cb53bf116c8c0c63d00265e7bbf15a8c8b885bbe..cdc4a1e134a9f015c2230c0e1a140fedb5cf75c3 100644
--- a/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H
+++ b/src/turbulenceModels/incompressible/RAS/QZeta/QZeta.H
@@ -58,19 +58,24 @@ class QZeta
{
// Private data
- dimensionedScalar Cmu_;
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar alphaZeta_;
- Switch anisotropic_;
+ // Model coefficients
- volScalarField k_;
- volScalarField epsilon_;
+ dimensionedScalar Cmu_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmaZeta_;
+ Switch anisotropic_;
- volScalarField q_;
- volScalarField zeta_;
- volScalarField nut_;
+ // Fields
+
+ volScalarField k_;
+ volScalarField epsilon_;
+
+ volScalarField q_;
+ volScalarField zeta_;
+
+ volScalarField nut_;
// Private member functions
@@ -122,7 +127,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DzetaEff", alphaZeta_*nut_ + nu())
+ new volScalarField("DzetaEff", nut_/sigmaZeta_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index 620a3fe2af4c23f87b6a24cecc244bfb469f396f..6b300390c923ac5231a4b20be73e7aa4e8c6d227 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -47,8 +47,7 @@ void RASModel::printCoeffs()
{
if (printCoeffs_)
{
- Info<< type() << "Coeffs" << coeffDict_ << nl
- << "wallFunctionCoeffs" << wallFunctionDict_ << endl;
+ Info<< type() << "Coeffs" << coeffDict_ << endl;
}
}
@@ -81,37 +80,6 @@ RASModel::RASModel
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
coeffDict_(subDictPtr(type + "Coeffs")),
- wallFunctionDict_(subDictPtr("wallFunctionCoeffs")),
- kappa_
- (
- dimensioned<scalar>::lookupOrAddToDict
- (
- "kappa",
- wallFunctionDict_,
- 0.4187
- )
- ),
- E_
- (
- dimensioned<scalar>::lookupOrAddToDict
- (
- "E",
- wallFunctionDict_,
- 9.0
- )
- ),
- Cmu_
- (
- dimensioned<scalar>::lookupOrAddToDict
- (
- "Cmu",
- wallFunctionDict_,
- 0.09
- )
- ),
-
- yPlusLam_(yPlusLam(kappa_.value(), E_.value())),
-
k0_("k0", dimVelocity*dimVelocity, SMALL),
epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
epsilonSmall_("epsilonSmall", epsilon0_.dimensions(), SMALL),
@@ -190,7 +158,7 @@ scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const
}
-tmp<scalarField> RASModel::yPlus(const label patchNo) const
+tmp<scalarField> RASModel::yPlus(const label patchNo, const scalar Cmu) const
{
const fvPatch& curPatch = mesh_.boundary()[patchNo];
@@ -199,7 +167,7 @@ tmp<scalarField> RASModel::yPlus(const label patchNo) const
if (isType<wallFvPatch>(curPatch))
{
- Yp = pow(Cmu_.value(), 0.25)
+ Yp = pow(Cmu, 0.25)
*y_[patchNo]
*sqrt(k()().boundaryField()[patchNo].patchInternalField())
/nu().boundaryField()[patchNo];
@@ -241,16 +209,6 @@ bool RASModel::read()
coeffDict_ <<= *dictPtr;
}
- if (const dictionary* dictPtr = subDictPtr("wallFunctionCoeffs"))
- {
- wallFunctionDict_ <<= *dictPtr;
- }
-
- kappa_.readIfPresent(wallFunctionDict_);
- E_.readIfPresent(wallFunctionDict_);
- Cmu_.readIfPresent(wallFunctionDict_);
- yPlusLam_ = yPlusLam(kappa_.value(), E_.value());
-
k0_.readIfPresent(*this);
epsilon0_.readIfPresent(*this);
epsilonSmall_.readIfPresent(*this);
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index fdc2b2e3b7e17f001ed0365088ce373dc663bc5f..ce57c6690edae2da612bbbef2fc0f3dda1357cda 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -86,20 +86,6 @@ protected:
//- Model coefficients dictionary
dictionary coeffDict_;
- // Wall function properties
-
- //- Wall function dictionary
- dictionary wallFunctionDict_;
-
- dimensionedScalar kappa_;
-
- dimensionedScalar E_;
-
- dimensionedScalar Cmu_;
-
- //- Value of y+ at the edge of the laminar sublayer
- scalar yPlusLam_;
-
//- Lower limit of k
dimensionedScalar k0_;
@@ -188,115 +174,86 @@ public:
// Member Functions
- //- Return the value of k0 which k is not allowed to be less than
- const dimensionedScalar& k0() const
- {
- return k0_;
- }
-
- //- Return the value of epsilon0 which epsilon is not allowed to be
- // less than
- const dimensionedScalar& epsilon0() const
- {
- return epsilon0_;
- }
-
- //- Return the value of epsilonSmall which is added to epsilon when
- // calculating nut
- const dimensionedScalar& epsilonSmall() const
- {
- return epsilonSmall_;
- }
-
- //- Return the value of omega0 which epsilon is not allowed to be
- // less than
- const dimensionedScalar& omega0() const
- {
- return omega0_;
- }
-
- //- Return the value of omegaSmall which is added to epsilon when
- // calculating nut
- const dimensionedScalar& omegaSmall() const
- {
- return omegaSmall_;
- }
-
- //- Allow k0 to be changed
- dimensionedScalar& k0()
- {
- return k0_;
- }
-
- //- Allow epsilon0 to be changed
- dimensionedScalar& epsilon0()
- {
- return epsilon0_;
- }
-
- //- Allow epsilonSmall to be changed
- dimensionedScalar& epsilonSmall()
- {
- return epsilonSmall_;
- }
-
- //- Allow omega0 to be changed
- dimensionedScalar& omega0()
- {
- return omega0_;
- }
-
- //- Allow omegaSmall to be changed
- dimensionedScalar& omegaSmall()
- {
- return omegaSmall_;
- }
-
- //- Return kappa for use in wall-functions
- dimensionedScalar kappa() const
- {
- return kappa_;
- }
-
- //- Return E for use in wall-functions
- dimensionedScalar E() const
- {
- return E_;
- }
-
- //- Return Cmu for use in wall-functions
- dimensionedScalar Cmu() const
- {
- return Cmu_;
- }
-
- //- Return the near wall distances
- const nearWallDist& y() const
- {
- return y_;
- }
-
- //- Calculate y+ at the edge of the laminar sublayer
- scalar yPlusLam(const scalar kappa, const scalar E) const;
-
- //- Return y+ at the edge of the laminar sublayer
- // for use in wall-functions
- scalar yPlusLam() const
- {
- return yPlusLam_;
- }
-
- //- Const access to the coefficients dictionary
- const dictionary& coeffDict() const
- {
- return coeffDict_;
- }
-
- //- Const access to the wall functions coefficients dictionary
- const dictionary& walLFunctionDict() const
- {
- return wallFunctionDict_;
- }
+ // Access
+
+ //- Return the value of k0 which k is not allowed to be less than
+ const dimensionedScalar& k0() const
+ {
+ return k0_;
+ }
+
+ //- Return the value of epsilon0 which epsilon is not allowed to be
+ // less than
+ const dimensionedScalar& epsilon0() const
+ {
+ return epsilon0_;
+ }
+
+ //- Return the value of epsilonSmall which is added to epsilon when
+ // calculating nut
+ const dimensionedScalar& epsilonSmall() const
+ {
+ return epsilonSmall_;
+ }
+
+ //- Return the value of omega0 which epsilon is not allowed to be
+ // less than
+ const dimensionedScalar& omega0() const
+ {
+ return omega0_;
+ }
+
+ //- Return the value of omegaSmall which is added to epsilon when
+ // calculating nut
+ const dimensionedScalar& omegaSmall() const
+ {
+ return omegaSmall_;
+ }
+
+ //- Allow k0 to be changed
+ dimensionedScalar& k0()
+ {
+ return k0_;
+ }
+
+ //- Allow epsilon0 to be changed
+ dimensionedScalar& epsilon0()
+ {
+ return epsilon0_;
+ }
+
+ //- Allow epsilonSmall to be changed
+ dimensionedScalar& epsilonSmall()
+ {
+ return epsilonSmall_;
+ }
+
+ //- Allow omega0 to be changed
+ dimensionedScalar& omega0()
+ {
+ return omega0_;
+ }
+
+ //- Allow omegaSmall to be changed
+ dimensionedScalar& omegaSmall()
+ {
+ return omegaSmall_;
+ }
+
+ //- Return the near wall distances
+ const nearWallDist& y() const
+ {
+ return y_;
+ }
+
+ //- Calculate y+ at the edge of the laminar sublayer
+ scalar yPlusLam(const scalar kappa, const scalar E) const;
+
+ //- Const access to the coefficients dictionary
+ const dictionary& coeffDict() const
+ {
+ return coeffDict_;
+ }
//- Return the turbulence viscosity
@@ -327,7 +284,11 @@ public:
virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const = 0;
//- Return yPlus for the given patch
- virtual tmp<scalarField> yPlus(const label patchI) const;
+ virtual tmp<scalarField> yPlus
+ (
+ const label patchI,
+ const scalar Cmu
+ ) const;
//- Solve the turbulence equations and correct the turbulence viscosity
virtual void correct() = 0;
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 96067ca63f39d07d3254dcf62cecebb65ff2fc16..aa7e53700195d98a9ef0f51a819a332e1df88a4f 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -81,22 +81,22 @@ RNGkEpsilon::RNGkEpsilon
1.68
)
),
- alphak_
+ sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphak",
+ "sigmak",
coeffDict_,
- 1.39
+ 0.71942
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 1.39
+ 0.71942
)
),
eta0_
@@ -223,8 +223,8 @@ bool RNGkEpsilon::read()
Cmu_.readIfPresent(coeffDict());
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphak_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmak_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
eta0_.readIfPresent(coeffDict());
beta_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index 77da01f91957c07a9072beb6ed48e818806973d9..55cc9b1775e9858996ccb48502df566465244e8f 100644
--- a/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -35,10 +35,8 @@ Description
Cmu 0.0845;
C1 1.42;
C2 1.68;
- C3 -0.33; // only for compressible
- alphah 1.0; // only for compressible
- alphak 1.39;
- alphaEps 1.39;
+ sigmak 0.71942;
+ sigmaEps 0.71942;
eta0 4.38;
beta 0.012;
}
@@ -73,17 +71,22 @@ class RNGkEpsilon
{
// Private data
- dimensionedScalar Cmu_;
- dimensionedScalar C1_;
- dimensionedScalar C2_;
- dimensionedScalar alphak_;
- dimensionedScalar alphaEps_;
- dimensionedScalar eta0_;
- dimensionedScalar beta_;
+ // Model coefficients
- volScalarField k_;
- volScalarField epsilon_;
- volScalarField nut_;
+ dimensionedScalar Cmu_;
+ dimensionedScalar C1_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmak_;
+ dimensionedScalar sigmaEps_;
+ dimensionedScalar eta0_;
+ dimensionedScalar beta_;
+
+
+ // Fields
+
+ volScalarField k_;
+ volScalarField epsilon_;
+ volScalarField nut_;
public:
@@ -120,7 +123,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DkEff", alphak_*nut_ + nu())
+ new volScalarField("DkEff", nut_/sigmak_ + nu())
);
}
@@ -129,7 +132,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 228c51970342609c3d477cb0b0605e49ff5f6fc6..ed37eca064c10eb36ee0d751840899f552d81cf9 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -113,13 +113,22 @@ SpalartAllmaras::SpalartAllmaras
:
RASModel(typeName, U, phi, lamTransportModel),
- alphaNut_
+ sigmaNut_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaNut",
+ "sigmaNut",
coeffDict_,
- 1.5
+ 0.66666
+ )
+ ),
+ kappa_
+ (
+ dimensioned<scalar>::lookupOrAddToDict
+ (
+ "kappa",
+ coeffDict_,
+ 0.41
)
),
@@ -141,7 +150,7 @@ SpalartAllmaras::SpalartAllmaras
0.622
)
),
- Cw1_(Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_)),
+ Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
Cw2_
(
dimensioned<scalar>::lookupOrAddToDict
@@ -217,7 +226,7 @@ tmp<volScalarField> SpalartAllmaras::DnuTildaEff() const
{
return tmp<volScalarField>
(
- new volScalarField("DnuTildaEff", alphaNut_*nuTilda_ + nu())
+ new volScalarField("DnuTildaEff", nuTilda_/sigmaNut_ + nu())
);
}
@@ -316,11 +325,11 @@ bool SpalartAllmaras::read()
{
if (RASModel::read())
{
- alphaNut_.readIfPresent(coeffDict());
+ sigmaNut_.readIfPresent(coeffDict());
Cb1_.readIfPresent(coeffDict());
Cb2_.readIfPresent(coeffDict());
- Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
+ Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
Cw2_.readIfPresent(coeffDict());
Cw3_.readIfPresent(coeffDict());
Cv1_.readIfPresent(coeffDict());
@@ -362,7 +371,7 @@ void SpalartAllmaras::correct()
+ fvm::div(phi_, nuTilda_)
- fvm::Sp(fvc::div(phi_), nuTilda_)
- fvm::laplacian(DnuTildaEff(), nuTilda_)
- - alphaNut_*Cb2_*magSqr(fvc::grad(nuTilda_))
+ - Cb2_/sigmaNut_*magSqr(fvc::grad(nuTilda_))
==
Cb1_*Stilda*nuTilda_
- fvm::Sp(Cw1_*fw(Stilda)*nuTilda_/sqr(d_), nuTilda_)
diff --git a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 7d99fe3028e97165ba8cc87739a22824026eaa24..9cb482b98c960945c73c636aa9bce640fa334c24 100644
--- a/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -54,8 +54,8 @@ Description
Cw3 2.0;
Cv1 7.1;
Cv2 5.0;
- alphaNut 1.5;
- alphah 1.0; // only for compressible
+ sigmaNut 0.66666;
+ kappa 0.41;
}
@endverbatim
@@ -89,36 +89,46 @@ class SpalartAllmaras
{
// Private data
- dimensionedScalar alphaNut_;
+ // Model coefficients
- dimensionedScalar Cb1_;
- dimensionedScalar Cb2_;
- dimensionedScalar Cw1_;
- dimensionedScalar Cw2_;
- dimensionedScalar Cw3_;
- dimensionedScalar Cv1_;
- dimensionedScalar Cv2_;
+ dimensionedScalar sigmaNut_;
+ dimensionedScalar kappa_;
- volScalarField nuTilda_;
- volScalarField nut_;
+ dimensionedScalar Cb1_;
+ dimensionedScalar Cb2_;
+ dimensionedScalar Cw1_;
+ dimensionedScalar Cw2_;
+ dimensionedScalar Cw3_;
+ dimensionedScalar Cv1_;
+ dimensionedScalar Cv2_;
- wallDist d_;
+
+ // Fields
+
+ volScalarField nuTilda_;
+ volScalarField nut_;
+
+ wallDist d_;
// Private member functions
tmp<volScalarField> chi() const;
+
tmp<volScalarField> fv1(const volScalarField& chi) const;
+
tmp<volScalarField> fv2
(
const volScalarField& chi,
const volScalarField& fv1
) const;
+
tmp<volScalarField> fv3
(
const volScalarField& chi,
const volScalarField& fv1
) const;
+
tmp<volScalarField> fw(const volScalarField& Stilda) const;
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index ef73cea4289b160fe608b38e0b74fa8c76d47b3b..75ecd907b3cc0d2a3f14e02cb5da2732e38dedd8 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -69,7 +69,10 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
kName_("k"),
GName_("RASModel::G"),
nuName_("nu"),
- nutName_("nut")
+ nutName_("nut"),
+ Cmu_(0.09),
+ kappa_(0.41),
+ E_(9.0)
{
checkType();
}
@@ -88,7 +91,10 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
kName_(ptf.kName_),
GName_(ptf.GName_),
nuName_(ptf.nuName_),
- nutName_(ptf.nutName_)
+ nutName_(ptf.nutName_),
+ Cmu_(ptf.Cmu_),
+ kappa_(ptf.kappa_),
+ E_(ptf.E_)
{
checkType();
}
@@ -106,7 +112,10 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
kName_(dict.lookupOrDefault<word>("k", "k")),
GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
nuName_(dict.lookupOrDefault<word>("nu", "nu")),
- nutName_(dict.lookupOrDefault<word>("nut", "nut"))
+ nutName_(dict.lookupOrDefault<word>("nut", "nut")),
+ Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ E_(dict.lookupOrDefault<scalar>("E", 9.0))
{
checkType();
}
@@ -122,7 +131,10 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
kName_(ewfpsf.kName_),
GName_(ewfpsf.GName_),
nuName_(ewfpsf.nuName_),
- nutName_(ewfpsf.nutName_)
+ nutName_(ewfpsf.nutName_),
+ Cmu_(ewfpsf.Cmu_),
+ kappa_(ewfpsf.kappa_),
+ E_(ewfpsf.E_)
{
checkType();
}
@@ -139,7 +151,10 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
kName_(ewfpsf.kName_),
GName_(ewfpsf.GName_),
nuName_(ewfpsf.nuName_),
- nutName_(ewfpsf.nutName_)
+ nutName_(ewfpsf.nutName_),
+ Cmu_(ewfpsf.Cmu_),
+ kappa_(ewfpsf.kappa_),
+ E_(ewfpsf.E_)
{
checkType();
}
@@ -150,15 +165,12 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
{
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalar Cmu = rasModel.Cmu().value();
- const scalar Cmu25 = pow(Cmu, 0.25);
- const scalar Cmu75 = pow(Cmu, 0.75);
- const scalar kappa = rasModel.kappa().value();
- const scalar yPlusLam = rasModel.yPlusLam();
-
+ const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
const scalarField& y = rasModel.y()[patch().index()];
+ const scalar Cmu25 = pow(Cmu_, 0.25);
+ const scalar Cmu75 = pow(Cmu_, 0.75);
+
volScalarField& G = const_cast<volScalarField&>
(db().lookupObject<volScalarField>(GName_));
@@ -185,7 +197,7 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
- epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa*y[faceI]);
+ epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
if (yPlus > yPlusLam)
{
@@ -193,7 +205,7 @@ void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
(nutw[faceI] + nuw[faceI])
*magGradUw[faceI]
*Cmu25*sqrt(k[faceCellI])
- /(kappa*y[faceI]);
+ /(kappa_*y[faceI]);
}
else
{
@@ -222,6 +234,9 @@ void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
+ os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+ os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
index de2717c0530d4aa008c69027e2b8ba0a2c1f09e3..311e83d4eba04e22b84424ddb6599c72144d6218 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -74,6 +74,15 @@ class epsilonWallFunctionFvPatchScalarField
//- Name of turbulent viscosity field
word nutName_;
+ //- Cmu coefficient
+ scalar Cmu_;
+
+ //- Von Karman constant
+ scalar kappa_;
+
+ //- E coefficient
+ scalar E_;
+
// Private member functions
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C
index 54b2e4f7b8306de50843a21d5e417acd3c119601..7e503b29c94ab237b97ec4866967d228aa9d67c9 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C
@@ -25,9 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "kQRWallFunctionFvPatchField.H"
-#include "RASModel.H"
#include "fvPatchFieldMapper.H"
-#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
#include "wallFvPatch.H"
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
index afb08a5d52320014e214532e6da48e6ebaad1a90..1c0ec08a2f9cddb72f40894058739535ececc57b 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
@@ -77,6 +77,9 @@ nutRoughWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(p, iF),
kName_("k"),
nuName_("nu"),
+ Cmu_(0.09),
+ kappa_(0.41),
+ E_(9.0),
Ks_(p.size(), 0.0),
Cs_(p.size(), 0.0)
{}
@@ -94,6 +97,9 @@ nutRoughWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
kName_(ptf.kName_),
nuName_(ptf.nuName_),
+ Cmu_(0.09),
+ kappa_(0.41),
+ E_(9.0),
Ks_(ptf.Ks_, mapper),
Cs_(ptf.Cs_, mapper)
{}
@@ -110,6 +116,9 @@ nutRoughWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(p, iF, dict),
kName_(dict.lookupOrDefault<word>("k", "k")),
nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+ Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ E_(dict.lookupOrDefault<scalar>("E", 9.0)),
Ks_("Ks", dict, p.size()),
Cs_("Cs", dict, p.size())
{}
@@ -118,29 +127,35 @@ nutRoughWallFunctionFvPatchScalarField
nutRoughWallFunctionFvPatchScalarField::
nutRoughWallFunctionFvPatchScalarField
(
- const nutRoughWallFunctionFvPatchScalarField& nrwfpsf
+ const nutRoughWallFunctionFvPatchScalarField& rwfpsf
)
:
- fixedValueFvPatchScalarField(nrwfpsf),
- kName_(nrwfpsf.kName_),
- nuName_(nrwfpsf.nuName_),
- Ks_(nrwfpsf.Ks_),
- Cs_(nrwfpsf.Cs_)
+ fixedValueFvPatchScalarField(rwfpsf),
+ kName_(rwfpsf.kName_),
+ nuName_(rwfpsf.nuName_),
+ Cmu_(rwfpsf.Cmu_),
+ kappa_(rwfpsf.kappa_),
+ E_(rwfpsf.E_),
+ Ks_(rwfpsf.Ks_),
+ Cs_(rwfpsf.Cs_)
{}
nutRoughWallFunctionFvPatchScalarField::
nutRoughWallFunctionFvPatchScalarField
(
- const nutRoughWallFunctionFvPatchScalarField& nrwfpsf,
+ const nutRoughWallFunctionFvPatchScalarField& rwfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(nrwfpsf, iF),
- kName_(nrwfpsf.kName_),
- nuName_(nrwfpsf.nuName_),
- Ks_(nrwfpsf.Ks_),
- Cs_(nrwfpsf.Cs_)
+ fixedValueFvPatchScalarField(rwfpsf, iF),
+ kName_(rwfpsf.kName_),
+ nuName_(rwfpsf.nuName_),
+ Cmu_(rwfpsf.Cmu_),
+ kappa_(rwfpsf.kappa_),
+ E_(rwfpsf.E_),
+ Ks_(rwfpsf.Ks_),
+ Cs_(rwfpsf.Cs_)
{}
@@ -176,15 +191,11 @@ void nutRoughWallFunctionFvPatchScalarField::rmap
void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
{
const RASModel& ras = db().lookupObject<RASModel>("RASProperties");
-
- const scalar Cmu = ras.Cmu().value();
- const scalar Cmu25 = pow(Cmu, 0.25);
- const scalar kappa = ras.kappa().value();
- const scalar E = ras.E().value();
- const scalar yPlusLam = ras.yPlusLam();
-
+ const scalar yPlusLam = ras.yPlusLam(kappa_, E_);
const scalarField& y = ras.y()[patch().index()];
+ const scalar Cmu25 = pow(Cmu_, 0.25);
+
const scalarField& k = db().lookupObject<volScalarField>(kName_);
const scalarField& nuw =
@@ -200,11 +211,11 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
scalar yPlus = uStar*y[faceI]/nuw[faceI];
scalar KsPlus = uStar*Ks_[faceI]/nuw[faceI];
- scalar Edash = E;
+ scalar Edash = E_;
if (KsPlus > 2.25)
{
- Edash = E/fnRough(KsPlus, Cs_[faceI]);
+ Edash /= fnRough(KsPlus, Cs_[faceI]);
}
if (yPlus > yPlusLam)
@@ -219,7 +230,7 @@ void nutRoughWallFunctionFvPatchScalarField::updateCoeffs()
min
(
nuw[faceI]
- *(yPlus*kappa/log(max(Edash*yPlus, 1+1e-4)) - 1),
+ *(yPlus*kappa_/log(max(Edash*yPlus, 1+1e-4)) - 1),
2*limitingNutw
), 0.5*limitingNutw
);
@@ -246,6 +257,9 @@ void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
fvPatchField<scalar>::write(os);
writeEntryIfDifferent<word>(os, "k", "k", kName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+ os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+ os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
Cs_.writeEntry("Cs", os);
Ks_.writeEntry("Ks", os);
writeEntry("value", os);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
index 3371cbaa6d396ccdcb7ef8aec11ca662c10882f2..8f81fe03465d2e3398a5d3471c268af373d774e0 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
@@ -70,6 +70,15 @@ class nutRoughWallFunctionFvPatchScalarField
//- Name of laminar viscosity field
word nuName_;
+ //- Cmu coefficient
+ scalar Cmu_;
+
+ //- Von Karman constant
+ scalar kappa_;
+
+ //- E coefficient
+ scalar E_;
+
//- Roughness height
scalarField Ks_;
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index 2cf0f985d4cae588564f6cd56dc0f72471a0f64c..28e8902e6e1576b2857fb191aa60ffbbf8083db2 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/
#include "nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -51,6 +50,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(p, iF),
UName_("U"),
nuName_("nu"),
+ kappa_(0.41),
+ E_(9.0),
roughnessHeight_(pTraits<scalar>::zero),
roughnessConstant_(pTraits<scalar>::zero),
roughnessFudgeFactor_(pTraits<scalar>::zero)
@@ -69,6 +70,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
UName_(ptf.UName_),
nuName_(ptf.nuName_),
+ kappa_(ptf.kappa_),
+ E_(ptf.E_),
roughnessHeight_(ptf.roughnessHeight_),
roughnessConstant_(ptf.roughnessConstant_),
roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
@@ -86,6 +89,8 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
fixedValueFvPatchScalarField(p, iF, dict),
UName_(dict.lookupOrDefault<word>("U", "U")),
nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ E_(dict.lookupOrDefault<scalar>("E", 9.0)),
roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
@@ -95,31 +100,35 @@ nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
(
- const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& tppsf
+ const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf
)
:
- fixedValueFvPatchScalarField(tppsf),
- UName_(tppsf.UName_),
- nuName_(tppsf.nuName_),
- roughnessHeight_(tppsf.roughnessHeight_),
- roughnessConstant_(tppsf.roughnessConstant_),
- roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
+ fixedValueFvPatchScalarField(rwfpsf),
+ UName_(rwfpsf.UName_),
+ nuName_(rwfpsf.nuName_),
+ kappa_(rwfpsf.kappa_),
+ E_(rwfpsf.E_),
+ roughnessHeight_(rwfpsf.roughnessHeight_),
+ roughnessConstant_(rwfpsf.roughnessConstant_),
+ roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
{}
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
(
- const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& tppsf,
+ const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(tppsf, iF),
- UName_(tppsf.UName_),
- nuName_(tppsf.nuName_),
- roughnessHeight_(tppsf.roughnessHeight_),
- roughnessConstant_(tppsf.roughnessConstant_),
- roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
+ fixedValueFvPatchScalarField(rwfpsf, iF),
+ UName_(rwfpsf.UName_),
+ nuName_(rwfpsf.nuName_),
+ kappa_(rwfpsf.kappa_),
+ E_(rwfpsf.E_),
+ roughnessHeight_(rwfpsf.roughnessHeight_),
+ roughnessConstant_(rwfpsf.roughnessConstant_),
+ roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
{}
@@ -130,10 +139,6 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
const Pstream::commsTypes
)
{
- const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalar kappa = rasModel.kappa().value();
- const scalar E = rasModel.E().value();
const scalar yPlusLam = 11.225;
// The reciprical of the distance to the adjacent cell centre.
@@ -167,7 +172,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
{
const scalar magUpara = magUp[facei];
const scalar Re = magUpara/(nuw[facei]*ry[facei]);
- const scalar kappaRe = kappa*Re;
+ const scalar kappaRe = kappa_*Re;
scalar yPlus = yPlusLam;
const scalar ryPlusLam = 1.0/yPlus;
@@ -216,7 +221,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
(c_1*sint_2*KsPlus/t_1) + (c_3*logt_1*cos(t_2));
}
- scalar denom = 1.0 + log(E* yPlus) - G - yPlusGPrime;
+ scalar denom = 1.0 + log(E_*yPlus) - G - yPlusGPrime;
if (mag(denom) > VSMALL)
{
yPlus = (kappaRe + yPlus*(1 - yPlusGPrime))/denom;
@@ -252,7 +257,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
{
const scalar magUpara = magUp[facei];
const scalar Re = magUpara/(nuw[facei]*ry[facei]);
- const scalar kappaRe = kappa*Re;
+ const scalar kappaRe = kappa_*Re;
scalar yPlus = yPlusLam;
const scalar ryPlusLam = 1.0/yPlus;
@@ -263,7 +268,7 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate
do
{
yPlusLast = yPlus;
- yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
+ yPlus = (kappaRe + yPlus)/(1.0 + log(E_*yPlus));
} while(mag(ryPlusLam*(yPlus - yPlusLast)) > 0.0001 && ++iter < 10);
@@ -288,6 +293,8 @@ void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
fixedValueFvPatchScalarField::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+ os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
os.writeKeyword("roughnessHeight")
<< roughnessHeight_ << token::END_STATEMENT << nl;
os.writeKeyword("roughnessConstant")
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
index f8c65f434cd49043d544120a8df7d928da30eeeb..2e4ccab83b7baa6480d106737fbe1bf488743830 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
@@ -64,6 +64,12 @@ class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
//- Name of laminar viscosity field
word nuName_;
+ //- Von Karman constant
+ scalar kappa_;
+
+ //- E coefficient
+ scalar E_;
+
// Roughness model parameters
//- Height
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
index 35193acaf3e59ad7b609f74f30bc58c74f00f6a4..751808f0d8f4cef648a084f3a1f454709c8487e0 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -50,7 +50,9 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(p, iF),
UName_("U"),
- nuName_("nu")
+ nuName_("nu"),
+ kappa_(0.41),
+ E_(9.0)
{}
@@ -65,7 +67,9 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
UName_(ptf.UName_),
- nuName_(ptf.nuName_)
+ nuName_(ptf.nuName_),
+ kappa_(ptf.kappa_),
+ E_(ptf.E_)
{}
@@ -79,32 +83,38 @@ nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(p, iF, dict),
UName_(dict.lookupOrDefault<word>("U", "U")),
- nuName_(dict.lookupOrDefault<word>("nu", "nu"))
+ nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ E_(dict.lookupOrDefault<scalar>("E", 9.0))
{}
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
(
- const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& tppsf
+ const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf
)
:
- fixedValueFvPatchScalarField(tppsf),
- UName_(tppsf.UName_),
- nuName_(tppsf.nuName_)
+ fixedValueFvPatchScalarField(sawfpsf),
+ UName_(sawfpsf.UName_),
+ nuName_(sawfpsf.nuName_),
+ kappa_(sawfpsf.kappa_),
+ E_(sawfpsf.E_)
{}
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
(
- const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& tppsf,
+ const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(tppsf, iF),
- UName_(tppsf.UName_),
- nuName_(tppsf.nuName_)
+ fixedValueFvPatchScalarField(sawfpsf, iF),
+ UName_(sawfpsf.UName_),
+ nuName_(sawfpsf.nuName_),
+ kappa_(sawfpsf.kappa_),
+ E_(sawfpsf.E_)
{}
@@ -116,10 +126,7 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
)
{
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalar kappa = rasModel.kappa().value();
- const scalar E = rasModel.E().value();
- const scalar yPlusLam = rasModel.yPlusLam();
+ const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
const scalarField& ry = patch().deltaCoeffs();
@@ -136,7 +143,7 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
{
scalar magUpara = magUp[facei];
- scalar kappaRe = kappa*magUpara/(nuw[facei]*ry[facei]);
+ scalar kappaRe = kappa_*magUpara/(nuw[facei]*ry[facei]);
scalar yPlus = yPlusLam;
scalar ryPlusLam = 1.0/yPlus;
@@ -147,13 +154,13 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate
do
{
yPlusLast = yPlus;
- yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
+ yPlus = (kappaRe + yPlus)/(1.0 + log(E_*yPlus));
} while(mag(ryPlusLam*(yPlus - yPlusLast)) > 0.01 && ++iter < 10 );
if (yPlus > yPlusLam)
{
- nutw[facei] = nuw[facei]*(yPlus*kappa/log(E*yPlus) - 1);
+ nutw[facei] = nuw[facei]*(yPlus*kappa_/log(E_*yPlus) - 1);
}
else
{
@@ -171,6 +178,8 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
fixedValueFvPatchScalarField::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+ os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
index 0ab4a7671a1bdb4249a2c00df6de0137fc7319c9..bb66266f369a4a79f5da465b57bab3f7b7652368 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
@@ -64,6 +64,12 @@ class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
//- Name of laminar viscosity field
word nuName_;
+ //- Von Karman constant
+ scalar kappa_;
+
+ //- E coefficient
+ scalar E_;
+
public:
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
index 9e0db0b1e67a0b36d8102bff6afdabb77aaef9a3..974f2981bc40ce2a200eb6e3db1e1984ad68fcc9 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -25,7 +25,6 @@ License
\*---------------------------------------------------------------------------*/
#include "nutSpalartAllmarasWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
#include "fvPatchFieldMapper.H"
#include "volFields.H"
#include "addToRunTimeSelectionTable.H"
@@ -50,7 +49,9 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(p, iF),
UName_("U"),
- nuName_("nu")
+ nuName_("nu"),
+ kappa_(0.41),
+ E_(9.0)
{}
@@ -65,7 +66,9 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
UName_(ptf.UName_),
- nuName_(ptf.nuName_)
+ nuName_(ptf.nuName_),
+ kappa_(ptf.kappa_),
+ E_(ptf.E_)
{}
@@ -79,32 +82,38 @@ nutSpalartAllmarasWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(p, iF, dict),
UName_(dict.lookupOrDefault<word>("U", "U")),
- nuName_(dict.lookupOrDefault<word>("nu", "nu"))
+ nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ E_(dict.lookupOrDefault<scalar>("E", 9.0))
{}
nutSpalartAllmarasWallFunctionFvPatchScalarField::
nutSpalartAllmarasWallFunctionFvPatchScalarField
(
- const nutSpalartAllmarasWallFunctionFvPatchScalarField& tppsf
+ const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf
)
:
- fixedValueFvPatchScalarField(tppsf),
- UName_(tppsf.UName_),
- nuName_(tppsf.nuName_)
+ fixedValueFvPatchScalarField(wfpsf),
+ UName_(wfpsf.UName_),
+ nuName_(wfpsf.nuName_),
+ kappa_(wfpsf.kappa_),
+ E_(wfpsf.E_)
{}
nutSpalartAllmarasWallFunctionFvPatchScalarField::
nutSpalartAllmarasWallFunctionFvPatchScalarField
(
- const nutSpalartAllmarasWallFunctionFvPatchScalarField& tppsf,
+ const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(tppsf, iF),
- UName_(tppsf.UName_),
- nuName_(tppsf.nuName_)
+ fixedValueFvPatchScalarField(wfpsf, iF),
+ UName_(wfpsf.UName_),
+ nuName_(wfpsf.nuName_),
+ kappa_(wfpsf.kappa_),
+ E_(wfpsf.E_)
{}
@@ -115,11 +124,6 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
const Pstream::commsTypes
)
{
- const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalar kappa = rasModel.kappa().value();
- const scalar E = rasModel.E().value();
-
const scalarField& ry = patch().deltaCoeffs();
const fvPatchVectorField& U =
@@ -147,18 +151,18 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::evaluate
do
{
- scalar kUu = min(kappa*magUpara/utau, 50);
+ scalar kUu = min(kappa_*magUpara/utau, 50);
scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
scalar f =
- utau/(ry[facei]*nuw[facei])
+ magUpara/utau
- + 1/E*(fkUu - 1.0/6.0*kUu*sqr(kUu));
+ + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
scalar df =
1.0/(ry[facei]*nuw[facei])
+ magUpara/sqr(utau)
- + 1/E*kUu*fkUu/utau;
+ + 1/E_*kUu*fkUu/utau;
scalar utauNew = utau + f/df;
err = mag((utau - utauNew)/utau);
@@ -185,6 +189,8 @@ void nutSpalartAllmarasWallFunctionFvPatchScalarField::write
fixedValueFvPatchScalarField::write(os);
writeEntryIfDifferent<word>(os, "U", "U", UName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+ os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
index 5679a2c565c055ed0012b5966b9844066a1d45ce..016a8638fd0584214819bf0e7fe9a6a9b3ba7a62 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
@@ -64,6 +64,12 @@ class nutSpalartAllmarasWallFunctionFvPatchScalarField
//- Name of laminar viscosity field
word nuName_;
+ //- Von Karman constant
+ scalar kappa_;
+
+ //- E coefficient
+ scalar E_;
+
public:
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
index 9e83ef304e1a2172c7196998754aa020e5029cec..501f89fe5d18ffa354807602175642864f235a95 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -50,7 +50,10 @@ nutWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(p, iF),
kName_("k"),
- nuName_("nu")
+ nuName_("nu"),
+ Cmu_(0.09),
+ kappa_(0.41),
+ E_(9.0)
{}
@@ -65,7 +68,10 @@ nutWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(ptf, p, iF, mapper),
kName_(ptf.kName_),
- nuName_(ptf.nuName_)
+ nuName_(ptf.nuName_),
+ Cmu_(ptf.Cmu_),
+ kappa_(ptf.kappa_),
+ E_(ptf.E_)
{}
@@ -79,32 +85,41 @@ nutWallFunctionFvPatchScalarField
:
fixedValueFvPatchScalarField(p, iF, dict),
kName_(dict.lookupOrDefault<word>("k", "k")),
- nuName_(dict.lookupOrDefault<word>("nu", "nu"))
+ nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+ Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ E_(dict.lookupOrDefault<scalar>("E", 9.0))
{}
nutWallFunctionFvPatchScalarField::
nutWallFunctionFvPatchScalarField
(
- const nutWallFunctionFvPatchScalarField& nwfpsf
+ const nutWallFunctionFvPatchScalarField& wfpsf
)
:
- fixedValueFvPatchScalarField(nwfpsf),
- kName_(nwfpsf.kName_),
- nuName_(nwfpsf.nuName_)
+ fixedValueFvPatchScalarField(wfpsf),
+ kName_(wfpsf.kName_),
+ nuName_(wfpsf.nuName_),
+ Cmu_(wfpsf.Cmu_),
+ kappa_(wfpsf.kappa_),
+ E_(wfpsf.E_)
{}
nutWallFunctionFvPatchScalarField::
nutWallFunctionFvPatchScalarField
(
- const nutWallFunctionFvPatchScalarField& nwfpsf,
+ const nutWallFunctionFvPatchScalarField& wfpsf,
const DimensionedField<scalar, volMesh>& iF
)
:
- fixedValueFvPatchScalarField(nwfpsf, iF),
- kName_(nwfpsf.kName_),
- nuName_(nwfpsf.nuName_)
+ fixedValueFvPatchScalarField(wfpsf, iF),
+ kName_(wfpsf.kName_),
+ nuName_(wfpsf.nuName_),
+ Cmu_(wfpsf.Cmu_),
+ kappa_(wfpsf.kappa_),
+ E_(wfpsf.E_)
{}
@@ -113,15 +128,11 @@ nutWallFunctionFvPatchScalarField
void nutWallFunctionFvPatchScalarField::updateCoeffs()
{
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalar Cmu = rasModel.Cmu().value();
- const scalar Cmu25 = pow(Cmu, 0.25);
- const scalar kappa = rasModel.kappa().value();
- const scalar E = rasModel.E().value();
- const scalar yPlusLam = rasModel.yPlusLam();
-
+ const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
const scalarField& y = rasModel.y()[patch().index()];
+ const scalar Cmu25 = pow(Cmu_, 0.25);
+
const volScalarField& k = db().lookupObject<volScalarField>(kName_);
const scalarField& nuw =
@@ -137,7 +148,7 @@ void nutWallFunctionFvPatchScalarField::updateCoeffs()
if (yPlus > yPlusLam)
{
- nutw[faceI] = nuw[faceI]*(yPlus*kappa/log(E*yPlus) - 1);
+ nutw[faceI] = nuw[faceI]*(yPlus*kappa_/log(E_*yPlus) - 1);
}
else
{
@@ -152,6 +163,9 @@ void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
fvPatchField<scalar>::write(os);
writeEntryIfDifferent<word>(os, "k", "k", kName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+ os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+ os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
index 6f77f7cbb1af6056fdbd210bad8c7944fd2f6686..e94ab2fe6adf3ea7128daf11f7e7fff94dfc99d6 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
@@ -65,6 +65,15 @@ class nutWallFunctionFvPatchScalarField
//- Name of laminar viscosity field
word nuName_;
+ //- Cmu coefficient
+ scalar Cmu_;
+
+ //- Von Karman constant
+ scalar kappa_;
+
+ //- E coefficient
+ scalar E_;
+
public:
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
index e10abce2d64310856b52061f2770bce04d4a5856..0e4799ed6ad83ef6d530854acb9448ed39986024 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -69,7 +69,10 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
kName_("k"),
GName_("RASModel::G"),
nuName_("nu"),
- nutName_("nut")
+ nutName_("nut"),
+ Cmu_(0.09),
+ kappa_(0.41),
+ E_(9.0)
{
checkType();
}
@@ -88,7 +91,10 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
kName_(ptf.kName_),
GName_(ptf.GName_),
nuName_(ptf.nuName_),
- nutName_(ptf.nutName_)
+ nutName_(ptf.nutName_),
+ Cmu_(ptf.Cmu_),
+ kappa_(ptf.kappa_),
+ E_(ptf.E_)
{
checkType();
}
@@ -106,7 +112,10 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
kName_(dict.lookupOrDefault<word>("k", "k")),
GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
nuName_(dict.lookupOrDefault<word>("nu", "nu")),
- nutName_(dict.lookupOrDefault<word>("nut", "nut"))
+ nutName_(dict.lookupOrDefault<word>("nut", "nut")),
+ Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+ kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+ E_(dict.lookupOrDefault<scalar>("E", 9.0))
{
checkType();
}
@@ -122,7 +131,10 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
kName_(owfpsf.kName_),
GName_(owfpsf.GName_),
nuName_(owfpsf.nuName_),
- nutName_(owfpsf.nutName_)
+ nutName_(owfpsf.nutName_),
+ Cmu_(owfpsf.Cmu_),
+ kappa_(owfpsf.kappa_),
+ E_(owfpsf.E_)
{
checkType();
}
@@ -139,7 +151,10 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
kName_(owfpsf.kName_),
GName_(owfpsf.GName_),
nuName_(owfpsf.nuName_),
- nutName_(owfpsf.nutName_)
+ nutName_(owfpsf.nutName_),
+ Cmu_(owfpsf.Cmu_),
+ kappa_(owfpsf.kappa_),
+ E_(owfpsf.E_)
{
checkType();
}
@@ -150,15 +165,11 @@ omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
void omegaWallFunctionFvPatchScalarField::updateCoeffs()
{
const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
-
- const scalar Cmu = rasModel.Cmu().value();
- const scalar Cmu25 = pow(Cmu, 0.25);
-
- const scalar kappa = rasModel.kappa().value();
- const scalar yPlusLam = rasModel.yPlusLam();
-
+ const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
const scalarField& y = rasModel.y()[patch().index()];
+ const scalar Cmu25 = pow(Cmu_, 0.25);
+
volScalarField& G = const_cast<volScalarField&>
(db().lookupObject<volScalarField>(GName_));
@@ -185,7 +196,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
- omega[faceCellI] = sqrt(k[faceCellI])/(Cmu25*kappa*y[faceI]);
+ omega[faceCellI] = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
if (yPlus > yPlusLam)
{
@@ -193,7 +204,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs()
(nutw[faceI] + nuw[faceI])
*magGradUw[faceI]
*Cmu25*sqrt(k[faceCellI])
- /(kappa*y[faceI]);
+ /(kappa_*y[faceI]);
}
else
{
@@ -213,6 +224,9 @@ void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
+ os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+ os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+ os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
writeEntry("value", os);
}
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
index caab2fab7cf0a8cc1da4a15eaf6578ed4e36c7c5..5e1186b3023f26744c131e173362cb0ffa22e653 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -72,6 +72,15 @@ class omegaWallFunctionFvPatchScalarField
//- Name of turbulent viscosity field
word nutName_;
+ //- Cmu coefficient
+ scalar Cmu_;
+
+ //- Von Karman constant
+ scalar kappa_;
+
+ //- E coefficient
+ scalar E_;
+
// Private member functions
diff --git a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
index 8904cb3048f061a69072316caa22a243e62dbe87..e88e0f8ee317b0bcff4337a0ad7ccf83d8da4ef1 100644
--- a/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
@@ -34,6 +34,8 @@ Description
{
labelList cellBoundaryFaceCount(epsilon_.size(), 0);
+ scalar yPlusLam = this->yPlusLam(kappa_.value(), E_.value());
+
const fvPatchList& patches = mesh_.boundary();
//- Initialise the near-wall G and epsilon fields to zero
@@ -61,7 +63,7 @@ Description
if (isType<wallFvPatch>(curPatch))
{
-# include "checkPatchFieldTypes.H"
+ #include "checkPatchFieldTypes.H"
const scalarField& nuw = nu().boundaryField()[patchi];
const scalarField& nutw = nut_.boundaryField()[patchi];
@@ -91,7 +93,7 @@ Description
Cmu75*pow(k_[faceCelli], 1.5)
/(kappa_.value()*y_[patchi][facei]);
- if (yPlus > yPlusLam_)
+ if (yPlus > yPlusLam)
{
G[faceCelli] +=
(nutw[facei] + nuw[facei])
diff --git a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
index a90f64b6d9994bbfd75e332ec642bba219f414a6..b24b23c2820c9f7d61ad7a4f02455f3282d84892 100644
--- a/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
@@ -33,6 +33,8 @@ Description
{
const fvPatchList& patches = mesh_.boundary();
+ const scalar yPlusLam = this->yPlusLam(kappa_.value(), E_.value());
+
forAll(patches, patchi)
{
const fvPatch& curPatch = patches[patchi];
@@ -52,10 +54,11 @@ Description
scalar yPlus =
Cmu25*y_[patchi][facei]*sqrt(k_[faceCelli])/nuw[facei];
- if (yPlus > yPlusLam_)
+ if (yPlus > yPlusLam)
{
- nutw[facei] = nuw[facei]
- *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
+ nutw[facei] =
+ nuw[facei]
+ *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
}
else
{
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index 4b81fab16faf8316f76b5a568696622e0e8ce2a9..08618636737bd6da17157329b66ec81efe546580 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -81,13 +81,13 @@ kEpsilon::kEpsilon
1.92
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.76923
+ 1.3
)
),
@@ -195,7 +195,7 @@ bool kEpsilon::read()
Cmu_.readIfPresent(coeffDict());
C1_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
return true;
}
diff --git a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
index 1724f81e6ceb7d8b2438aaacd5bb84e0c3658c72..841c2b7154e48720078d97ea5e339b96518849ab 100644
--- a/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
@@ -35,10 +35,7 @@ Description
Cmu 0.09;
C1 1.44;
C2 1.92;
- C3 -0.33; // only for compressible
- alphak 1.0; // only for compressible
- alphaEps 0.76923;
- alphah 1.0; // only for compressible
+ sigmaEps 1.3;
}
@endverbatim
@@ -76,7 +73,7 @@ class kEpsilon
dimensionedScalar Cmu_;
dimensionedScalar C1_;
dimensionedScalar C2_;
- dimensionedScalar alphaEps_;
+ dimensionedScalar sigmaEps_;
// Fields
@@ -129,7 +126,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}
diff --git a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
index efb8d88a29c66f20ce12a7b8841eb67b720f8248..89647a7b321f3c8a18de51e4557ec508d6226b9a 100644
--- a/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
@@ -61,7 +61,6 @@ Description
alphaK2 1.0;
alphaOmega1 0.5;
alphaOmega2 0.85616;
- alphah 1.0; // only for compressible
beta1 0.075;
beta2 0.0828;
betaStar 0.09;
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index 81bef2dc61ef15dffc13739636f35e2cf2019f57..5072f9b1cffb87e5d6f4f7041caebaac68e62e84 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -122,22 +122,22 @@ realizableKE::realizableKE
1.9
)
),
- alphak_
+ sigmak_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphak",
+ "sigmak",
coeffDict_,
1.0
)
),
- alphaEps_
+ sigmaEps_
(
dimensioned<scalar>::lookupOrAddToDict
(
- "alphaEps",
+ "sigmaEps",
coeffDict_,
- 0.833333
+ 1.2
)
),
@@ -248,8 +248,8 @@ bool realizableKE::read()
Cmu_.readIfPresent(coeffDict());
A0_.readIfPresent(coeffDict());
C2_.readIfPresent(coeffDict());
- alphak_.readIfPresent(coeffDict());
- alphaEps_.readIfPresent(coeffDict());
+ sigmak_.readIfPresent(coeffDict());
+ sigmaEps_.readIfPresent(coeffDict());
return true;
}
diff --git a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
index 0dac3f1670f997787ce44f9e0d59315eceeb11b7..b055f540757a0dd39fbad88a6d74cbf146bf6d1b 100644
--- a/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
@@ -46,9 +46,8 @@ Description
Cmu 0.09;
A0 4.0;
C2 1.9;
- alphak 1.0;
- alphaEps 0.833333;
- alphah 1.0; // only for compressible
+ sigmak 1.0;
+ sigmaEps 1.2;
}
@endverbatim
@@ -81,15 +80,23 @@ class realizableKE
{
// Private data
- dimensionedScalar Cmu_;
- dimensionedScalar A0_;
- dimensionedScalar C2_;
- dimensionedScalar alphak_;
- dimensionedScalar alphaEps_;
+ // Model coefficients
- volScalarField k_;
- volScalarField epsilon_;
- volScalarField nut_;
+ dimensionedScalar Cmu_;
+ dimensionedScalar A0_;
+ dimensionedScalar C2_;
+ dimensionedScalar sigmak_;
+ dimensionedScalar sigmaEps_;
+
+
+ // Fields
+
+ volScalarField k_;
+ volScalarField epsilon_;
+ volScalarField nut_;
+
+
+ // Private member functions
tmp<volScalarField> rCmu
(
@@ -98,10 +105,8 @@ class realizableKE
const volScalarField& magS
);
- tmp<volScalarField> rCmu
- (
- const volTensorField& gradU
- );
+ tmp<volScalarField> rCmu(const volTensorField& gradU);
+
public:
@@ -137,7 +142,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DkEff", alphak_*nut_ + nu())
+ new volScalarField("DkEff", nut_/sigmak_ + nu())
);
}
@@ -146,7 +151,7 @@ public:
{
return tmp<volScalarField>
(
- new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+ new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
);
}