From a8bf4be58a57ed0a005903877f4c9c6ed4d32013 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 25 Apr 2016 12:00:53 +0100 Subject: [PATCH] Standardized cell, patch, face and processor loop index names --- .../test/fieldMapping/Test-fieldMapping.C | 6 +- .../test/globalIndex/Test-globalIndex.C | 56 ++-- .../Test-parallel-nonBlocking.C | 16 +- applications/test/parallel/Test-parallel.C | 24 +- .../test/patchRegion/Test-patchRegion.C | 4 +- .../test/router/Test-processorRouter.C | 14 +- .../utilities/mesh/advanced/PDRMesh/PDRMesh.C | 54 ++-- .../autoRefineMesh/snappyRefineMesh.C | 10 +- .../mesh/advanced/modifyMesh/cellSplitter.C | 12 +- .../mesh/advanced/modifyMesh/modifyMesh.C | 8 +- .../refineWallLayer/refineWallLayer.C | 6 +- .../Optional/ccm26ToFoam/ccm26ToFoam.C | 78 ++--- .../mesh/conversion/cfx4ToFoam/cfx4ToFoam.C | 12 +- .../fluentMeshToFoam/create3DCellShape.C | 24 +- .../mesh/conversion/gmshToFoam/gmshToFoam.C | 22 +- .../ideasUnvToFoam/ideasUnvToFoam.C | 22 +- .../conversion/plot3dToFoam/plot3dToFoam.C | 8 +- .../sammToFoam/createBoundaryFaces.C | 6 +- .../sammToFoam/createPolyBoundary.C | 8 +- .../conversion/sammToFoam/createPolyCells.C | 6 +- .../star3ToFoam/createBoundaryFaces.C | 6 +- .../star3ToFoam/createPolyBoundary.C | 30 +- .../conversion/star3ToFoam/createPolyCells.C | 6 +- .../conversion/tetgenToFoam/tetgenToFoam.C | 4 +- .../extrude/extrudeMesh/extrudeMesh.C | 46 +-- .../extrudeToRegionMesh/extrudeToRegionMesh.C | 124 ++++---- .../extrude2DMesh/extrude2DMesh.C | 82 ++--- .../extrude2DMesh/extrude2DMesh.H | 14 +- .../patchToPoly2DMesh/patchToPoly2DMesh.C | 28 +- .../DelaunayMesh/DistributedDelaunayMesh.C | 54 ++-- .../PrintTable/PrintTable.C | 12 +- .../backgroundMeshDecomposition.C | 106 +++---- .../backgroundMeshDecompositionTemplates.C | 6 +- .../conformalVoronoiMeshCalcDualMesh.C | 28 +- .../conformalVoronoiMeshConformToSurface.C | 28 +- .../conformalVoronoiMeshIO.C | 28 +- .../conformalVoronoiMeshZones.C | 12 +- .../initialPointsMethod/pointFile/pointFile.C | 8 +- .../foamyHexMeshBackgroundMesh.C | 18 +- .../foamyQuadMesh/shortEdgeFilter2D.C | 16 +- .../mesh/manipulation/autoPatch/autoPatch.C | 34 +- .../manipulation/checkMesh/checkGeometry.C | 20 +- .../createBaffles/createBaffles.C | 32 +- .../manipulation/createPatch/createPatch.C | 32 +- .../mergeOrSplitBaffles/mergeOrSplitBaffles.C | 26 +- .../orientFaceZone/orientFaceZone.C | 64 ++-- .../manipulation/polyDualMesh/meshDualiser.C | 104 +++--- .../manipulation/polyDualMesh/meshDualiser.H | 10 +- .../mesh/manipulation/refineMesh/refineMesh.C | 12 +- .../manipulation/renumberMesh/renumberMesh.C | 80 ++--- .../mesh/manipulation/setSet/setSet.C | 24 +- .../mesh/manipulation/splitMesh/regionSide.C | 60 ++-- .../mesh/manipulation/splitMesh/regionSide.H | 4 +- .../mesh/manipulation/splitMesh/splitMesh.C | 6 +- .../splitMeshRegions/splitMeshRegions.C | 32 +- .../decomposePar/decomposePar.C | 76 ++--- .../decomposePar/domainDecomposition.C | 68 ++-- .../decomposePar/domainDecompositionMesh.C | 122 ++++---- .../domainDecompositionTemplates.C | 26 +- .../reconstructPar/checkFaceAddressingComp.H | 10 +- .../reconstructPar/reconstructPar.C | 44 +-- .../reconstructParMesh/reconstructParMesh.C | 140 ++++----- .../redistributePar/redistributePar.C | 38 +-- .../foamToEnsight/ensightField.C | 36 +-- .../foamToEnsight/ensightMesh.C | 10 +- .../foamToTecplot360/tecplotWriterTemplates.C | 4 +- .../foamToTetDualMesh/foamToTetDualMesh.C | 10 +- .../dataConversion/foamToVTK/internalWriter.C | 12 +- .../foamToVTK/surfaceMeshWriterTemplates.C | 4 +- .../dataConversion/foamToVTK/vtkTopo.C | 46 +-- .../dataConversion/foamToVTK/writeFaceSet.C | 8 +- .../foamToVTK/writeFunsTemplates.C | 14 +- .../vtkPV3Foam/vtkPV3FoamMeshVolume.C | 32 +- .../vtkPVFoam/vtkPVFoamMeshVolume.C | 32 +- .../particleTracks/particleTracks.C | 16 +- .../foamListTimes/foamListTimes.C | 12 +- .../miscellaneous/postChannel/channelIndex.C | 20 +- .../foamUpgradeCyclics/foamUpgradeCyclics.C | 22 +- .../preProcessing/mapFields/mapFields.C | 14 +- .../preProcessing/mapFields/mapLagrangian.C | 6 +- .../mapFieldsPar/mapLagrangian.C | 6 +- .../preProcessing/setFields/setFields.C | 6 +- .../preProcessing/viewFactorsGen/shootRays.H | 18 +- .../viewFactorsGen/viewFactorsGen.C | 92 +++--- .../utilities/surface/surfaceAdd/surfaceAdd.C | 6 +- .../surface/surfaceCheck/surfaceCheck.C | 12 +- .../surface/surfaceClean/collapseBase.C | 14 +- .../surfaceFeatureExtract.C | 8 +- .../surface/surfaceHookUp/surfaceHookUp.C | 6 +- .../surfaceRedistributePar.C | 12 +- .../surfaceSplitNonManifolds.C | 30 +- .../surface/surfaceToPatch/surfaceToPatch.C | 16 +- .../algorithms/indexedOctree/treeDataCell.C | 4 +- .../Lists/SortableList/ParSortableList.C | 32 +- .../Lists/SortableList/ParSortableList.H | 2 +- .../db/IOstreams/Pstreams/PstreamBuffers.C | 10 +- .../db/IOstreams/Pstreams/PstreamBuffers.H | 12 +- src/OpenFOAM/db/IOstreams/Pstreams/UPstream.H | 2 +- .../IOstreams/Pstreams/UPstreamCommsStruct.C | 8 +- src/OpenFOAM/db/IOstreams/Pstreams/exchange.C | 30 +- src/OpenFOAM/global/argList/argList.C | 6 +- .../nonBlockingGaussSeidelSmoother.C | 2 +- .../GAMGAgglomerateLduAddressing.C | 32 +- .../eagerGAMGProcAgglomeration.C | 6 +- .../procFacesGAMGProcAgglomeration.C | 8 +- .../GAMG/GAMGSolverAgglomerateMatrix.C | 48 +-- .../ProcessorTopology/ProcessorTopology.C | 18 +- .../ProcessorTopology/ProcessorTopology.H | 2 +- .../meshes/ProcessorTopology/commSchedule.C | 18 +- .../meshes/ProcessorTopology/commSchedule.H | 6 +- .../meshes/lduMesh/lduPrimitiveMesh.C | 40 +-- .../meshShapes/cellMatcher/cellMatcher.C | 42 +-- .../meshShapes/cellMatcher/cellMatcher.H | 6 +- .../meshShapes/cellMatcher/hexMatcher.C | 4 +- .../meshShapes/cellMatcher/prismMatcher.C | 4 +- .../meshShapes/cellMatcher/pyrMatcher.C | 4 +- .../meshShapes/cellMatcher/tetMatcher.C | 4 +- .../meshShapes/cellMatcher/tetWedgeMatcher.C | 4 +- .../meshShapes/cellMatcher/wedgeMatcher.C | 4 +- .../meshes/meshShapes/cellShape/cellShapeI.H | 20 +- src/OpenFOAM/meshes/meshTools/matchPoints.C | 16 +- .../polyMesh/globalMeshData/globalIndex.C | 14 +- .../polyMesh/globalMeshData/globalIndex.H | 24 +- .../polyMesh/globalMeshData/globalIndexI.H | 26 +- .../polyMesh/globalMeshData/globalMeshData.C | 50 +-- .../polyMesh/globalMeshData/globalPoints.C | 20 +- .../mapPolyMesh/mapDistribute/mapDistribute.C | 196 ++++++------ .../mapPolyMesh/mapDistribute/mapDistribute.H | 6 +- .../mapPatchChange/mapPatchChange.H | 6 +- .../meshes/polyMesh/mapPolyMesh/mapPolyMesh.H | 24 +- .../polyBoundaryMesh/polyBoundaryMesh.C | 30 +- src/OpenFOAM/meshes/polyMesh/polyMesh.C | 14 +- src/OpenFOAM/meshes/polyMesh/polyMesh.H | 2 +- .../polyMesh/polyMeshCheck/polyMeshTools.C | 16 +- .../meshes/polyMesh/polyMeshFromShapeMesh.C | 16 +- .../constraint/cyclic/cyclicPolyPatch.C | 38 +-- .../constraint/oldCyclic/oldCyclicPolyPatch.C | 48 +-- .../constraint/processor/processorPolyPatch.C | 68 ++-- .../meshes/polyMesh/syncTools/syncTools.C | 4 +- .../polyMesh/syncTools/syncToolsTemplates.C | 14 +- .../meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C | 12 +- .../meshes/polyMesh/zones/faceZone/faceZone.C | 18 +- .../PatchTools/PatchToolsSearch.C | 32 +- .../PatchTools/PatchToolsSortPoints.C | 6 +- .../PrimitivePatch/PrimitivePatch.H | 2 +- .../PrimitivePatch/PrimitivePatchAddressing.C | 4 +- .../PrimitivePatch/PrimitivePatchCheck.C | 10 +- .../primitiveMesh/primitiveMeshCellCells.C | 8 +- .../primitiveMeshCheck/primitiveMeshCheck.C | 30 +- .../primitiveMesh/primitiveMeshEdgeCells.C | 20 +- .../primitiveMesh/primitivePatch/patchZones.C | 4 +- .../primitiveMesh/primitivePatch/walkPatch.C | 8 +- .../globalIndexAndTransform.C | 6 +- .../globalIndexAndTransform.H | 2 +- .../globalIndexAndTransformI.H | 8 +- ...convectiveHeatTransferFvPatchScalarField.C | 4 +- ...oupledTemperatureMixedFvPatchScalarField.C | 10 +- ...tureCoupledBaffleMixedFvPatchScalarField.C | 4 +- ...eratureRadCoupledMixedFvPatchScalarField.C | 4 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 4 +- ...ayatillekeWallFunctionFvPatchScalarField.C | 4 +- .../LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C | 4 +- .../LES/LESdeltas/smoothDelta/smoothDelta.C | 8 +- .../LES/LESdeltas/smoothDelta/smoothDelta.H | 16 +- .../fWallFunctionFvPatchScalarField.C | 10 +- .../kLowReWallFunctionFvPatchScalarField.C | 4 +- ...tkAtmRoughWallFunctionFvPatchScalarField.C | 4 +- .../nutkRoughWallFunctionFvPatchScalarField.C | 4 +- .../nutkWallFunctionFvPatchScalarField.C | 4 +- .../v2WallFunctionFvPatchScalarField.C | 4 +- .../ensight/part/ensightPartCells.C | 8 +- .../meshReader/createPolyBoundary.C | 10 +- src/conversion/meshReader/createPolyCells.C | 20 +- .../meshWriter/starcd/STARCDMeshWriter.C | 6 +- src/conversion/polyDualMesh/polyDualMesh.C | 64 ++-- .../dynamicRefineFvMesh/dynamicRefineFvMesh.C | 68 ++-- .../attachDetach/detachInterface.C | 8 +- src/dynamicMesh/boundaryMesh/boundaryMesh.C | 216 ++++++------- src/dynamicMesh/boundaryMesh/boundaryMesh.H | 8 +- .../createShellMesh/createShellMesh.C | 32 +- .../createShellMesh/createShellMesh.H | 4 +- src/dynamicMesh/fvMeshAdder/fvMeshAdder.C | 6 +- .../fvMeshAdder/fvMeshAdderTemplates.C | 142 ++++----- .../fvMeshDistribute/fvMeshDistribute.C | 208 ++++++------ .../fvMeshDistribute/fvMeshDistribute.H | 4 +- .../fvMeshDistributeTemplates.C | 12 +- src/dynamicMesh/fvMeshTools/fvMeshTools.C | 20 +- src/dynamicMesh/meshCut/cellCuts/cellCuts.C | 86 ++--- .../meshCut/cellLooper/cellLooper.C | 10 +- .../meshCut/cellLooper/hexCellLooper.C | 4 +- .../meshCut/cellLooper/hexCellLooper.H | 2 +- .../meshCut/cellLooper/topoCellLooper.C | 14 +- .../meshCut/cellLooper/topoCellLooper.H | 2 +- .../directions/directionInfo/directionInfo.H | 14 +- .../directions/directionInfo/directionInfoI.H | 32 +- .../meshCut/directions/directions.C | 24 +- .../meshCut/edgeVertex/edgeVertex.C | 20 +- .../boundaryCutter/boundaryCutter.C | 8 +- .../meshCutAndRemove/meshCutAndRemove.C | 82 ++--- .../meshCutAndRemove/meshCutAndRemove.H | 4 +- .../meshModifiers/meshCutter/meshCutter.C | 74 ++--- .../multiDirRefinement/multiDirRefinement.C | 20 +- .../undoableMeshCutter/undoableMeshCutter.C | 42 +-- .../meshCut/wallLayerCells/wallLayerCells.C | 12 +- .../wallNormalInfo/wallNormalInfo.H | 16 +- .../wallNormalInfo/wallNormalInfoI.H | 16 +- .../motionSmoother/motionSmootherAlgo.C | 8 +- .../polyMeshGeometry/polyMeshGeometry.C | 14 +- .../perfectInterface/perfectInterface.C | 12 +- .../polyMeshAdder/faceCoupleInfo.C | 142 ++++----- src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 296 +++++++++--------- .../polyMeshFilter/polyMeshFilter.C | 10 +- .../polyTopoChange/addPatchCellLayer.C | 258 +++++++-------- .../polyTopoChange/addPatchCellLayer.H | 12 +- .../polyTopoChange/combineFaces.C | 44 +-- .../polyTopoChange/edgeCollapser.C | 40 +-- .../polyTopoChange/polyTopoChange/hexRef8.C | 90 +++--- .../polyTopoChange/polyTopoChange/hexRef8.H | 2 +- .../polyTopoChange/polyTopoChange.C | 164 +++++----- .../polyTopoChange/refinementData.H | 16 +- .../polyTopoChange/refinementDataI.H | 16 +- .../polyTopoChange/refinementDistanceData.H | 16 +- .../polyTopoChange/refinementDistanceDataI.H | 22 +- .../polyTopoChange/refinementHistory.C | 64 ++-- .../polyTopoChange/refinementHistory.H | 2 +- .../polyTopoChange/removeCells.C | 4 +- .../polyTopoChange/removeFaces.C | 40 +-- .../polyTopoChange/removePoints.C | 18 +- .../polyTopoChange/tetDecomposer.C | 32 +- .../slidingInterfaceAttachedAddressing.C | 24 +- .../externalCoupledMixedFvPatchField.C | 20 +- .../mappedFixedInternalValueFvPatchField.C | 4 +- .../finiteVolume/fvc/fvcSmooth/smoothData.H | 16 +- .../finiteVolume/fvc/fvcSmooth/sweepData.H | 16 +- .../finiteVolume/fvc/fvcSmooth/sweepDataI.H | 14 +- .../gradSchemes/fourthGrad/fourthGrad.C | 12 +- .../leastSquaresGrad/leastSquaresGrad.C | 26 +- .../CFCCellToCellStencil.C | 28 +- .../globalIndexStencils/cellToCellStencil.C | 10 +- .../cellToFace/extendedCellToFaceStencil.C | 8 +- .../extendedUpwindCellToFaceStencil.C | 10 +- .../globalIndexStencils/cellToFaceStencil.C | 10 +- .../CFCFaceToCellStencil.C | 20 +- src/finiteVolume/fvMesh/fvMesh.C | 12 +- .../fvMesh/fvMeshSubset/fvMeshSubset.C | 216 ++++++------- .../fvMeshSubset/fvMeshSubsetInterpolate.C | 24 +- .../singleCellFvMesh/singleCellFvMesh.C | 16 +- .../wallDist/nearWallDist/nearWallDist.C | 12 +- .../wallDist/wallPointYPlus/wallPointYPlus.H | 10 +- .../wallDist/wallPointYPlus/wallPointYPlusI.H | 18 +- .../interpolationCellPatchConstrained.C | 4 +- .../skewCorrected/skewCorrectionVectors.C | 12 +- .../volPointInterpolate.C | 6 +- .../volPointInterpolation.C | 6 +- .../inverseFaceDistanceDiffusivity.C | 6 +- .../inversePointDistanceDiffusivity.C | 4 +- src/fvOptions/cellSetOption/cellSetOption.C | 4 +- .../derived/rotorDiskSource/rotorDiskSource.C | 4 +- .../clouds/Templates/DSMCCloud/DSMCCloud.C | 4 +- .../clouds/Templates/DSMCCloud/DSMCCloud.H | 2 +- .../parcels/Templates/DSMCParcel/DSMCParcel.H | 2 +- .../Templates/DSMCParcel/DSMCParcelI.H | 4 +- .../parcels/derived/dsmcParcel/dsmcParcel.C | 4 +- .../basic/InteractionLists/InteractionLists.C | 78 ++--- .../basic/indexedParticle/indexedParticle.H | 4 +- src/lagrangian/basic/particle/particle.C | 10 +- src/lagrangian/basic/particle/particle.H | 18 +- src/lagrangian/basic/particle/particleI.H | 78 ++--- src/lagrangian/basic/particle/particleIO.C | 6 +- .../basic/particle/particleTemplates.C | 50 +-- .../basic/passiveParticle/passiveParticle.H | 4 +- .../Templates/KinematicCloud/KinematicCloud.C | 6 +- .../CollidingParcel/CollidingParcel.H | 4 +- .../CollidingParcel/CollidingParcelI.H | 8 +- .../KinematicParcel/KinematicParcel.H | 4 +- .../KinematicParcel/KinematicParcelI.H | 8 +- .../Templates/MPPICParcel/MPPICParcel.H | 4 +- .../Templates/MPPICParcel/MPPICParcelI.H | 8 +- .../ReactingMultiphaseParcel.H | 4 +- .../ReactingMultiphaseParcelI.H | 8 +- .../Templates/ReactingParcel/ReactingParcel.H | 4 +- .../ReactingParcel/ReactingParcelI.H | 8 +- .../Templates/ThermoParcel/ThermoParcel.H | 4 +- .../Templates/ThermoParcel/ThermoParcelI.H | 8 +- .../FacePostProcessing/FacePostProcessing.C | 18 +- .../ParticleCollector/ParticleCollector.C | 6 +- .../ParticleErosion/ParticleErosion.C | 12 +- .../ParticleErosion/ParticleErosion.H | 2 +- .../PatchPostProcessing/PatchPostProcessing.C | 12 +- .../PatchPostProcessing/PatchPostProcessing.H | 2 +- .../PairCollision/PairCollision.C | 58 ++-- .../CellZoneInjection/CellZoneInjection.C | 4 +- .../CellZoneInjection/CellZoneInjection.H | 2 +- .../ConeInjection/ConeInjection.C | 4 +- .../ConeInjection/ConeInjection.H | 2 +- .../ConeNozzleInjection/ConeNozzleInjection.C | 14 +- .../ConeNozzleInjection/ConeNozzleInjection.H | 4 +- .../FieldActivatedInjection.C | 4 +- .../FieldActivatedInjection.H | 2 +- .../InflationInjection/InflationInjection.C | 4 +- .../InflationInjection/InflationInjection.H | 2 +- .../InjectionModel/InjectionModel.C | 38 +-- .../InjectionModel/InjectionModel.H | 4 +- .../KinematicLookupTableInjection.C | 6 +- .../KinematicLookupTableInjection.H | 2 +- .../ManualInjection/ManualInjection.C | 6 +- .../ManualInjection/ManualInjection.H | 2 +- .../InjectionModel/NoInjection/NoInjection.H | 2 +- .../PatchFlowRateInjection.C | 4 +- .../PatchFlowRateInjection.H | 2 +- .../PatchInjection/PatchInjection.C | 4 +- .../PatchInjection/PatchInjection.H | 2 +- .../PatchInjection/patchInjectionBase.C | 16 +- .../PatchInjection/patchInjectionBase.H | 4 +- .../NoSurfaceFilm/NoSurfaceFilm.H | 2 +- .../SurfaceFilmModel/SurfaceFilmModel.C | 58 ++-- .../SurfaceFilmModel/SurfaceFilmModel.H | 6 +- .../ReactingLookupTableInjection.C | 6 +- .../ReactingLookupTableInjection.H | 2 +- .../ReactingMultiphaseLookupTableInjection.C | 6 +- .../ReactingMultiphaseLookupTableInjection.H | 2 +- .../ThermoLookupTableInjection.C | 6 +- .../ThermoLookupTableInjection.H | 2 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 24 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.H | 6 +- .../molecule/molecule/molecule.H | 2 +- .../molecule/molecule/moleculeI.H | 4 +- src/lagrangian/solidParticle/solidParticle.H | 2 +- src/lagrangian/solidParticle/solidParticleI.H | 4 +- .../clouds/Templates/SprayCloud/SprayCloudI.H | 14 +- .../Templates/SprayParcel/SprayParcel.H | 4 +- .../Templates/SprayParcel/SprayParcelI.H | 8 +- .../blockMesh/blockMesh/blockMeshCreate.C | 6 +- .../medialAxisMeshMover.C | 4 +- .../meshRefinement/meshRefinement.C | 144 ++++----- .../meshRefinement/meshRefinement.H | 4 +- .../meshRefinement/meshRefinementBaffles.C | 118 +++---- .../meshRefinement/meshRefinementMerge.C | 16 +- .../meshRefinementProblemCells.C | 4 +- .../meshRefinement/meshRefinementRefine.C | 70 ++--- .../meshRefinement/meshRefinementTemplates.C | 8 +- .../refinementSurfaces/surfaceZonesInfo.C | 16 +- .../refinementParameters.C | 24 +- .../snappyHexMeshDriver/snappyLayerDriver.C | 108 +++---- .../snappyHexMeshDriver/snappyLayerDriver.H | 8 +- .../snappyHexMeshDriver/snappyRefineDriver.C | 10 +- .../snappyHexMeshDriver/snappySnapDriver.C | 14 +- .../snappySnapDriverFeature.C | 20 +- .../trackedParticle/trackedParticle.C | 4 +- .../trackedParticle/trackedParticle.H | 2 +- .../AMIInterpolation/AMIInterpolation.C | 80 ++--- .../AMIInterpolation/AMIInterpolation.H | 4 +- .../AMIInterpolationParallelOps.C | 64 ++-- .../AMIMethod/AMIMethod/AMIMethod.C | 40 +-- .../AMIMethod/AMIMethod/AMIMethod.H | 10 +- .../AMIMethod/directAMI/directAMI.C | 56 ++-- .../AMIMethod/directAMI/directAMI.H | 16 +- .../faceAreaWeightAMI/faceAreaWeightAMI.C | 136 ++++---- .../faceAreaWeightAMI/faceAreaWeightAMI.H | 22 +- .../AMIMethod/mapNearestAMI/mapNearestAMI.C | 90 +++--- .../AMIMethod/mapNearestAMI/mapNearestAMI.H | 20 +- .../partialFaceAreaWeightAMI.C | 20 +- .../partialFaceAreaWeightAMI.H | 8 +- .../cyclicAMIPolyPatch/cyclicAMIPolyPatch.C | 10 +- .../algorithms/MeshWave/FaceCellWave.C | 86 ++--- .../algorithms/MeshWave/FaceCellWave.H | 6 +- .../PatchEdgeFaceWave/PatchEdgeFaceWave.C | 12 +- .../PatchEdgeFaceWave/PatchEdgeFaceWave.H | 2 +- .../PatchEdgeFaceWave/patchPatchDist.C | 10 +- .../cellClassification/cellClassification.C | 36 +-- src/meshTools/cellClassification/cellInfo.H | 24 +- src/meshTools/cellClassification/cellInfoI.H | 50 +-- src/meshTools/cellDist/cellDistFuncs.C | 40 +-- src/meshTools/cellDist/cellDistFuncs.H | 4 +- .../cellDist/patchWave/patchDataWave.C | 32 +- src/meshTools/cellDist/patchWave/patchWave.C | 20 +- src/meshTools/cellDist/wallPoint/wallPoint.H | 16 +- .../cellDist/wallPoint/wallPointData.H | 10 +- .../cellDist/wallPoint/wallPointDataI.H | 14 +- src/meshTools/cellDist/wallPoint/wallPointI.H | 18 +- src/meshTools/cellFeatures/cellFeatures.C | 46 +-- src/meshTools/cellFeatures/cellFeatures.H | 4 +- src/meshTools/cellQuality/cellQuality.C | 8 +- .../edgeFaceCirculator/edgeFaceCirculatorI.H | 8 +- .../mappedPolyPatch/mappedPatchBase.C | 32 +- src/meshTools/meshSearch/meshSearch.C | 150 ++++----- src/meshTools/meshSearch/meshSearch.H | 12 +- src/meshTools/meshStructure/meshStructure.C | 22 +- .../meshStructure/topoDistanceData.H | 16 +- .../meshStructure/topoDistanceDataI.H | 16 +- src/meshTools/meshTools/meshTools.C | 18 +- .../primitiveMeshGeometry.C | 14 +- src/meshTools/regionSplit/localPointRegion.C | 62 ++-- src/meshTools/regionSplit/regionSplit.C | 82 ++--- src/meshTools/regionSplit/regionSplit.H | 2 +- .../cellSources/pointToCell/pointToCell.C | 4 +- .../cellSources/regionToCell/regionToCell.C | 14 +- .../cellSources/surfaceToCell/surfaceToCell.C | 4 +- .../sets/faceSources/cellToFace/cellToFace.C | 4 +- .../faceSources/pointToFace/pointToFace.C | 8 +- .../faceSources/regionToFace/regionToFace.C | 6 +- .../faceSources/regionToFace/regionToFace.H | 2 +- .../pointSources/cellToPoint/cellToPoint.C | 4 +- src/meshTools/sets/topoSets/cellZoneSet.C | 6 +- src/meshTools/sets/topoSets/faceZoneSet.C | 6 +- src/meshTools/sets/topoSets/topoSet.C | 10 +- src/meshTools/surfaceSets/surfaceSets.C | 16 +- .../booleanSurface/booleanSurface.C | 106 +++---- .../booleanSurface/booleanSurface.H | 2 +- .../intersectedSurface/edgeSurface.C | 4 +- .../intersectedSurface/intersectedSurface.C | 8 +- .../intersectedSurface/intersectedSurface.H | 2 +- .../surfaceIntersection/edgeIntersections.C | 4 +- .../surfaceIntersection/surfaceIntersection.C | 40 +-- .../surfaceIntersection/surfaceIntersection.H | 2 +- .../orientedSurface/orientedSurface.C | 56 ++-- .../orientedSurface/orientedSurface.H | 10 +- .../triSurfaceSearch/triSurfaceSearch.C | 14 +- .../triSurfaceTools/triSurfaceTools.C | 162 +++++----- .../triSurfaceTools/triSurfaceTools.H | 4 +- .../decompositionMethod/decompositionMethod.C | 56 ++-- .../decompositionMethod/minData.H | 16 +- .../decompositionMethod/minDataI.H | 16 +- .../multiLevelDecomp/multiLevelDecomp.C | 16 +- .../decompose/ptscotchDecomp/ptscotchDecomp.C | 12 +- .../distributedTriSurfaceMesh.C | 202 ++++++------ .../reconstruct/fvFieldReconstructor.C | 20 +- .../fvFieldReconstructorReconstructFields.C | 64 ++-- .../reconstruct/reconstruct/processorMeshes.C | 82 ++--- .../field/fieldMinMax/fieldMinMax.H | 4 +- .../field/fieldMinMax/fieldMinMaxTemplates.C | 62 ++-- .../field/fieldValues/faceSource/faceSource.C | 14 +- .../field/nearWallFields/findCellParticle.C | 4 +- .../field/nearWallFields/findCellParticle.H | 2 +- .../field/nearWallFields/nearWallFields.C | 16 +- .../field/processorField/processorField.C | 4 +- .../field/streamLine/streamLine.C | 6 +- .../wallBoundedParticle.C | 4 +- .../wallBoundedParticle.H | 2 +- .../wallBoundedParticleTemplates.C | 14 +- .../wallBoundedStreamLine.C | 20 +- .../wallBoundedStreamLineParticle.C | 4 +- .../wallBoundedStreamLineParticle.H | 2 +- .../reactingOneDim/reactingOneDim.C | 4 +- ...sRadiativeCoupledMixedFvPatchScalarField.C | 26 +- ...ysisTemperatureCoupledFvPatchScalarField.C | 18 +- ...rolysisVelocityCoupledFvPatchVectorField.C | 18 +- .../regionModel/regionModel/regionModel.C | 48 +-- .../regionModel/regionModel/regionModel.H | 28 +- .../regionModel/regionModel/regionModelI.H | 10 +- .../regionModel/regionModelTemplates.C | 58 ++-- .../regionModel/regionModel1D/regionModel1D.C | 50 +-- .../singleLayerRegion/singleLayerRegion.C | 6 +- ...alphatFilmWallFunctionFvPatchScalarField.C | 10 +- .../nutkFilmWallFunctionFvPatchScalarField.C | 10 +- .../thermoSingleLayer/thermoSingleLayer.C | 30 +- .../thermalBaffle/thermalBaffle.C | 12 +- .../thermalBaffleModel/thermalBaffleModel.C | 6 +- src/renumber/SloanRenumber/SloanRenumber.C | 10 +- .../manualRenumber/manualRenumber.C | 16 +- .../springRenumber/springRenumber.C | 10 +- src/renumber/zoltanRenumber/zoltanRenumber.C | 8 +- .../cellVolumeWeight/cellVolumeWeightMethod.C | 60 ++-- .../cellVolumeWeight/cellVolumeWeightMethod.H | 4 +- .../calcMethod/direct/directMethod.C | 26 +- .../calcMethod/direct/directMethod.H | 4 +- .../calcMethod/mapNearest/mapNearestMethod.C | 68 ++-- .../calcMethod/mapNearest/mapNearestMethod.H | 8 +- .../meshToMeshMethod/meshToMeshMethod.C | 30 +- .../meshToMeshMethod/meshToMeshMethod.H | 10 +- src/sampling/meshToMesh/meshToMesh.C | 14 +- .../meshToMesh/meshToMeshParallelOps.C | 254 +++++++-------- src/sampling/probes/patchProbes.C | 4 +- src/sampling/probes/patchProbesTemplates.C | 8 +- src/sampling/probes/probes.C | 20 +- src/sampling/sampledSet/face/faceOnlySet.C | 46 +-- src/sampling/sampledSet/face/faceOnlySet.H | 2 +- .../sampledSet/polyLine/polyLineSet.C | 28 +- .../sampledSet/sampledSet/sampledSet.C | 62 ++-- .../sampledSet/sampledSet/sampledSet.H | 10 +- src/sampling/sampledSet/uniform/uniformSet.C | 36 +-- src/sampling/sampledSet/uniform/uniformSet.H | 2 +- .../sampledSurface/isoSurface/isoSurface.C | 36 +-- .../isoSurface/isoSurfaceCell.C | 32 +- .../isoSurface/isoSurfaceCellTemplates.C | 4 +- .../isoSurface/isoSurfaceTemplates.C | 6 +- .../isoSurface/sampledIsoSurface.C | 6 +- .../sampledIsoSurfaceCellTemplates.C | 6 +- .../sampledCuttingPlane/sampledCuttingPlane.C | 6 +- .../sampledPatch/sampledPatchTemplates.C | 10 +- .../sampledPlane/sampledPlaneTemplates.C | 6 +- .../sampledTriSurfaceMesh.C | 6 +- .../sampledTriSurfaceMeshTemplates.C | 4 +- .../sampledThresholdCellFacesTemplates.C | 6 +- .../thresholdCellFaces/thresholdCellFaces.C | 2 +- src/surfMesh/MeshedSurface/MeshedSurface.C | 96 +++--- .../UnsortedMeshedSurface.C | 6 +- .../surfZone/surfZone/surfZoneIOList.C | 6 +- .../surfaceFormats/ac3d/AC3DsurfaceFormat.C | 10 +- .../surfaceFormats/gts/GTSsurfaceFormat.C | 2 +- .../surfaceFormats/obj/OBJsurfaceFormat.C | 6 +- .../surfaceFormats/off/OFFsurfaceFormat.C | 4 +- .../surfaceFormats/ofs/OFSsurfaceFormat.C | 2 +- .../surfaceFormats/smesh/SMESHsurfaceFormat.C | 6 +- .../starcd/STARCDsurfaceFormat.C | 4 +- .../surfaceFormats/stl/STLsurfaceFormat.C | 8 +- .../surfaceFormats/tri/TRIsurfaceFormat.C | 6 +- .../surfaceFormats/vtk/VTKsurfaceFormat.C | 4 +- .../surfaceFormats/vtk/VTKsurfaceFormatCore.C | 6 +- .../surfaceFormats/wrl/WRLsurfaceFormat.C | 6 +- .../surfaceFormats/x3d/X3DsurfaceFormat.C | 6 +- .../radiationModels/viewFactor/viewFactor.C | 18 +- .../radiationModels/viewFactor/viewFactor.H | 2 +- .../triSurface/interfaces/AC3D/writeAC.C | 2 +- .../triSurface/interfaces/DX/writeDX.C | 8 +- .../triSurface/interfaces/GTS/writeGTS.C | 6 +- .../triSurface/interfaces/OBJ/writeOBJ.C | 12 +- .../triSurface/interfaces/OFF/readOFF.C | 4 +- .../triSurface/interfaces/OFF/writeOFF.C | 6 +- .../triSurface/interfaces/SMESH/writeSMESH.C | 6 +- .../triSurface/interfaces/STL/writeSTL.C | 22 +- .../triSurface/interfaces/TRI/writeTRI.C | 6 +- .../triSurface/interfaces/VTK/writeVTK.C | 12 +- .../surfacePatch/surfacePatchIOList.C | 6 +- src/triSurface/triSurface/triSurface.C | 68 ++-- 525 files changed, 6296 insertions(+), 6296 deletions(-) diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index 41af9c7923..061290cf8c 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/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. diff --git a/applications/test/globalIndex/Test-globalIndex.C b/applications/test/globalIndex/Test-globalIndex.C index 0a93b9756c..0834534952 100644 --- a/applications/test/globalIndex/Test-globalIndex.C +++ b/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); } } diff --git a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C b/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C index 88c0a24571..eb37bd07f5 100644 --- a/applications/test/parallel-nonBlocking/Test-parallel-nonBlocking.C +++ b/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); } } diff --git a/applications/test/parallel/Test-parallel.C b/applications/test/parallel/Test-parallel.C index 62d6150ce4..a9fe2b6673 100644 --- a/applications/test/parallel/Test-parallel.C +++ b/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++; } } } diff --git a/applications/test/patchRegion/Test-patchRegion.C b/applications/test/patchRegion/Test-patchRegion.C index 44099ec8a6..cc56487c12 100644 --- a/applications/test/patchRegion/Test-patchRegion.C +++ b/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)) ); } } diff --git a/applications/test/router/Test-processorRouter.C b/applications/test/router/Test-processorRouter.C index 62fd7f2a9d..f5411c0627 100644 --- a/applications/test/router/Test-processorRouter.C +++ b/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; diff --git a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C b/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C index fe03257a59..d44a23c6d1 100644 --- a/applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C +++ b/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 diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C index 98a15db2a4..c1dea77d1f 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/snappyRefineMesh.C +++ b/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); } diff --git a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C b/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C index 1ad700d8d9..95af972536 100644 --- a/applications/utilities/mesh/advanced/modifyMesh/cellSplitter.C +++ b/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