Standardized cell, patch, face and processor loop index names

applications/test/fieldMapping/Test-fieldMapping.C

@@ -163,11 +163,11 @@ int main(int argc, char *argv[])
         }
 
         // Remove face
-        label candidateFaceI = rndGen.integer(0, mesh.nInternalFaces()-1);
-        Info<< "Wanting to delete face " << mesh.faceCentres()[candidateFaceI]
+        label candidateFacei = rndGen.integer(0, mesh.nInternalFaces()-1);
+        Info<< "Wanting to delete face " << mesh.faceCentres()[candidateFacei]
             << nl << endl;
 
-        labelList candidates(1, candidateFaceI);
+        labelList candidates(1, candidateFacei);
 
 
         // Get compatible set of faces and connected sets of cells.

applications/test/globalIndex/Test-globalIndex.C

@@ -69,23 +69,23 @@ int main(int argc, char *argv[])
     for (label celli = 0; celli < mesh.nCells(); celli++)
     {
         // to global index
-        label globalCellI = globalNumbering.toGlobal(celli);
+        label globalCelli = globalNumbering.toGlobal(celli);
 
         // and back
-        label procI = globalNumbering.whichProcID(globalCellI);
-        label localCellI = globalNumbering.toLocal(globalCellI);
+        label proci = globalNumbering.whichProcID(globalCelli);
+        label localCelli = globalNumbering.toLocal(globalCelli);
 
-        if (procI != Pstream::myProcNo() || localCellI != celli)
+        if (proci != Pstream::myProcNo() || localCelli != celli)
         {
             FatalErrorInFunction
-                << "Problem. celli:" << celli << " localCellI:" << localCellI
-                << " procI:" << procI << abort(FatalError);
+                << "Problem. celli:" << celli << " localCelli:" << localCelli
+                << " proci:" << proci << abort(FatalError);
         }
 
-        if (!globalNumbering.isLocal(globalCellI))
+        if (!globalNumbering.isLocal(globalCelli))
         {
             FatalErrorInFunction
-                << "Problem. celli:" << celli << " globalCellI:" << globalCellI
+                << "Problem. celli:" << celli << " globalCelli:" << globalCelli
                 << " not local" << abort(FatalError);
         }
     }
@@ -104,30 +104,30 @@ int main(int argc, char *argv[])
     {
         // We already checked that toGlobal(0) maps back correctly to myProcNo
         // so now check that the index one before maps to the previous processor
-        label prevProcCellI = globalNumbering.toGlobal(0)-1;
-        label procI = globalNumbering.whichProcID(prevProcCellI);
+        label prevProcCelli = globalNumbering.toGlobal(0)-1;
+        label proci = globalNumbering.whichProcID(prevProcCelli);
 
-        if (procI != Pstream::myProcNo()-1)
+        if (proci != Pstream::myProcNo()-1)
         {
             FatalErrorInFunction
-                << "Problem. global:" << prevProcCellI
+                << "Problem. global:" << prevProcCelli
                 << " expected on processor:" << Pstream::myProcNo()-1
-                << " but is calculated to be on procI:" << procI
+                << " but is calculated to be on proci:" << proci
                 << abort(FatalError);
         }
 
-        if (globalNumbering.isLocal(prevProcCellI))
+        if (globalNumbering.isLocal(prevProcCelli))
         {
             FatalErrorInFunction
-                << "Problem. globalCellI:" << prevProcCellI
+                << "Problem. globalCelli:" << prevProcCelli
                 << " calculated as local" << abort(FatalError);
         }
 
-        if (!globalNumbering.isLocal(procI, prevProcCellI))
+        if (!globalNumbering.isLocal(proci, prevProcCelli))
         {
             FatalErrorInFunction
-                << "Problem. globalCellI:" << prevProcCellI
-                << " not calculated as local on processor:" << procI
+                << "Problem. globalCelli:" << prevProcCelli
+                << " not calculated as local on processor:" << proci
                 << abort(FatalError);
         }
     }
@@ -135,30 +135,30 @@ int main(int argc, char *argv[])
 
     if (Pstream::myProcNo() < Pstream::nProcs()-1)
     {
-        label nextProcCellI = globalNumbering.toGlobal(mesh.nCells()-1)+1;
-        label procI = globalNumbering.whichProcID(nextProcCellI);
+        label nextProcCelli = globalNumbering.toGlobal(mesh.nCells()-1)+1;
+        label proci = globalNumbering.whichProcID(nextProcCelli);
 
-        if (procI != Pstream::myProcNo()+1)
+        if (proci != Pstream::myProcNo()+1)
         {
             FatalErrorInFunction
-                << "Problem. global:" << nextProcCellI
+                << "Problem. global:" << nextProcCelli
                 << " expected on processor:" << Pstream::myProcNo()+1
-                << " but is calculated to be on procI:" << procI
+                << " but is calculated to be on proci:" << proci
                 << abort(FatalError);
         }
 
-        if (globalNumbering.isLocal(nextProcCellI))
+        if (globalNumbering.isLocal(nextProcCelli))
         {
             FatalErrorInFunction
-                << "Problem. globalCellI:" << nextProcCellI
+                << "Problem. globalCelli:" << nextProcCelli
                 << " calculated as local" << abort(FatalError);
         }
 
-        if (!globalNumbering.isLocal(procI, nextProcCellI))
+        if (!globalNumbering.isLocal(proci, nextProcCelli))
         {
             FatalErrorInFunction
-                << "Problem. globalCellI:" << nextProcCellI
-                << " not calculated as local on processor:" << procI
+                << "Problem. globalCelli:" << nextProcCelli
+                << " not calculated as local on processor:" << proci
                 << abort(FatalError);
         }
     }

applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -151,9 +151,9 @@ int main(int argc, char *argv[])
     {
         PstreamBuffers pBufs(Pstream::nonBlocking);
 
-        for (label procI = 0; procI < Pstream::nProcs(); procI++)
+        for (label proci = 0; proci < Pstream::nProcs(); proci++)
         {
-            UOPstream toProc(procI, pBufs);
+            UOPstream toProc(proci, pBufs);
             toProc << Pstream::myProcNo();
         }
 
@@ -161,17 +161,17 @@ int main(int argc, char *argv[])
         pBufs.finishedSends();
 
         // Consume
-        for (label procI = 0; procI < Pstream::nProcs(); procI++)
+        for (label proci = 0; proci < Pstream::nProcs(); proci++)
         {
-            UIPstream fromProc(procI, pBufs);
+            UIPstream fromProc(proci, pBufs);
             label data;
             fromProc >> data;
 
-            if (data != procI)
+            if (data != proci)
             {
                 FatalErrorInFunction
-                    << "From processor " << procI << " received " << data
-                    << " but expected " << procI
+                    << "From processor " << proci << " received " << data
+                    << " but expected " << proci
                     << exit(FatalError);
             }
         }

applications/test/parallel/Test-parallel.C

@@ -76,21 +76,21 @@ int main(int argc, char *argv[])
         labelList nSend(Pstream::nProcs(), 0);
         forAll(complexData, i)
         {
-            label procI = complexData[i].first();
-            nSend[procI]++;
+            label proci = complexData[i].first();
+            nSend[proci]++;
         }
 
         // Collect items to be sent
         labelListList sendMap(Pstream::nProcs());
-        forAll(sendMap, procI)
+        forAll(sendMap, proci)
         {
-            sendMap[procI].setSize(nSend[procI]);
+            sendMap[proci].setSize(nSend[proci]);
         }
         nSend = 0;
         forAll(complexData, i)
         {
-            label procI = complexData[i].first();
-            sendMap[procI][nSend[procI]++] = i;
+            label proci = complexData[i].first();
+            sendMap[proci][nSend[proci]++] = i;
         }
 
         // Sync how many to send
@@ -99,9 +99,9 @@ int main(int argc, char *argv[])
 
         // Collect items to be received
         labelListList recvMap(Pstream::nProcs());
-        forAll(recvMap, procI)
+        forAll(recvMap, proci)
         {
-            recvMap[procI].setSize(nRecv[procI]);
+            recvMap[proci].setSize(nRecv[proci]);
         }
 
         label constructSize = 0;
@@ -111,13 +111,13 @@ int main(int argc, char *argv[])
             recvMap[Pstream::myProcNo()][i] = constructSize++;
         }
         // Construct from other processors
-        forAll(recvMap, procI)
+        forAll(recvMap, proci)
         {
-            if (procI != Pstream::myProcNo())
+            if (proci != Pstream::myProcNo())
             {
-                forAll(recvMap[procI], i)
+                forAll(recvMap[proci], i)
                 {
-                    recvMap[procI][i] = constructSize++;
+                    recvMap[proci][i] = constructSize++;
                 }
             }
         }

applications/test/patchRegion/Test-patchRegion.C

@@ -80,14 +80,14 @@ int main(int argc, char *argv[])
     {
         const labelList& fEdges = patch.faceEdges()[facei];
 
-        label globalFaceI = globalNumbering.toGlobal(facei);
+        label globalFacei = globalNumbering.toGlobal(facei);
 
         forAll(fEdges, i)
         {
             changedEdges.append(fEdges[i]);
             changedInfo.append
             (
-                patchEdgeFaceRegions(labelPair(globalFaceI, globalFaceI))
+                patchEdgeFaceRegions(labelPair(globalFacei, globalFacei))
             );
         }
     }

applications/test/router/Test-processorRouter.C

@@ -142,20 +142,20 @@ int main(int argc, char *argv[])
     OFstream objFile(fName);
 
     // Write processors as single vertex in centre of mesh
-    forAll(meshCentres, procI)
+    forAll(meshCentres, proci)
     {
-        const point& pt = meshCentres[procI];
+        const point& pt = meshCentres[proci];
 
         objFile << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
     }
     // Write connections as lines between processors (duplicated)
-    forAll(connections, procI)
+    forAll(connections, proci)
     {
-        const labelList& nbs = connections[procI];
+        const labelList& nbs = connections[proci];
 
         forAll(nbs, nbI)
         {
-            objFile << "l " << procI + 1 << ' ' << nbs[nbI] + 1 << endl;
+            objFile << "l " << proci + 1 << ' ' << nbs[nbI] + 1 << endl;
         }
     }
 
@@ -196,9 +196,9 @@ int main(int argc, char *argv[])
 
         OFstream objFile(fName);
 
-        forAll(meshCentres, procI)
+        forAll(meshCentres, proci)
         {
-            const point& pt = meshCentres[procI];
+            const point& pt = meshCentres[proci];
 
             objFile << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z()
                     << endl;

applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C

@@ -71,7 +71,7 @@ void modifyOrAddFace
     const label facei,
     const label own,
     const bool flipFaceFlux,
-    const label newPatchI,
+    const label newPatchi,
     const label zoneID,
     const bool zoneFlip,
 
@@ -90,7 +90,7 @@ void modifyOrAddFace
                 own,                        // owner
                 -1,                         // neighbour
                 flipFaceFlux,               // face flip
-                newPatchI,                  // patch for face
+                newPatchi,                  // patch for face
                 false,                      // remove from zone
                 zoneID,                     // zone for face
                 zoneFlip                    // face flip in zone
@@ -112,7 +112,7 @@ void modifyOrAddFace
                 -1,                         // master edge
                 facei,                      // master face
                 flipFaceFlux,               // face flip
-                newPatchI,                  // patch for face
+                newPatchi,                  // patch for face
                 zoneID,                     // zone for face
                 zoneFlip                    // face flip in zone
             )
@@ -160,9 +160,9 @@ void subsetVolFields
 
                 label newStart = fld.patch().patch().start();
 
-                label oldPatchI = subsetter.patchMap()[patchi];
+                label oldPatchi = subsetter.patchMap()[patchi];
 
-                if (oldPatchI == -1)
+                if (oldPatchi == -1)
                 {
                     // New patch. Reset whole value.
                     fld = exposedValue;
@@ -171,17 +171,17 @@ void subsetVolFields
                 {
                     // Reset those faces that originate from different patch
                     // or internal faces.
-                    label oldSize = volField.boundaryField()[oldPatchI].size();
+                    label oldSize = volField.boundaryField()[oldPatchi].size();
                     label oldStart = volField.boundaryField()
                     [
-                        oldPatchI
+                        oldPatchi
                     ].patch().patch().start();
 
                     forAll(fld, j)
                     {
-                        label oldFaceI = subsetter.faceMap()[newStart+j];
+                        label oldFacei = subsetter.faceMap()[newStart+j];
 
-                        if (oldFaceI < oldStart || oldFaceI >= oldStart+oldSize)
+                        if (oldFacei < oldStart || oldFacei >= oldStart+oldSize)
                         {
                             fld[j] = exposedValue;
                         }
@@ -233,9 +233,9 @@ void subsetSurfaceFields
 
                 label newStart = fld.patch().patch().start();
 
-                label oldPatchI = subsetter.patchMap()[patchi];
+                label oldPatchi = subsetter.patchMap()[patchi];
 
-                if (oldPatchI == -1)
+                if (oldPatchi == -1)
                 {
                     // New patch. Reset whole value.
                     fld = exposedValue;
@@ -244,17 +244,17 @@ void subsetSurfaceFields
                 {
                     // Reset those faces that originate from different patch
                     // or internal faces.
-                    label oldSize = volField.boundaryField()[oldPatchI].size();
+                    label oldSize = volField.boundaryField()[oldPatchi].size();
                     label oldStart = volField.boundaryField()
                     [
-                        oldPatchI
+                        oldPatchi
                     ].patch().patch().start();
 
                     forAll(fld, j)
                     {
-                        label oldFaceI = subsetter.faceMap()[newStart+j];
+                        label oldFacei = subsetter.faceMap()[newStart+j];
 
-                        if (oldFaceI < oldStart || oldFaceI >= oldStart+oldSize)
+                        if (oldFacei < oldStart || oldFacei >= oldStart+oldSize)
                         {
                             fld[j] = exposedValue;
                         }
@@ -706,7 +706,7 @@ int main(int argc, char *argv[])
     }
 
     // Exposed faces patch
-    label defaultPatchI = findPatch(mesh.boundaryMesh(), defaultPatch);
+    label defaultPatchi = findPatch(mesh.boundaryMesh(), defaultPatch);
 
 
     //
@@ -725,7 +725,7 @@ int main(int argc, char *argv[])
         blockedCells.invert(mesh.nCells());
 
         // Create subsetted mesh.
-        subsetter.setLargeCellSubset(blockedCells, defaultPatchI, true);
+        subsetter.setLargeCellSubset(blockedCells, defaultPatchi, true);
     }
 
 
@@ -783,7 +783,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         scalar(Zero),
         volScalarField::typeName,
         scalarFlds
@@ -795,7 +795,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         vector(Zero),
         volVectorField::typeName,
         vectorFlds
@@ -813,7 +813,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         sphericalTensor(Zero),
         volSphericalTensorField::typeName,
         sphericalTensorFlds
@@ -825,7 +825,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         symmTensor(Zero),
         volSymmTensorField::typeName,
         symmTensorFlds
@@ -837,7 +837,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         tensor(Zero),
         volTensorField::typeName,
         tensorFlds
@@ -851,7 +851,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         scalar(Zero),
         surfaceScalarField::typeName,
         surfScalarFlds
@@ -863,7 +863,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         vector(Zero),
         surfaceVectorField::typeName,
         surfVectorFlds
@@ -881,7 +881,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         sphericalTensor(Zero),
         surfaceSphericalTensorField::typeName,
         surfSphericalTensorFlds
@@ -901,7 +901,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         symmTensor(Zero),
         surfaceSymmTensorField::typeName,
         surfSymmTensorFlds
@@ -913,7 +913,7 @@ int main(int argc, char *argv[])
     (
         subsetter,
         objects,
-        defaultPatchI,
+        defaultPatchi,
         tensor(Zero),
         surfaceTensorField::typeName,
         surfTensorFlds

applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C

@@ -458,15 +458,15 @@ void doRefinement
 
     const labelListList& addedCells = multiRef.addedCells();
 
-    forAll(addedCells, oldCellI)
+    forAll(addedCells, oldCelli)
     {
-        const labelList& added = addedCells[oldCellI];
+        const labelList& added = addedCells[oldCelli];
 
         if (added.size())
         {
             // Give all cells resulting from split the refinement level
             // of the master.
-            label masterLevel = ++refLevel[oldCellI];
+            label masterLevel = ++refLevel[oldCelli];
 
             forAll(added, i)
             {
@@ -629,7 +629,7 @@ int main(int argc, char *argv[])
     #include "createPolyMesh.H"
 
     // If nessecary add oldInternalFaces patch
-    label newPatchI = addPatch(mesh, "oldInternalFaces");
+    label newPatchi = addPatch(mesh, "oldInternalFaces");
 
 
     //
@@ -854,7 +854,7 @@ int main(int argc, char *argv[])
         {
             // Subset mesh to remove inside cells altogether. Updates cutCells,
             // refLevel.
-            subsetMesh(mesh, writeMesh, newPatchI, inside, cutCells, refLevel);
+            subsetMesh(mesh, writeMesh, newPatchi, inside, cutCells, refLevel);
         }
 
 

applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C

@@ -208,7 +208,7 @@ void Foam::cellSplitter::setRefinement
         // Add other pyramids
         for (label i = 1; i < cFaces.size(); i++)
         {
-            label addedCellI =
+            label addedCelli =
                 meshMod.setAction
                 (
                     polyAddCell
@@ -221,7 +221,7 @@ void Foam::cellSplitter::setRefinement
                     )
                 );
 
-            newCells[i] = addedCellI;
+            newCells[i] = addedCelli;
         }
 
         cellToCells.insert(celli, newCells);
@@ -469,17 +469,17 @@ void Foam::cellSplitter::updateMesh(const mapPolyMesh& morphMap)
 
     forAllConstIter(Map<label>, addedPoints_, iter)
     {
-        label oldCellI = iter.key();
+        label oldCelli = iter.key();
 
-        label newCellI = morphMap.reverseCellMap()[oldCellI];
+        label newCelli = morphMap.reverseCellMap()[oldCelli];
 
         label oldPointI = iter();
 
         label newPointI = morphMap.reversePointMap()[oldPointI];
 
-        if (newCellI >= 0 && newPointI >= 0)
+        if (newCelli >= 0 && newPointI >= 0)
         {
-            newAddedPoints.insert(newCellI, newPointI);
+            newAddedPoints.insert(newCelli, newPointI);
         }
     }
 

applications/utilities/mesh/advanced/modifyMesh/modifyMesh.C

@@ -223,9 +223,9 @@ label findFace
     scalar almostMinDist = GREAT;
     label almostMinI = -1;
 
-    forAll(pp, patchFaceI)
+    forAll(pp, patchFacei)
     {
-        pointHit pHit(pp[patchFaceI].nearestPoint(nearPoint, points));
+        pointHit pHit(pp[patchFacei].nearestPoint(nearPoint, points));
 
         if (pHit.hit())