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: for-range, forAllIters() ... in applications/utilities

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

28
applications/utilities/surface/surfaceAdd/surfaceAdd.C
View File

@ -201,18 +201,10 @@ int main(int argc, char *argv[])
forAll(surface1.patches(), i)
{
const word& name = surface1.patches()[i].name();
auto iter = nameToPatch.find(name);
label combinedi;
if (iter.found())
{
combinedi = iter.object();
}
else
{
combinedi = nameToPatch.size();
nameToPatch.insert(name, combinedi);
}
// Lookup or insert
const label combinedi = nameToPatch(name, nameToPatch.size());
patch1Map[i] = combinedi;
}
@ -221,18 +213,10 @@ int main(int argc, char *argv[])
forAll(surface2.patches(), i)
{
const word& name = surface2.patches()[i].name();
auto iter = nameToPatch.find(name);
label combinedi;
if (iter.found())
{
combinedi = iter.object();
}
else
{
combinedi = nameToPatch.size();
nameToPatch.insert(name, combinedi);
}
// Lookup or insert
const label combinedi = nameToPatch(name, nameToPatch.size());
patch2Map[i] = combinedi;
}

2
applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
View File

@ -1257,7 +1257,7 @@ autoPtr<extendedFeatureEdgeMesh> createEdgeMesh
forAllConstIters(inter.facePairToEdgeId(), iter)
{
const labelPair& facePair = iter.key();
const label cutEdgeI = iter.object();
const label cutEdgeI = iter.val();
const edge& fE = inter.cutEdges()[cutEdgeI];

2
applications/utilities/surface/surfaceFeatureExtract/extractionMethod/surfaceFeaturesExtraction.C
View File

@ -81,7 +81,7 @@ Foam::surfaceFeaturesExtraction::method::New
<< exit(FatalIOError);
}
return autoPtr<method>(cstrIter.object()(dict));
return autoPtr<method>(cstrIter.val()(dict));
}

12
applications/utilities/surface/surfaceMeshExtract/surfaceMeshExtract.C
View File

@ -273,12 +273,12 @@ int main(int argc, char *argv[])
label patchi = bMesh.findPatchID(iter.key());
if (patchi != -1)
{
patchToCompactZone[patchi] = iter();
patchToCompactZone[patchi] = iter.val();
}
else
{
label zoneI = fzm.findZoneID(iter.key());
faceZoneToCompactZone[zoneI] = iter();
faceZoneToCompactZone[zoneI] = iter.val();
}
}
@ -382,11 +382,11 @@ int main(int argc, char *argv[])
// Zones
surfZoneIdentifierList surfZones(compactZoneID.size());
forAllConstIter(HashTable<label>, compactZoneID, iter)
forAllConstIters(compactZoneID, iter)
{
surfZones[iter()] = surfZoneIdentifier(iter.key(), iter());
Info<< "surfZone " << iter()
<< " : " << surfZones[iter()].name()
surfZones[*iter] = surfZoneIdentifier(iter.key(), *iter);
Info<< "surfZone " << *iter
<< " : " << surfZones[*iter].name()
<< endl;
}

12
applications/utilities/surface/surfaceSplitNonManifolds/surfaceSplitNonManifolds.C
View File

@ -131,7 +131,7 @@ void dumpFaces
OFstream os(fName);
forAllConstIter(Map<label>, connectedFaces, iter)
forAllConstIters(connectedFaces, iter)
{
point ctr = surf.localFaces()[iter.key()].centre(surf.localPoints());
@ -461,7 +461,7 @@ label sharedFace
label startIndex = f.find(e.start());
// points in face in same order as edge
bool edgeOrder = (f[f.fcIndex(startIndex)] == e.end());
const bool edgeOrder = (f[f.fcIndex(startIndex)] == e.end());
// Get faces using edge in sorted order. (sorted such that walking
// around them in anti-clockwise order corresponds to edge vector
@ -469,7 +469,7 @@ label sharedFace
const labelList& eFaces = surf.sortedEdgeFaces()[sharedEdgeI];
// Get position of face in sorted edge faces
label faceIndex = eFaces.find(firstFacei);
const label faceIndex = eFaces.find(firstFacei);
if (edgeOrder)
{
@ -500,9 +500,9 @@ void calcPointVecs
boolList edgeDone(surf.nEdges(), false);
forAllConstIter(Map<label>, faceToEdge, iter)
forAllConstIters(faceToEdge, iter)
{
const label edgeI = iter();
const label edgeI = iter.val();
if (!edgeDone[edgeI])
{
@ -611,7 +611,7 @@ void renumberFaces
List<triSurface::FaceType>& newTris
)
{
forAllConstIter(Map<label>, faceToEdge, iter)
forAllConstIters(faceToEdge, iter)
{
const label facei = iter.key();
const triSurface::FaceType& f = surf.localFaces()[facei];

8
applications/utilities/surface/surfaceToPatch/surfaceToPatch.C
View File

@ -284,10 +284,8 @@ int main(int argc, char *argv[])
faceSet faceLabels(mesh, setName);
Info<< "Read " << faceLabels.size() << " faces to repatch ..." << endl;
forAllConstIter(faceSet, faceLabels, iter)
for (const label facei : faceLabels)
{
label facei = iter.key();
if (repatchFace(mesh, bMesh, nearest, patchMap, facei, meshMod))
{
nChanged++;
@ -298,11 +296,11 @@ int main(int argc, char *argv[])
{
forAll(nearest, bFacei)
{
label facei = mesh.nInternalFaces() + bFacei;
const label facei = mesh.nInternalFaces() + bFacei;
if (repatchFace(mesh, bMesh, nearest, patchMap, facei, meshMod))
{
nChanged++;
++nChanged;
}
}
}