STYLE: use modern iterator access (proximity check)

This commit is contained in:
Mark Olesen
2019-04-25 17:44:52 +02:00
committed by Andrew Heather
parent 53be19989b
commit d80198ec09

View File

@ -456,7 +456,8 @@ Foam::refinementSurfaces::refinementSurfaces
// Initialise to global (i.e. per surface) // Initialise to global (i.e. per surface)
for (label i = 0; i < nRegions; i++) for (label i = 0; i < nRegions; i++)
{ {
label globalRegionI = regionOffset_[surfI] + i; const label globalRegionI = regionOffset_[surfI] + i;
minLevel_[globalRegionI] = globalMinLevel[surfI]; minLevel_[globalRegionI] = globalMinLevel[surfI];
maxLevel_[globalRegionI] = globalMaxLevel[surfI]; maxLevel_[globalRegionI] = globalMaxLevel[surfI];
gapLevel_[globalRegionI] = gapLevel_[globalRegionI] =
@ -479,7 +480,7 @@ Foam::refinementSurfaces::refinementSurfaces
// Overwrite with region specific information // Overwrite with region specific information
forAllConstIters(regionMinLevel[surfI], iter) forAllConstIters(regionMinLevel[surfI], iter)
{ {
label globalRegionI = regionOffset_[surfI] + iter.key(); const label globalRegionI = regionOffset_[surfI] + iter.key();
minLevel_[globalRegionI] = iter.val(); minLevel_[globalRegionI] = iter.val();
maxLevel_[globalRegionI] = regionMaxLevel[surfI][iter.key()]; maxLevel_[globalRegionI] = regionMaxLevel[surfI][iter.key()];
@ -493,24 +494,25 @@ Foam::refinementSurfaces::refinementSurfaces
} }
forAllConstIters(regionAngle[surfI], iter) forAllConstIters(regionAngle[surfI], iter)
{ {
label globalRegionI = regionOffset_[surfI] + iter.key(); const label globalRegionI = regionOffset_[surfI] + iter.key();
perpendicularAngle_[globalRegionI] = regionAngle[surfI][iter.key()]; perpendicularAngle_[globalRegionI] = iter.val();
} }
const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI]; const Map<autoPtr<dictionary>>& localInfo = regionPatchInfo[surfI];
forAllConstIters(localInfo, iter) forAllConstIters(localInfo, iter)
{ {
label globalRegionI = regionOffset_[surfI] + iter.key(); const label globalRegionI = regionOffset_[surfI] + iter.key();
const dictionary& dict = *(iter.val()); const dictionary& dict = *(iter.val());
patchInfo_.set(globalRegionI, dict.clone()); patchInfo_.set(globalRegionI, dict.clone());
} }
forAllConstIter(Map<label>, regionBlockLevel[surfI], iter) forAllConstIters(regionBlockLevel[surfI], iter)
{ {
label globalRegionI = regionOffset_[surfI] + iter.key(); const label globalRegionI = regionOffset_[surfI] + iter.key();
blockLevel_[globalRegionI] = regionBlockLevel[surfI][iter.key()];
blockLevel_[globalRegionI] = iter.val();
} }
} }
} }