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

STYLE: avoid deprecated lookup methods

Browse Source
This commit is contained in:
Mark Olesen
2019-05-22 15:06:12 +01:00
committed by Andrew Heather
parent 0ae939e8f8
commit b5d775a691
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
View File

@ -303,26 +303,25 @@ bool Foam::distributedTriSurfaceMesh::read()
}
else
{
procBb_[Pstream::myProcNo()] =
List<treeBoundBox>(dict_.lookup("bounds"));
dict_.readEntry("bounds", procBb_[Pstream::myProcNo()]);
Pstream::gatherList(procBb_);
Pstream::scatterList(procBb_);
// Wanted distribution type
distType_ = distributionTypeNames_.lookup("distributionType", dict_);
distType_ = distributionTypeNames_.get("distributionType", dict_);
// Merge distance
mergeDist_ = readScalar(dict_.lookup("mergeDistance"));
dict_.readEntry("mergeDistance", mergeDist_);
// Distribution type
surfaceClosed_ = dict_.lookupOrDefault<bool>("closed", false);
surfaceClosed_ = dict_.getOrDefault<bool>("closed", false);
outsideVolType_ = volumeType::UNKNOWN;
word volType;
if (dict_.readIfPresent<word>("outsideVolumeType", volType))
{
outsideVolType_ = volumeType::names[volType];
}
outsideVolType_ = volumeType::names.getOrDefault
(
"outsideVolumeType",
dict_,
volumeType::UNKNOWN
);
}
return true;
@ -2669,7 +2668,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
// Optionally override settings from provided dictionary
{
// Wanted distribution type
distType_ = distributionTypeNames_.lookupOrDefault
distributionTypeNames_.readIfPresent
(
"distributionType",
dict_,
@ -2686,7 +2685,7 @@ Foam::distributedTriSurfaceMesh::distributedTriSurfaceMesh
surfaceClosed_ = closed;
}
outsideVolType_ = volumeType::names.lookupOrDefault
outsideVolType_ = volumeType::names.getOrDefault
(
"outsideVolumeType",
dict_,