Skip to content
GitLab
Commit 4ddd3c67 authored by Andrew Heather's avatar Andrew Heather
Browse files

updates to tuts to reflect turbulence changes, and general tut updates

parent 24c4b1b7
Hide whitespace changes
Inline Side-by-side
applications/solvers/multiphase/bubbleFoam/createTurbulence.H
View file @ 4ddd3c67
......@@ -22,29 +22,29 @@
);
dimensionedScalar Cmu
scalar Cmu
(
kEpsilonCoeffs.lookup("Cmu")
readScalar(kEpsilonCoeffs.lookup("Cmu"))
);
dimensionedScalar C1
scalar C1
(
kEpsilonCoeffs.lookup("C1")
readScalar(kEpsilonCoeffs.lookup("C1"))
);
dimensionedScalar C2
scalar C2
(
kEpsilonCoeffs.lookup("C2")
readScalar(kEpsilonCoeffs.lookup("C2"))
);
dimensionedScalar alphak
scalar alphak
(
kEpsilonCoeffs.lookup("alphak")
readScalar(kEpsilonCoeffs.lookup("alphak"))
);
dimensionedScalar alphaEps
scalar alphaEps
(
kEpsilonCoeffs.lookup("alphaEps")
readScalar(kEpsilonCoeffs.lookup("alphaEps"))
);
dictionary wallFunctionCoeffs
......@@ -52,14 +52,14 @@
turbulenceProperties.subDict("wallFunctionCoeffs")
);
dimensionedScalar kappa
scalar kappa
(
wallFunctionCoeffs.lookup("kappa")
readScalar(wallFunctionCoeffs.lookup("kappa"))
);
dimensionedScalar E
scalar E
(
wallFunctionCoeffs.lookup("E")
readScalar(wallFunctionCoeffs.lookup("E"))
);
nearWallDist y(mesh);
......
applications/solvers/multiphase/bubbleFoam/wallFunctions.H
View file @ 4ddd3c67
{
labelList cellBoundaryFaceCount(epsilon.size(), 0);
scalar Cmu25 = ::pow(Cmu.value(), 0.25);
scalar Cmu75 = ::pow(Cmu.value(), 0.75);
scalar Cmu25 = ::pow(Cmu, 0.25);
scalar Cmu75 = ::pow(Cmu, 0.75);
const fvPatchList& patches = mesh.boundary();
......@@ -53,14 +53,14 @@
epsilon[faceCelli] +=
Cmu75*::pow(k[faceCelli], 1.5)
/(kappa.value()*y[patchi][facei]);
/(kappa*y[patchi][facei]);
if (yPlus > 11.6)
{
G[faceCelli] +=
nuw[facei]*magFaceGradU[facei]
*Cmu25*::sqrt(k[faceCelli])
/(kappa.value()*y[patchi][facei]);
/(kappa*y[patchi][facei]);
}
}
}
......
applications/solvers/multiphase/bubbleFoam/wallViscosity.H
View file @ 4ddd3c67
{
scalar Cmu25 = ::pow(Cmu.value(), 0.25);
scalar Cmu25 = ::pow(Cmu, 0.25);
const fvPatchList& patches = mesh.boundary();
......@@ -24,8 +24,8 @@
if (yPlus > 11.6)
{
nutw[facei] =
yPlus*nub.value()*kappa.value()
/::log(E.value()*yPlus)
yPlus*nub.value()*kappa
/::log(E*yPlus)
- nub.value();
}
else
......
applications/solvers/multiphase/settlingFoam/createFields.H
View file @ 4ddd3c67
......@@ -234,34 +234,34 @@
);
dimensionedScalar Cmu
scalar Cmu
(
kEpsilonCoeffs.lookup("Cmu")
readScalar(kEpsilonCoeffs.lookup("Cmu"))
);
dimensionedScalar C1
scalar C1
(
kEpsilonCoeffs.lookup("C1")
readScalar(kEpsilonCoeffs.lookup("C1"))
);
dimensionedScalar C2
scalar C2
(
kEpsilonCoeffs.lookup("C2")
readScalar(kEpsilonCoeffs.lookup("C2"))
);
dimensionedScalar C3
scalar C3
(
kEpsilonCoeffs.lookup("C3")
readScalar(kEpsilonCoeffs.lookup("C3"))
);
dimensionedScalar alphak
scalar alphak
(
kEpsilonCoeffs.lookup("alphak")
readScalar(kEpsilonCoeffs.lookup("alphak"))
);
dimensionedScalar alphaEps
scalar alphaEps
(
kEpsilonCoeffs.lookup("alphaEps")
readScalar(kEpsilonCoeffs.lookup("alphaEps"))
);
const dictionary& wallFunctionCoeffs
......@@ -269,14 +269,14 @@
turbulenceProperties.subDict("wallFunctionCoeffs")
);
dimensionedScalar kappa
scalar kappa
(
wallFunctionCoeffs.lookup("kappa")
readScalar(wallFunctionCoeffs.lookup("kappa"))
);
dimensionedScalar E
scalar E
(
wallFunctionCoeffs.lookup("E")
readScalar(wallFunctionCoeffs.lookup("E"))
);
nearWallDist y(mesh);
......
applications/solvers/multiphase/settlingFoam/wallFunctions.H
View file @ 4ddd3c67
{
labelList cellBoundaryFaceCount(epsilon.size(), 0);
scalar Cmu25 = ::pow(Cmu.value(), 0.25);
scalar Cmu75 = ::pow(Cmu.value(), 0.75);
scalar Cmu25 = ::pow(Cmu, 0.25);
scalar Cmu75 = ::pow(Cmu, 0.75);
const fvPatchList& patches = mesh.boundary();
......@@ -55,14 +55,14 @@
epsilon[faceCelli] +=
Cmu75*rho[faceCelli]*::pow(k[faceCelli], 1.5)
/(kappa.value()*y[patchi][facei]);
/(kappa*y[patchi][facei]);
if (yPlus > 11.6)
{
G[faceCelli] +=
mutw[facei]*magFaceGradU[facei]
*Cmu25*::sqrt(k[faceCelli])
/(kappa.value()*y[patchi][facei]);
/(kappa*y[patchi][facei]);
}
}
}
......
applications/solvers/multiphase/settlingFoam/wallViscosity.H
View file @ 4ddd3c67
{
scalar Cmu25 = ::pow(Cmu.value(), 0.25);
scalar Cmu25 = ::pow(Cmu, 0.25);
const fvPatchList& patches = mesh.boundary();
......@@ -26,7 +26,7 @@
{
mutw[facei] =
muw[facei]
*(yPlus*kappa.value()/::log(E.value()*yPlus) - 1);
*(yPlus*kappa/::log(E*yPlus) - 1);
}
else
{
......
applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
View file @ 4ddd3c67
......@@ -170,29 +170,29 @@
);
dimensionedScalar Cmu
scalar Cmu
(
kEpsilonCoeffs.lookup("Cmu")
readScalar(kEpsilonCoeffs.lookup("Cmu"))
);
dimensionedScalar C1
scalar C1
(
kEpsilonCoeffs.lookup("C1")
readScalar(kEpsilonCoeffs.lookup("C1"))
);
dimensionedScalar C2
scalar C2
(
kEpsilonCoeffs.lookup("C2")
readScalar(kEpsilonCoeffs.lookup("C2"))
);
dimensionedScalar alphak
scalar alphak
(
kEpsilonCoeffs.lookup("alphak")
readScalar(kEpsilonCoeffs.lookup("alphak"))
);
dimensionedScalar alphaEps
scalar alphaEps
(
kEpsilonCoeffs.lookup("alphaEps")
readScalar(kEpsilonCoeffs.lookup("alphaEps"))
);
dictionary wallFunctionCoeffs
......@@ -200,14 +200,14 @@
turbulenceProperties.subDict("wallFunctionCoeffs")
);
dimensionedScalar kappa
scalar kappa
(
wallFunctionCoeffs.lookup("kappa")
readScalar(wallFunctionCoeffs.lookup("kappa"))
);
dimensionedScalar E
scalar E
(
wallFunctionCoeffs.lookup("E")
readScalar(wallFunctionCoeffs.lookup("E"))
);
nearWallDist y(mesh);
......
applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallFunctions.H
View file @ 4ddd3c67
{
labelList cellBoundaryFaceCount(epsilon.size(), 0);
scalar Cmu25 = ::pow(Cmu.value(), 0.25);
scalar Cmu75 = ::pow(Cmu.value(), 0.75);
scalar Cmu25 = ::pow(Cmu, 0.25);
scalar Cmu75 = ::pow(Cmu, 0.75);
const fvPatchList& patches = mesh.boundary();
......@@ -52,14 +52,14 @@
epsilon[faceCelli] +=
Cmu75*::pow(k[faceCelli], 1.5)
/(kappa.value()*y[patchi][facei]);
/(kappa*y[patchi][facei]);
if (yPlus > 11.6)
{
G[faceCelli] +=
nuw[facei]*magFaceGradU[facei]
*Cmu25*::sqrt(k[faceCelli])
/(kappa.value()*y[patchi][facei]);
/(kappa*y[patchi][facei]);
}
}
}
......
applications/solvers/multiphase/twoPhaseEulerFoam/turbulenceModel/wallViscosity.H
View file @ 4ddd3c67
{
scalar Cmu25 = ::pow(Cmu.value(), 0.25);
scalar Cmu25 = ::pow(Cmu, 0.25);
const fvPatchList& patches = mesh.boundary();
......@@ -24,8 +24,8 @@
if (yPlus > 11.6)
{
nutw[facei] =
yPlus*nub.value()*kappa.value()
/::log(E.value()*yPlus)
yPlus*nub.value()*kappa
/::log(E*yPlus)
- nub.value();
}
else
......
src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
View file @ 4ddd3c67
......@@ -105,15 +105,14 @@ vanDriestDelta::vanDriestDelta
(
LESdelta::New("geometricDelta", mesh, dd.subDict(type() + "Coeffs"))
),
kappa_(dimensionedScalar(dd.lookup("kappa")).value()),
kappa_(dd.lookupOrDefault<scalar>("kappa", 0.4187)),
Aplus_
(
dimensionedScalar(dd.subDict(type() + "Coeffs").lookup("Aplus")).value()
dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Aplus", 26.0)
),
Cdelta_
(
dimensionedScalar(dd.subDict(type() + "Coeffs").lookup("Cdelta"))
.value()
dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
)
{
delta_ = geometricDelta_();
......@@ -127,9 +126,9 @@ void vanDriestDelta::read(const dictionary& d)
const dictionary& dd(d.subDict(type() + "Coeffs"));
geometricDelta_().read(dd);
kappa_ = dimensionedScalar(d.lookup("kappa")).value();
Aplus_ = dimensionedScalar(dd.lookup("Aplus")).value();
Cdelta_ = dimensionedScalar(dd.lookup("Cdelta")).value();
d.readIfPresent<scalar>("kappa", kappa_);
dd.readIfPresent<scalar>("Aplus", Aplus_);
dd.readIfPresent<scalar>("Cdelta", Cdelta_);
calcDelta();
}
......
tutorials/MRFSimpleFoam/MRFSimpleFoam/Make/options
View file @ 4ddd3c67
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/turbulenceModels \
-I$(LIB_SRC)/turbulenceModels/RAS \
-I$(LIB_SRC)/transportModels
EXE_LIBS = \
......
tutorials/MRFSimpleFoam/MRFSimpleFoam/createFields.H
View file @ 4ddd3c67
......@@ -36,9 +36,9 @@
singlePhaseTransportModel laminarTransport(U, phi);
autoPtr<turbulenceModel> turbulence
autoPtr<incompressible::turbulenceModel> turbulence
(
turbulenceModel::New(U, phi, laminarTransport)
incompressible::turbulenceModel::New(U, phi, laminarTransport)
);
......
tutorials/MRFSimpleFoam/mixerVessel2D/constant/turbulenceProperties
View file @ 4ddd3c67
......@@ -32,166 +32,166 @@ laminarCoeffs
kEpsilonCoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
Cmu 0.09;
C1 1.44;
C2 1.92;
alphaEps 0.76923;
}
RNGkEpsilonCoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.0845;
C1 C1 [0 0 0 0 0 0 0] 1.42;
C2 C2 [0 0 0 0 0 0 0] 1.68;
alphak alphaK [0 0 0 0 0 0 0] 1.39;
alphaEps alphaEps [0 0 0 0 0 0 0] 1.39;
eta0 eta0 [0 0 0 0 0 0 0] 4.38;
beta beta [0 0 0 0 0 0 0] 0.012;
Cmu 0.0845;
C1 1.42;
C2 1.68;
alphak 1.39;
alphaEps 1.39;
eta0 4.38;
beta 0.012;
}
kOmegaSSTCoeffs
{
alphaK1 alphaK1 [0 0 0 0 0 0 0] 0.85034;
alphaK2 alphaK1 [0 0 0 0 0 0 0] 1.0;
alphaOmega1 alphaOmega1 [0 0 0 0 0 0 0] 0.5;
alphaOmega2 alphaOmega2 [0 0 0 0 0 0 0] 0.85616;
gamma1 gamma1 [0 0 0 0 0 0 0] 0.5532;
gamma2 gamma2 [0 0 0 0 0 0 0] 0.4403;
beta1 beta1 [0 0 0 0 0 0 0] 0.0750;
beta2 beta2 [0 0 0 0 0 0 0] 0.0828;
betaStar betaStar [0 0 0 0 0 0 0] 0.09;
a1 a1 [0 0 0 0 0 0 0] 0.31;
c1 c1 [0 0 0 0 0 0 0] 10;
alphaK1 0.85034;
alphaK2 1.0;
alphaOmega1 0.5;
alphaOmega2 0.85616;
gamma1 0.5532;
gamma2 0.4403;
beta1 0.0750;
beta2 0.0828;
betaStar 0.09;
a1 0.31;
c1 10;
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
Cmu 0.09;
}
NonlinearKEShihCoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphak alphak [0 0 0 0 0 0 0] 1;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76932;
A1 A1 [0 0 0 0 0 0 0] 1.25;
A2 A2 [0 0 0 0 0 0 0] 1000;
Ctau1 Ctau1 [0 0 0 0 0 0 0] -4;
Ctau2 Ctau2 [0 0 0 0 0 0 0] 13;
Ctau3 Ctau3 [0 0 0 0 0 0 0] -2;
alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9;
Cmu 0.09;
C1 1.44;
C2 1.92;
alphak 1;
alphaEps 0.76932;
A1 1.25;
A2 1000;
Ctau1 -4;
Ctau2 13;
Ctau3 -2;
alphaKsi 0.9;
}
LienCubicKECoeffs
{
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphak alphak [0 0 0 0 0 0 0] 1;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
A1 A1 [0 0 0 0 0 0 0] 1.25;
A2 A2 [0 0 0 0 0 0 0] 1000;
Ctau1 Ctau1 [0 0 0 0 0 0 0] -4;
Ctau2 Ctau2 [0 0 0 0 0 0 0] 13;
Ctau3 Ctau3 [0 0 0 0 0 0 0] -2;
alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9;
C1 1.44;
C2 1.92;
alphak 1;
alphaEps 0.76923;
A1 1.25;
A2 1000;
Ctau1 -4;
Ctau2 13;
Ctau3 -2;
alphaKsi 0.9;
}
QZetaCoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphaZeta alphaZeta [0 0 0 0 0 0 0] 0.76923;
Cmu 0.09;
C1 1.44;
C2 1.92;
alphaZeta 0.76923;
anisotropic no;
}
LaunderSharmaKECoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
Cmu 0.09;
C1 1.44;
C2 1.92;
alphaEps 0.76923;
}
LamBremhorstKECoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
Cmu 0.09;
C1 1.44;
C2 1.92;
alphaEps 0.76923;
}
LienCubicKELowReCoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphak alphak [0 0 0 0 0 0 0] 1;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
A1 A1 [0 0 0 0 0 0 0] 1.25;
A2 A2 [0 0 0 0 0 0 0] 1000;
Ctau1 Ctau1 [0 0 0 0 0 0 0] -4;
Ctau2 Ctau2 [0 0 0 0 0 0 0] 13;
Ctau3 Ctau3 [0 0 0 0 0 0 0] -2;
alphaKsi alphaKsi [0 0 0 0 0 0 0] 0.9;
Am Am [0 0 0 0 0 0 0] 0.016;
Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263;
Amu Amu [0 0 0 0 0 0 0] 0.00222;
Cmu 0.09;
C1 1.44;
C2 1.92;
alphak 1;
alphaEps 0.76923;
A1 1.25;
A2 1000;
Ctau1 -4;
Ctau2 13;
Ctau3 -2;
alphaKsi 0.9;
Am 0.016;
Aepsilon 0.263;
Amu 0.00222;
}
LienLeschzinerLowReCoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
alphak alphak [0 0 0 0 0 0 0] 1;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
Am Am [0 0 0 0 0 0 0] 0.016;
Aepsilon Aepsilon [0 0 0 0 0 0 0] 0.263;
Amu Amu [0 0 0 0 0 0 0] 0.00222;
Cmu 0.09;
C1 1.44;
C2 1.92;
alphak 1;
alphaEps 0.76923;
Am 0.016;
Aepsilon 0.263;
Amu 0.00222;
}
LRRCoeffs
{
Cmu Cmu [0 0 0 0 0 0 0] 0.09;
Clrr1 Clrr1 [0 0 0 0 0 0 0] 1.8;
Clrr2 Clrr2 [0 0 0 0 0 0 0] 0.6;
C1 C1 [0 0 0 0 0 0 0] 1.44;
C2 C2 [0 0 0 0 0 0 0] 1.92;
Cs Cs [0 0 0 0 0 0 0] 0.25;
Ceps Ceps [0 0 0 0 0 0 0] 0.15;
alphaEps alphaEps [0 0 0 0 0 0 0] 0.76923;
Cmu 0.09;
Clrr1 1.8;
Clrr2 0.6;
C1 1.44;
C2 1.92;
Cs 0.25;
Ceps 0.15;