ENH: avoid readScalar, readLabel etc from dictionary (#762, #1033)

- use the dictionary 'get' methods instead of readScalar for
  additional checking

     Unchecked:  readScalar(dict.lookup("key"));
     Checked:    dict.get<scalar>("key");

- In templated classes that also inherit from a dictionary, an additional
  'template' keyword will be required. Eg,

     this->coeffsDict().template get<scalar>("key");

  For this common use case, the predefined getXXX shortcuts may be
  useful. Eg,

     this->coeffsDict().getScalar("key");
This commit is contained in:
Mark Olesen
2018-10-12 08:14:47 +02:00
parent 990d00d40d
commit 8eddcc072a
335 changed files with 1007 additions and 1127 deletions

View File

@ -34,18 +34,18 @@ License
Foam::refinementParameters::refinementParameters(const dictionary& dict)
:
maxGlobalCells_(readLabel(dict.lookup("maxGlobalCells"))),
maxLocalCells_(readLabel(dict.lookup("maxLocalCells"))),
minRefineCells_(readLabel(dict.lookup("minRefinementCells"))),
maxGlobalCells_(dict.get<label>("maxGlobalCells")),
maxLocalCells_(dict.get<label>("maxLocalCells")),
minRefineCells_(dict.get<label>("minRefinementCells")),
planarAngle_
(
dict.lookupOrDefault
(
"planarAngle",
readScalar(dict.lookup("resolveFeatureAngle"))
dict.get<scalar>("resolveFeatureAngle")
)
),
nBufferLayers_(readLabel(dict.lookup("nCellsBetweenLevels"))),
nBufferLayers_(dict.get<label>("nCellsBetweenLevels")),
locationsOutsideMesh_
(
dict.lookupOrDefault
@ -104,7 +104,7 @@ Foam::refinementParameters::refinementParameters(const dictionary& dict)
}
scalar featAngle(readScalar(dict.lookup("resolveFeatureAngle")));
const scalar featAngle(dict.get<scalar>("resolveFeatureAngle"));
if (featAngle < 0 || featAngle > 180)
{