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

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017 OpenCFD Ltd.
Copyright (C) 2017-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -49,7 +49,7 @@ void Foam::loopControl::read(const dictionary& dict)
{
clear();
bool enabled = dict.lookupOrDefault("enabled", true);
bool enabled = dict.getOrDefault("enabled", true);
if (enabled)
{
@ -119,7 +119,7 @@ bool Foam::loopControl::checkConverged() const
const word& variableName = dataDictEntry.keyword();
const scalar absTol =
convergenceDict_.lookupOrDefault<scalar>(variableName, -1);
convergenceDict_.getOrDefault<scalar>(variableName, -1);
if (absTol > 0)
{