From e46a010ad263c69000bc7cae08828712ec68e6a6 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 17 Jun 2008 16:26:42 +0100
Subject: [PATCH] added coeffsDict name to printCoeffs() and consistency update
---
.../LES/compressible/LESmodel/LESmodel.C | 3 ++-
.../LES/incompressible/LESmodel/LESmodel.C | 3 ++-
.../incompressible/LRRDiffStress/LRRDiffStress.C | 12 ++++++------
.../turbulenceModel/turbulenceModel.C | 16 ++++++++++++----
.../turbulenceModel/turbulenceModel.C | 16 ++++++++++++----
5 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
index 8e3c6a488af..7a95ea699d5 100644
--- a/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
+++ b/src/turbulenceModels/LES/compressible/LESmodel/LESmodel.C
@@ -45,7 +45,8 @@ void LESmodel::printCoeffs()
{
if (printCoeffs_)
{
- Info<< LESmodelProperties_;
+ Info<< type() << "Coeffs" << nl
+ << LESmodelProperties_;
}
}
diff --git a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
index 75690169d0e..5d045df2874 100644
--- a/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
+++ b/src/turbulenceModels/LES/incompressible/LESmodel/LESmodel.C
@@ -43,7 +43,8 @@ void LESmodel::printCoeffs()
{
if (printCoeffs_)
{
- Info<< LESmodelProperties_;
+ Info<< type() << "Coeffs" << nl
+ << LESmodelProperties_;
}
}
diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
index 544727b8acb..c7ef99d910d 100644
--- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
+++ b/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
@@ -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_);
diff --git a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
index b4c41aaf804..100df9f3708 100644
--- a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
@@ -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]
diff --git a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
index a139bbefd91..ea95640842b 100644
--- a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
@@ -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())
--
GitLab