From 045a08c9dbd4d3a9bdc12585f12f7a27995b2136 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 17 Jun 2008 15:09:52 +0200
Subject: [PATCH] turbulenceModel : remove missed dimensionedScalar treatment
for Cmu, kappa, E
---
.../turbulenceModel/turbulenceModel.C | 32 ++++---------------
.../turbulenceModel/turbulenceModel.C | 32 ++++---------------
2 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
index e2c6ed90c3e..b4c41aaf804 100644
--- a/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/RAS/compressible/turbulenceModel/turbulenceModel.C
@@ -123,9 +123,9 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if (typeid(curPatch) == typeid(wallFvPatch))
{
- dimensionedScalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
+ scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
- Yp = pow(Cmu.value(), 0.25)
+ Yp = pow(Cmu, 0.25)
*y_[patchNo]
*sqrt(k()().boundaryField()[patchNo].patchInternalField())
/(
@@ -164,32 +164,14 @@ bool turbulenceModel::read()
lookup("turbulence") >> turbulence_;
turbulenceModelCoeffs_ = subDict(type() + "Coeffs");
- kappa_ = dimensionedScalar
- (
- subDict("wallFunctionCoeffs").lookup("kappa")
- ).value();
-
- E_ = dimensionedScalar
- (
- subDict("wallFunctionCoeffs").lookup("E")
- ).value();
+ subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
+ subDict("wallFunctionCoeffs").lookup("E") >> E_;
yPlusLam_ = yPlusLam(kappa_, E_);
- if (found("k0"))
- {
- lookup("k0") >> k0_;
- }
-
- if (found("epsilon0"))
- {
- lookup("epsilon0") >> epsilon0_;
- }
-
- if (found("epsilonSmall"))
- {
- lookup("epsilonSmall") >> epsilonSmall_;
- }
+ readIfPresent("k0", k0_);
+ readIfPresent("epsilon0", epsilon0_);
+ readIfPresent("epsilonSmall", epsilonSmall_);
return true;
}
diff --git a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
index 7c157e8940e..a139bbefd91 100644
--- a/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
+++ b/src/turbulenceModels/RAS/incompressible/turbulenceModel/turbulenceModel.C
@@ -123,9 +123,9 @@ tmp<scalarField> turbulenceModel::yPlus(const label patchNo) const
if (typeid(curPatch) == typeid(wallFvPatch))
{
- dimensionedScalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
+ scalar Cmu(turbulenceModelCoeffs_.lookup("Cmu"));
- Yp = pow(Cmu.value(), 0.25)*y_[patchNo]
+ Yp = pow(Cmu, 0.25)*y_[patchNo]
*sqrt(k()().boundaryField()[patchNo].patchInternalField())
/nu().boundaryField()[patchNo];
}
@@ -161,32 +161,14 @@ bool turbulenceModel::read()
lookup("turbulence") >> turbulence_;
turbulenceModelCoeffs_ = subDict(type() + "Coeffs");
- kappa_ = dimensionedScalar
- (
- subDict("wallFunctionCoeffs").lookup("kappa")
- ).value();
-
- E_ = dimensionedScalar
- (
- subDict("wallFunctionCoeffs").lookup("E")
- ).value();
+ subDict("wallFunctionCoeffs").lookup("kappa") >> kappa_;
+ subDict("wallFunctionCoeffs").lookup("E") >> E_;
yPlusLam_ = yPlusLam(kappa_, E_);
- if (found("k0"))
- {
- lookup("k0") >> k0_;
- }
-
- if (found("epsilon0"))
- {
- lookup("epsilon0") >> epsilon0_;
- }
-
- if (found("epsilonSmall"))
- {
- lookup("epsilonSmall") >> epsilonSmall_;
- }
+ readIfPresent("k0", k0_);
+ readIfPresent("epsilon0", epsilon0_);
+ readIfPresent("epsilonSmall", epsilonSmall_);
return true;
}
--
GitLab