ENH: unify use of dictionary method names

- previously introduced `getOrDefault` as a dictionary _get_ method,
  now complete the transition and use it everywhere instead of
  `lookupOrDefault`. This avoids mixed usage of the two methods that
  are identical in behaviour, makes for shorter names, and promotes
  the distinction between "lookup" access (ie, return a token stream,
  locate and return an entry) and "get" access (ie, the above with
  conversion to concrete types such as scalar, label etc).
This commit is contained in:
Mark Olesen
2020-06-02 16:38:55 +02:00
parent f721b5344f
commit 3e43edf056
624 changed files with 2109 additions and 1954 deletions

View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2015 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -56,7 +56,7 @@ Foam::refinementParameters::refinementParameters
),
planarAngle_
(
dict.lookupOrDefault
dict.getOrDefault
(
"planarAngle",
dict.get<scalar>("resolveFeatureAngle")
@ -68,7 +68,7 @@ Foam::refinementParameters::refinementParameters
),
locationsOutsideMesh_
(
dict.lookupOrDefault
dict.getOrDefault
(
"locationsOutsideMesh",
pointField(0)
@ -81,19 +81,19 @@ Foam::refinementParameters::refinementParameters
),
useTopologicalSnapDetection_
(
dict.lookupOrDefault("useTopologicalSnapDetection", true)
dict.getOrDefault("useTopologicalSnapDetection", true)
),
maxLoadUnbalance_(dict.lookupOrDefault<scalar>("maxLoadUnbalance", 0)),
maxLoadUnbalance_(dict.getOrDefault<scalar>("maxLoadUnbalance", 0)),
handleSnapProblems_
(
dict.lookupOrDefault<Switch>("handleSnapProblems", true)
dict.getOrDefault<Switch>("handleSnapProblems", true)
),
interfaceRefine_
(
dict.lookupOrDefault<Switch>("interfaceRefine", true)
dict.getOrDefault<Switch>("interfaceRefine", true)
),
nErodeCellZone_(dict.lookupOrDefault<label>("nCellZoneErodeIter", 0)),
nFilterIter_(dict.lookupOrDefault<label>("nFilterIter", 2)),
nErodeCellZone_(dict.getOrDefault<label>("nCellZoneErodeIter", 0)),
nFilterIter_(dict.getOrDefault<label>("nFilterIter", 2)),
dryRun_(dryRun)
{
point locationInMesh;