zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

22
src/engine/ignition/ignitionSiteIO.C
View File

@ -39,22 +39,22 @@ Foam::ignitionSite::ignitionSite
mesh_(mesh),
ignitionSiteDict_(is),
location_(ignitionSiteDict_.lookup("location")),
diameter_(readScalar(ignitionSiteDict_.lookup("diameter"))),
diameter_(ignitionSiteDict_.get<scalar>("diameter")),
time_
(
db_.userTimeToTime
(
readScalar(ignitionSiteDict_.lookup("start"))
ignitionSiteDict_.get<scalar>("start")
)
),
duration_
(
db_.userTimeToTime
(
readScalar(ignitionSiteDict_.lookup("duration"))
ignitionSiteDict_.get<scalar>("duration")
)
),
strength_(readScalar(ignitionSiteDict_.lookup("strength"))),
strength_(ignitionSiteDict_.get<scalar>("strength")),
timeIndex_(db_.timeIndex())
{
// Check state of Istream
@ -75,22 +75,28 @@ Foam::ignitionSite::ignitionSite
mesh_(mesh),
ignitionSiteDict_(is),
location_(ignitionSiteDict_.lookup("location")),
diameter_(readScalar(ignitionSiteDict_.lookup("diameter"))),
diameter_(ignitionSiteDict_.get<scalar>("diameter")),
time_
(
db_.userTimeToTime
(
edb.userTimeToTime(readScalar(ignitionSiteDict_.lookup("start")))
edb.userTimeToTime
(
ignitionSiteDict_.get<scalar>("start")
)
)
),
duration_
(
db_.userTimeToTime
(
edb.userTimeToTime(readScalar(ignitionSiteDict_.lookup("duration")))
edb.userTimeToTime
(
ignitionSiteDict_.get<scalar>("duration")
)
)
),
strength_(readScalar(ignitionSiteDict_.lookup("strength"))),
strength_(ignitionSiteDict_.get<scalar>("strength")),
timeIndex_(db_.timeIndex())
{
// Check state of Istream

14
src/engine/include/StCorr.H
View File

@ -18,12 +18,9 @@
// Assume it is part-spherical
scalar sphereFraction
(
readScalar
combustionProperties.get<scalar>
(
combustionProperties.lookup
(
"ignitionSphereFraction"
)
"ignitionSphereFraction"
)
);
@ -47,12 +44,9 @@
scalar circleFraction
(
readScalar
combustionProperties.get<scalar>
(
combustionProperties.lookup
(
"ignitionCircleFraction"
)
"ignitionCircleFraction"
)
);