Commit e46a010a authored by Andrew Heather's avatar Andrew Heather
Browse files

added coeffsDict name to printCoeffs() and consistency update

parent 2b59f6d6
......@@ -45,7 +45,8 @@ void LESmodel::printCoeffs()
{
if (printCoeffs_)
{
Info<< LESmodelProperties_;
Info<< type() << "Coeffs" << nl
<< LESmodelProperties_;
}
}
......
......@@ -43,7 +43,8 @@ void LESmodel::printCoeffs()
{
if (printCoeffs_)
{
Info<< LESmodelProperties_;
Info<< type() << "Coeffs" << nl
<< LESmodelProperties_;
}
}
......
......@@ -93,12 +93,12 @@ void LRRDiffStress::correct(const tmp<volTensorField>& tgradU)
forAll(B_, celli)
{
B_[celli].component(tensor::XX) =
max(B_[celli].component(tensor::XX), k0().value());
B_[celli].component(tensor::YY) =
max(B_[celli].component(tensor::YY), k0().value());
B_[celli].component(tensor::ZZ) =
max(B_[celli].component(tensor::ZZ), k0().value());
B_[celli].component(symmTensor::XX) =
max(B_[celli].component(symmTensor::XX), k0().value());
B_[celli].component(symmTensor::YY) =
max(B_[celli].component(symmTensor::YY), k0().value());
B_[celli].component(symmTensor::ZZ) =
max(B_[celli].component(symmTensor::ZZ), k0().value());
}
K = 0.5*tr(B_);
......
......@@ -47,7 +47,8 @@ void turbulenceModel::printCoeffs()
{
if (printCoeffs_)
{
Info<< turbulenceModelCoeffs_;
Info<< type() << "Coeffs" << nl
<< turbulenceModelCoeffs_;
}
}
......@@ -87,8 +88,15 @@ turbulenceModel::turbulenceModel
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
turbulenceModelCoeffs_(subDict(type + "Coeffs")),
kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))),
E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))),
kappa_
(
subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>
(
"kappa",
0.4187
)
),
E_(subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>("E", 9.0)),
yPlusLam_(yPlusLam(kappa_, E_)),
k0_("k0", dimVelocity*dimVelocity, SMALL),
......@@ -123,7 +131,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if (typeid(curPatch) == typeid(wallFvPatch))
{
scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
scalar Cmu(readScalar(turbulenceModelCoeffs_.lookup("Cmu")));
Yp = pow(Cmu, 0.25)
*y_[patchNo]
......
......@@ -45,7 +45,8 @@ void turbulenceModel::printCoeffs()
{
if (printCoeffs_)
{
Info<< turbulenceModelCoeffs_;
Info<< type() << "Coeffs" << nl
<< turbulenceModelCoeffs_;
}
}
......@@ -83,8 +84,15 @@ turbulenceModel::turbulenceModel
printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
turbulenceModelCoeffs_(subDict(type + "Coeffs")),
kappa_(readScalar(subDict("wallFunctionCoeffs").lookup("kappa"))),
E_(readScalar(subDict("wallFunctionCoeffs").lookup("E"))),
kappa_
(
subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>
(
"kappa",
0.4187
)
),
E_(subDict("wallFunctionCoeffs").lookupOrAddDefault<scalar>("E", 9.0)),
yPlusLam_(yPlusLam(kappa_, E_)),
k0_("k0", dimVelocity*dimVelocity, SMALL),
......@@ -123,7 +131,7 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if (typeid(curPatch) == typeid(wallFvPatch))
{
scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
scalar Cmu(readScalar(turbulenceModelCoeffs_.lookup("Cmu")));
Yp = pow(Cmu, 0.25)*y_[patchNo]
*sqrt(k()().boundaryField()[patchNo].patchInternalField())
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment