ENH: for-range, forAllIters() ... in applications/utilities

- reduced clutter when iterating over containers
This commit is contained in:
Mark Olesen
2019-01-07 09:20:51 +01:00
parent 1458b4f689
commit 14a404170b
76 changed files with 592 additions and 728 deletions

View File

@ -592,7 +592,7 @@ int main(int argc, char *argv[])
const word cloudName = word::validate(iter.key());
// Objects (on arbitrary processor)
const IOobjectList& cloudObjs = iter.object();
const IOobjectList& cloudObjs = iter.val();
Info<< "Reconstructing lagrangian fields for cloud "
<< cloudName << nl << endl;
@ -831,15 +831,15 @@ int main(int argc, char *argv[])
cellSet& cSet = cellSets[setI];
cSet.instance() = runTime.timeName();
forAllConstIter(cellSet, procSet, iter)
for (const label celli : procSet)
{
cSet.insert(cellMap[iter.key()]);
cSet.insert(cellMap[celli]);
}
}
// faceSets
const labelList& faceMap =
procMeshes.faceProcAddressing()[proci];
procMeshes.faceProcAddressing()[proci];
IOobjectList fSets
(
@ -867,9 +867,9 @@ int main(int argc, char *argv[])
faceSet& fSet = faceSets[setI];
fSet.instance() = runTime.timeName();
forAllConstIter(faceSet, procSet, iter)
for (const label facei : procSet)
{
fSet.insert(mag(faceMap[iter.key()])-1);
fSet.insert(mag(faceMap[facei])-1);
}
}
// pointSets
@ -901,25 +901,26 @@ int main(int argc, char *argv[])
pointSet& pSet = pointSets[setI];
pSet.instance() = runTime.timeName();
forAllConstIter(pointSet, propSet, iter)
for (const label pointi : propSet)
{
pSet.insert(pointMap[iter.key()]);
pSet.insert(pointMap[pointi]);
}
}
}
// Write sets
forAll(cellSets, i)
for (const auto& set : cellSets)
{
cellSets[i].write();
set.write();
}
forAll(faceSets, i)
for (const auto& set : faceSets)
{
faceSets[i].write();
set.write();
}
forAll(pointSets, i)
for (const auto& set : pointSets)
{
pointSets[i].write();
set.write();
}
}