From 027909c73752fd6840423b918d7764e9ab25cafd Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 1 Oct 2015 17:29:29 +0100
Subject: [PATCH] dimensionedType: rationalize lookupOrDefault and
lookupOrAddToDict Now consistent with constructors.
---
.../compressible/rhoPimpleFoam/createFields.H | 8 ++++----
.../compressible/rhoSimpleFoam/createFields.H | 8 ++++----
.../rhoPorousSimpleFoam/createFields.H | 8 ++++----
.../fluid/createFluidFields.H | 8 ++++----
.../reactingParcelFoam/createFields.H | 8 ++++----
.../simpleReactingParcelFoam/createFields.H | 8 ++++----
.../lagrangian/sprayFoam/createFields.H | 8 ++++----
.../dimensionedType/dimensionedType.C | 18 ++++--------------
.../dimensionedType/dimensionedType.H | 12 ++++--------
.../turbulenceModels/LES/LESModel/LESModel.C | 4 ++--
.../turbulenceModels/RAS/RASModel/RASModel.C | 12 ++++++------
11 files changed, 44 insertions(+), 58 deletions(-)
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 0e214011dee..96a8ea84213 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -45,8 +45,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
pimple.dict(),
- GREAT,
- dimDensity
+ dimDensity,
+ GREAT
)
);
@@ -56,8 +56,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
pimple.dict(),
- 0,
- dimDensity
+ dimDensity,
+ 0
)
);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 2d89e2b5667..fdf8a2a769e 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -52,8 +52,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
simple.dict(),
- GREAT,
- dimDensity
+ dimDensity,
+ GREAT
)
);
@@ -63,8 +63,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
simple.dict(),
- 0,
- dimDensity
+ dimDensity,
+ 0
)
);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 3ce8270b5e0..149049e63ee 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -51,8 +51,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
simple.dict(),
- GREAT,
- dimDensity
+ dimDensity,
+ GREAT
)
);
@@ -62,8 +62,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
simple.dict(),
- 0,
- dimDensity
+ dimDensity,
+ 0
)
);
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
index bd7452ae9e3..1811878bd73 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H
@@ -187,8 +187,8 @@ forAll(fluidRegions, i)
(
"rhoMax",
simpleDict,
- GREAT,
- dimDensity
+ dimDensity,
+ GREAT
)
)
);
@@ -202,8 +202,8 @@ forAll(fluidRegions, i)
(
"rhoMin",
simpleDict,
- 0,
- dimDensity
+ dimDensity,
+ 0
)
)
);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
index 43c3d45e320..9d05da04250 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
pimple.dict(),
- GREAT,
- dimDensity
+ dimDensity,
+ GREAT
)
);
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
pimple.dict(),
- 0,
- dimDensity
+ dimDensity,
+ 0
)
);
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
index 7e79f9fb7db..cfabbfb5b05 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
simple.dict(),
- GREAT,
- dimDensity
+ dimDensity,
+ GREAT
)
);
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
simple.dict(),
- 0,
- dimDensity
+ dimDensity,
+ 0
)
);
diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H
index 721c3f8319e..7cc45050ce4 100644
--- a/applications/solvers/lagrangian/sprayFoam/createFields.H
+++ b/applications/solvers/lagrangian/sprayFoam/createFields.H
@@ -64,8 +64,8 @@ dimensionedScalar rhoMax
(
"rhoMax",
pimple.dict(),
- GREAT,
- dimDensity
+ dimDensity,
+ GREAT
)
);
@@ -75,8 +75,8 @@ dimensionedScalar rhoMin
(
"rhoMin",
pimple.dict(),
- 0,
- dimDensity
+ dimDensity,
+ 0
)
);
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 6a0cbb7861a..fdb38737a5b 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -198,18 +198,10 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
(
const word& name,
const dictionary& dict,
- const Type& defaultValue,
- const dimensionSet& dims
+ const Type& defaultValue
)
{
- if (dict.found(name))
- {
- return dimensioned<Type>(name, dims, dict.lookup(name));
- }
- else
- {
- return dimensioned<Type>(name, dims, defaultValue);
- }
+ return lookupOrDefault(name, dict, dimless, defaultValue);
}
@@ -232,12 +224,10 @@ Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
(
const word& name,
dictionary& dict,
- const Type& defaultValue,
- const dimensionSet& dims
+ const Type& defaultValue
)
{
- Type value = dict.lookupOrAddDefault<Type>(name, defaultValue);
- return dimensioned<Type>(name, dims, value);
+ return lookupOrAddToDict(name, dict, dimless, defaultValue);
}
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 2fcf61c2dbb..40baca77f6a 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -132,14 +132,12 @@ public:
const Type& defaultValue = pTraits<Type>::zero
);
- //- Construct from dictionary, with default value and dimensions.
- // Deprecated, use form with dimensions before value.
+ //- Construct from dictionary dimensionless with value.
static dimensioned<Type> lookupOrDefault
(
const word&,
const dictionary&,
- const Type& defaultValue = pTraits<Type>::zero,
- const dimensionSet& dims = dimless
+ const Type& defaultValue = pTraits<Type>::zero
);
//- Construct from dictionary, with default value.
@@ -152,15 +150,13 @@ public:
const Type& defaultValue = pTraits<Type>::zero
);
- //- Construct from dictionary, with default value.
+ //- Construct from dictionary, dimensionless with default value.
// If the value is not found, it is added into the dictionary.
- // Deprecated, use form with dimensions before value.
static dimensioned<Type> lookupOrAddToDict
(
const word&,
dictionary&,
- const Type& defaultValue = pTraits<Type>::zero,
- const dimensionSet& dims = dimless
+ const Type& defaultValue = pTraits<Type>::zero
);
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 48c4cc0bd97..9955478f419 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -75,8 +75,8 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
(
"kMin",
LESDict_,
- SMALL,
- sqr(dimVelocity)
+ sqr(dimVelocity),
+ SMALL
)
),
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index 3e53f4f4145..240c0870df1 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -75,8 +75,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
(
"kMin",
RASDict_,
- SMALL,
- sqr(dimVelocity)
+ sqr(dimVelocity),
+ SMALL
)
),
@@ -86,8 +86,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
(
"epsilonMin",
RASDict_,
- SMALL,
- kMin_.dimensions()/dimTime
+ kMin_.dimensions()/dimTime,
+ SMALL
)
),
@@ -97,8 +97,8 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
(
"omegaMin",
RASDict_,
- SMALL,
- dimless/dimTime
+ dimless/dimTime,
+ SMALL
)
)
{
--
GitLab