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: unify use of dictionary method names

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

6
applications/utilities/mesh/manipulation/createBaffles/createBaffles.C
View File

@ -472,7 +472,7 @@ int main(int argc, char *argv[])
IOdictionary dict(dictIO);
internalFacesOnly = dict.get<bool>("internalFacesOnly");
noFields = dict.lookupOrDefault("noFields", false);
noFields = dict.getOrDefault("noFields", false);
const dictionary& selectionsDict = dict.subDict("baffles");
@ -735,7 +735,7 @@ int main(int argc, char *argv[])
// (ie 3D thermal baffles)
const bool sameGroup =
patchSource.lookupOrDefault("sameGroup", true);
patchSource.getOrDefault("sameGroup", true);
if (!sameGroup)
{
@ -915,7 +915,7 @@ int main(int argc, char *argv[])
const dictionary& patchSource = dict.subDict("patchPairs");
const bool sameGroup =
patchSource.lookupOrDefault("sameGroup", true);
patchSource.getOrDefault("sameGroup", true);
const word& groupName = selectors[selectorI].name();

4
applications/utilities/mesh/manipulation/createBaffles/faceSelection/faceSelection.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2012-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -50,7 +50,7 @@ Foam::faceSelection::faceSelection
name_(name),
mesh_(mesh),
dict_(dict),
flip_(dict.lookupOrDefault("flip", false))
flip_(dict.getOrDefault("flip", false))
{}

3
applications/utilities/mesh/manipulation/createBaffles/faceSelection/searchableSurfaceSelection.C
View File

@ -6,6 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2012-2016 OpenFOAM Foundation
Copyright (C) 2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -66,7 +67,7 @@ Foam::faceSelections::searchableSurfaceSelection::searchableSurfaceSelection
dict.get<word>("surface"),
IOobject
(
dict.lookupOrDefault("name", mesh.objectRegistry::db().name()),
dict.getOrDefault("name", mesh.objectRegistry::db().name()),
mesh.time().constant(),
"triSurface",
mesh.objectRegistry::db(),

4
applications/utilities/mesh/manipulation/moveDynamicMesh/moveDynamicMesh.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2011-2016 OpenFOAM Foundation
Copyright (C) 2016-2019 OpenCFD Ltd.
Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -190,7 +190,7 @@ int main(int argc, char *argv[])
bool moveMeshOuterCorrectors
(
pimple.dict().lookupOrDefault("moveMeshOuterCorrectors", false)
pimple.dict().getOrDefault("moveMeshOuterCorrectors", false)
);
while (runTime.loop())

6
applications/utilities/mesh/manipulation/renumberMesh/renumberMesh.C
View File

@ -714,7 +714,7 @@ int main(int argc, char *argv[])
renumberPtr = renumberMethod::New(renumberDict);
sortCoupledFaceCells = renumberDict.lookupOrDefault
sortCoupledFaceCells = renumberDict.getOrDefault
(
"sortCoupledFaceCells",
false
@ -725,7 +725,7 @@ int main(int argc, char *argv[])
<< endl;
}
blockSize = renumberDict.lookupOrDefault("blockSize", 0);
blockSize = renumberDict.getOrDefault("blockSize", 0);
if (blockSize > 0)
{
Info<< "Ordering cells into regions of size " << blockSize
@ -743,7 +743,7 @@ int main(int argc, char *argv[])
}
}
orderPoints = renumberDict.lookupOrDefault("orderPoints", false);
orderPoints = renumberDict.getOrDefault("orderPoints", false);
if (orderPoints)
{
Info<< "Ordering points into internal and boundary points." << nl