From 4fca6bf2f8aba051a678a12aec0527811ecd7a36 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 2 Nov 2010 09:37:09 +0000
Subject: [PATCH] ENH: Use scalar lookup instead of dimensionedScalar lookup
---
.../COxidationDiffusionLimitedRate.C | 4 ++--
.../COxidationKineticDiffusionLimitedRate.C | 6 +++---
.../COxidationMurphyShaddix.C | 16 ++++++++--------
.../PairSpringSliderDashpot.C | 6 +++---
.../WallLocalSpringSliderDashpot.C | 17 +++++------------
.../WallSpringSliderDashpot.C | 16 +++++-----------
6 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
index d708cbc8f6e..129b6b39abe 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -38,8 +38,8 @@ Foam::COxidationDiffusionLimitedRate<CloudType>::COxidationDiffusionLimitedRate
)
:
SurfaceReactionModel<CloudType>(dict, owner, typeName),
- Sb_(dimensionedScalar(this->coeffDict().lookup("Sb")).value()),
- D_(dimensionedScalar(this->coeffDict().lookup("D")).value()),
+ Sb_(readScalar(this->coeffDict().lookup("Sb"))),
+ D_(readScalar(this->coeffDict().lookup("D"))),
CsLocalId_(-1),
O2GlobalId_(owner.composition().globalCarrierId("O2")),
CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
index 7e1329c7922..d7282e88b9e 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -42,9 +42,9 @@ COxidationKineticDiffusionLimitedRate
owner,
typeName
),
- C1_(dimensionedScalar(this->coeffDict().lookup("C1")).value()),
- C2_(dimensionedScalar(this->coeffDict().lookup("C2")).value()),
- E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
+ C1_(readScalar(this->coeffDict().lookup("C1"))),
+ C2_(readScalar(this->coeffDict().lookup("C2"))),
+ E_(readScalar(this->coeffDict().lookup("E"))),
CsLocalId_(-1),
O2GlobalId_(owner.composition().globalCarrierId("O2")),
CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
index 4639094ee5f..3f8ef799441 100644
--- a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -50,14 +50,14 @@ Foam::COxidationMurphyShaddix<CloudType>::COxidationMurphyShaddix
owner,
typeName
),
- D0_(dimensionedScalar(this->coeffDict().lookup("D0")).value()),
- rho0_(dimensionedScalar(this->coeffDict().lookup("rho0")).value()),
- T0_(dimensionedScalar(this->coeffDict().lookup("T0")).value()),
- Dn_(dimensionedScalar(this->coeffDict().lookup("Dn")).value()),
- A_(dimensionedScalar(this->coeffDict().lookup("A")).value()),
- E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
- n_(dimensionedScalar(this->coeffDict().lookup("n")).value()),
- WVol_(dimensionedScalar(this->coeffDict().lookup("WVol")).value()),
+ D0_(readScalar(this->coeffDict().lookup("D0"))),
+ rho0_(readScalar(this->coeffDict().lookup("rho0"))),
+ T0_(readScalar(this->coeffDict().lookup("T0"))),
+ Dn_(readScalar(this->coeffDict().lookup("Dn"))),
+ A_(readScalar(this->coeffDict().lookup("A"))),
+ E_(readScalar(this->coeffDict().lookup("E"))),
+ n_(readScalar(this->coeffDict().lookup("n"))),
+ WVol_(readScalar(this->coeffDict().lookup("WVol"))),
CsLocalId_(-1),
O2GlobalId_(owner.composition().globalCarrierId("O2")),
CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
index 2edd2d40286..3096c829d0d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/PairModel/PairSpringSliderDashpot/PairSpringSliderDashpot.C
@@ -89,9 +89,9 @@ Foam::PairSpringSliderDashpot<CloudType>::PairSpringSliderDashpot
PairModel<CloudType>(dict, cloud, typeName),
Estar_(),
Gstar_(),
- alpha_(dimensionedScalar(this->coeffDict().lookup("alpha")).value()),
- b_(dimensionedScalar(this->coeffDict().lookup("b")).value()),
- mu_(dimensionedScalar(this->coeffDict().lookup("mu")).value()),
+ alpha_(readScalar(this->coeffDict().lookup("alpha"))),
+ b_(readScalar(this->coeffDict().lookup("b"))),
+ mu_(readScalar(this->coeffDict().lookup("mu"))),
collisionResolutionSteps_
(
readScalar
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
index 704a8ba6d44..9ae09dd98f6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallLocalSpringSliderDashpot/WallLocalSpringSliderDashpot.C
@@ -224,26 +224,19 @@ Foam::WallLocalSpringSliderDashpot<CloudType>::WallLocalSpringSliderDashpot
patchMap_[wallPatchIndices[wPI]] = wPI;
- scalar nu = dimensionedScalar
- (
- patchCoeffDict.lookup("poissonsRatio")
- ).value();
+ scalar nu = readScalar(patchCoeffDict.lookup("poissonsRatio"));
- scalar E = dimensionedScalar
- (
- patchCoeffDict.lookup("youngsModulus")
- ).value();
+ scalar E = readScalar(patchCoeffDict.lookup("youngsModulus"));
Estar_[wPI] = 1/((1 - sqr(pNu))/pE + (1 - sqr(nu))/E);
Gstar_[wPI] = 1/(2*((2 + pNu - sqr(pNu))/pE + (2 + nu - sqr(nu))/E));
- alpha_[wPI] =
- dimensionedScalar(patchCoeffDict.lookup("alpha")).value();
+ alpha_[wPI] = readScalar(patchCoeffDict.lookup("alpha"));
- b_[wPI] = dimensionedScalar(patchCoeffDict.lookup("b")).value();
+ b_[wPI] = readScalar(patchCoeffDict.lookup("b"));
- mu_[wPI] = dimensionedScalar(patchCoeffDict.lookup("mu")).value();
+ mu_[wPI] = readScalar(patchCoeffDict.lookup("mu"));
if (Estar_[wPI] > maxEstar)
{
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
index 3bd0870ab72..5f14b8e274f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/CollisionModel/PairCollision/WallModel/WallSpringSliderDashpot/WallSpringSliderDashpot.C
@@ -154,9 +154,9 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
WallModel<CloudType>(dict, cloud, typeName),
Estar_(),
Gstar_(),
- alpha_(dimensionedScalar(this->coeffDict().lookup("alpha")).value()),
- b_(dimensionedScalar(this->coeffDict().lookup("b")).value()),
- mu_(dimensionedScalar(this->coeffDict().lookup("mu")).value()),
+ alpha_(readScalar(this->coeffDict().lookup("alpha"))),
+ b_(readScalar(this->coeffDict().lookup("b"))),
+ mu_(readScalar(this->coeffDict().lookup("mu"))),
collisionResolutionSteps_
(
readScalar
@@ -172,15 +172,9 @@ Foam::WallSpringSliderDashpot<CloudType>::WallSpringSliderDashpot
volumeFactor_ = readScalar(this->coeffDict().lookup("volumeFactor"));
}
- scalar nu = dimensionedScalar
- (
- this->coeffDict().lookup("poissonsRatio")
- ).value();
+ scalar nu = readScalar(this->coeffDict().lookup("poissonsRatio"));
- scalar E = dimensionedScalar
- (
- this->coeffDict().lookup("youngsModulus")
- ).value();
+ scalar E = readScalar(this->coeffDict().lookup("youngsModulus"));
scalar pNu = this->owner().constProps().poissonsRatio();
--
GitLab