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

STYLE: use forAllIter, forAllConstIter instead of long-hand version

Browse Source 
STYLE: use 'forAll(' NOT 'forAll (', as per coding guide
This commit is contained in:
Mark Olesen
2010-04-12 11:18:38 +02:00
parent 0f58ac5a9b
commit a50f01b079
220 changed files with 1144 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C
View File

@ -292,20 +292,14 @@ void addCutNeighbours
labelHashSet addCutFaces(cutCells.size()); labelHashSet addCutFaces(cutCells.size());
for forAllConstIter(labelHashSet, cutCells, iter)
(
labelHashSet::const_iterator iter = cutCells.begin();
iter != cutCells.end();
++iter
)
{ {
label cellI = iter.key(); const label cellI = iter.key();
const labelList& cFaces = mesh.cells()[cellI]; const labelList& cFaces = mesh.cells()[cellI];
forAll(cFaces, i) forAll(cFaces, i)
{ {
label faceI = cFaces[i]; const label faceI = cFaces[i];
if (mesh.isInternalFace(faceI)) if (mesh.isInternalFace(faceI))
{ {
@ -331,12 +325,7 @@ void addCutNeighbours
Info<< " Selected an additional " << addCutFaces.size() Info<< " Selected an additional " << addCutFaces.size()
<< " neighbours of cutCells to refine" << endl; << " neighbours of cutCells to refine" << endl;
for forAllConstIter(labelHashSet, addCutFaces, iter)
(
labelHashSet::const_iterator iter = addCutFaces.begin();
iter != addCutFaces.end();
++iter
)
{ {
cutCells.insert(iter.key()); cutCells.insert(iter.key());
} }
@ -386,21 +375,15 @@ bool limitRefinementLevel
labelHashSet addCutCells(cutCells.size()); labelHashSet addCutCells(cutCells.size());
for forAllConstIter(labelHashSet, cutCells, iter)
(
labelHashSet::const_iterator iter = cutCells.begin();
iter != cutCells.end();
++iter
)
{ {
// cellI will be refined. // cellI will be refined.
label cellI = iter.key(); const label cellI = iter.key();
const labelList& cCells = mesh.cellCells()[cellI]; const labelList& cCells = mesh.cellCells()[cellI];
forAll(cCells, i) forAll(cCells, i)
{ {
label nbr = cCells[i]; const label nbr = cCells[i];
if (!excludeCells.found(nbr) && !cutCells.found(nbr)) if (!excludeCells.found(nbr) && !cutCells.found(nbr))
{ {
@ -419,12 +402,8 @@ bool limitRefinementLevel
Info<< "Added an additional " << addCutCells.size() << " cells" Info<< "Added an additional " << addCutCells.size() << " cells"
<< " to satisfy 1:" << limitDiff << " refinement level" << " to satisfy 1:" << limitDiff << " refinement level"
<< endl; << endl;
for
( forAllConstIter(labelHashSet, addCutCells, iter)
labelHashSet::const_iterator iter = addCutCells.begin();
iter != addCutCells.end();
++iter
)
{ {
cutCells.insert(iter.key()); cutCells.insert(iter.key());
} }

12
applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
View File

@ -112,12 +112,7 @@ int main(int argc, char *argv[])
<< cells.instance()/cells.local()/cells.name() << cells.instance()/cells.local()/cells.name()
<< nl << endl; << nl << endl;
for forAllConstIter(cellSet, cells, iter)
(
cellSet::const_iterator iter = cells.begin();
iter != cells.end();
++iter
)
{ {
cutCells.erase(iter.key()); cutCells.erase(iter.key());
} }
@ -131,7 +126,7 @@ int main(int argc, char *argv[])
forAll(meshPoints, pointI) forAll(meshPoints, pointI)
{ {
label meshPointI = meshPoints[pointI]; const label meshPointI = meshPoints[pointI];
vertOnPatch[meshPointI] = true; vertOnPatch[meshPointI] = true;
} }
@ -151,8 +146,7 @@ int main(int argc, char *argv[])
forAll(pEdges, pEdgeI) forAll(pEdges, pEdgeI)
{ {
label edgeI = pEdges[pEdgeI]; const label edgeI = pEdges[pEdgeI];
const edge& e = mesh.edges()[edgeI]; const edge& e = mesh.edges()[edgeI];
label otherPointI = e.otherVertex(meshPointI); label otherPointI = e.otherVertex(meshPointI);

10
applications/utilities/mesh/advanced/splitCells/splitCells.C
View File

@ -392,15 +392,9 @@ void collectCuts
boolList edgeIsCut(mesh.nEdges(), false); boolList edgeIsCut(mesh.nEdges(), false);
scalarField edgeWeight(mesh.nEdges(), -GREAT); scalarField edgeWeight(mesh.nEdges(), -GREAT);
for forAllConstIter(cellSet, cellsToCut, iter)
(
cellSet::const_iterator iter = cellsToCut.begin();
iter != cellsToCut.end();
++iter
)
{ {
label cellI = iter.key(); const label cellI = iter.key();
const labelList& cEdges = cellEdges[cellI]; const labelList& cEdges = cellEdges[cellI];
forAll(cEdges, i) forAll(cEdges, i)

28
applications/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L
View File

@ -269,12 +269,7 @@ int main(int argc, char *argv[])
pointField points(slPoints.size()); pointField points(slPoints.size());
label i = 0; label i = 0;
for forAllConstIter(SLList<point>, slPoints, pointIter)
(
SLList<point>::iterator pointIter = slPoints.begin();
pointIter != slPoints.end();
++pointIter
)
{ {
// Scale points for the given scale factor // Scale points for the given scale factor
points[i++] = scaleFactor * pointIter(); points[i++] = scaleFactor * pointIter();
@ -284,12 +279,7 @@ int main(int argc, char *argv[])
labelList pointMap(maxNodei+1); labelList pointMap(maxNodei+1);
i = 0; i = 0;
for forAllConstIter(SLList<label>, slPointMap, pointMapIter)
(
SLList<label>::iterator pointMapIter = slPointMap.begin();
pointMapIter != slPointMap.end();
++pointMapIter
)
{ {
pointMap[pointMapIter()] = i++; pointMap[pointMapIter()] = i++;
} }
@ -299,12 +289,7 @@ int main(int argc, char *argv[])
labelList cellMap(maxCelli+1); labelList cellMap(maxCelli+1);
i = 0; i = 0;
for forAllConstIter(SLList<label>, slCellMap, cellMapIter)
(
SLList<label>::iterator cellMapIter = slCellMap.begin();
cellMapIter != slCellMap.end();
++cellMapIter
)
{ {
cellMap[cellMapIter()] = i++; cellMap[cellMapIter()] = i++;
} }
@ -323,12 +308,7 @@ int main(int argc, char *argv[])
cellShapeList cellShapes(slCellLabels.size()); cellShapeList cellShapes(slCellLabels.size());
label nCells = 0; label nCells = 0;
for forAllConstIter(SLPtrList<labelList>, slCellLabels, cellIter)
(
SLPtrList<labelList>::iterator cellIter = slCellLabels.begin();
cellIter != slCellLabels.end();
++cellIter
)
{ {
if // Tetrahedron if // Tetrahedron
( (

21
applications/utilities/mesh/conversion/kivaToFoam/readKivaGrid.H
View File

@ -327,12 +327,7 @@ if
{ {
scalar minz = GREAT; scalar minz = GREAT;
for forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
(
SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
iter != pFaces[CYLINDERHEAD][0].end();
++iter
)
{ {
const face& pf = iter(); const face& pf = iter();
@ -346,12 +341,7 @@ if
SLList<face> newLinerFaces; SLList<face> newLinerFaces;
for forAllConstIter(SLList<face>, pFaces[LINER][0], iter)
(
SLList<face>::iterator iter = pFaces[LINER][0].begin();
iter != pFaces[LINER][0].end();
++iter
)
{ {
const face& pf = iter(); const face& pf = iter();
@ -380,12 +370,7 @@ if
SLList<face> newCylinderHeadFaces; SLList<face> newCylinderHeadFaces;
for forAllConstIter(SLList<face>, pFaces[CYLINDERHEAD][0], iter)
(
SLList<face>::iterator iter = pFaces[CYLINDERHEAD][0].begin();
iter != pFaces[CYLINDERHEAD][0].end();
++iter
)
{ {
const face& pf = iter(); const face& pf = iter();

7
applications/utilities/mesh/conversion/tetgenToFoam/tetgenToFoam.C
View File

@ -468,12 +468,7 @@ int main(int argc, char *argv[])
// Print region to patch mapping // Print region to patch mapping
Info<< "Regions:" << endl; Info<< "Regions:" << endl;
for forAllConstIter(Map<label>, regionToPatch, iter)
(
Map<label>::const_iterator iter = regionToPatch.begin();
iter != regionToPatch.end();
++iter
)
{ {
Info<< " region:" << iter.key() << '\t' << "patch:" Info<< " region:" << iter.key() << '\t' << "patch:"
<< iter() << endl; << iter() << endl;

7
applications/utilities/mesh/conversion/writeMeshObj/writeMeshObj.C
View File

@ -356,12 +356,7 @@ void writePointCells
label vertI = 0; label vertI = 0;
for forAllConstIter(labelHashSet, allEdges, iter)
(
labelHashSet::const_iterator iter = allEdges.begin();
iter != allEdges.end();
++iter
)
{ {
const edge& e = mesh.edges()[iter.key()]; const edge& e = mesh.edges()[iter.key()];

21
applications/utilities/mesh/manipulation/setsToZones/setsToZones.C
View File

@ -100,12 +100,7 @@ int main(int argc, char *argv[])
//Pout<< "pointSets:" << pointObjects.names() << endl; //Pout<< "pointSets:" << pointObjects.names() << endl;
for forAllConstIter(IOobjectList, pointObjects, iter)
(
IOobjectList::const_iterator iter = pointObjects.begin();
iter != pointObjects.end();
++iter
)
{ {
// Not in memory. Load it. // Not in memory. Load it.
pointSet set(*iter()); pointSet set(*iter());
@ -149,12 +144,7 @@ int main(int argc, char *argv[])
//Pout<< "faceSets:" << faceObjects.names() << endl; //Pout<< "faceSets:" << faceObjects.names() << endl;
for forAllConstIter(IOobjectList, faceObjects, iter)
(
IOobjectList::const_iterator iter = faceObjects.begin();
iter != faceObjects.end();
++iter
)
{ {
// Not in memory. Load it. // Not in memory. Load it.
faceSet set(*iter()); faceSet set(*iter());
@ -288,12 +278,7 @@ int main(int argc, char *argv[])
//Pout<< "cellSets:" << cellObjects.names() << endl; //Pout<< "cellSets:" << cellObjects.names() << endl;
for forAllConstIter(IOobjectList, cellObjects, iter)
(
IOobjectList::const_iterator iter = cellObjects.begin();
iter != cellObjects.end();
++iter
)
{ {
if (!slaveCellSets.found(iter.key())) if (!slaveCellSets.found(iter.key()))
{ {

36
applications/utilities/mesh/manipulation/splitMesh/regionSide.C
View File

@ -81,8 +81,7 @@ Foam::label Foam::regionSide::otherEdge
forAll(fEdges, fEdgeI) forAll(fEdges, fEdgeI)
{ {
label otherEdgeI = fEdges[fEdgeI]; const label otherEdgeI = fEdges[fEdgeI];
const edge& otherE = mesh.edges()[otherEdgeI]; const edge& otherE = mesh.edges()[otherEdgeI];
if if
@ -300,15 +299,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
// //
labelHashSet regionEdges(4*regionFaces.size()); labelHashSet regionEdges(4*regionFaces.size());
for forAllConstIter(labelHashSet, regionFaces, iter)
(
labelHashSet::const_iterator iter = regionFaces.begin();
iter != regionFaces.end();
++iter
)
{ {
label faceI = iter.key(); const label faceI = iter.key();
const labelList& fEdges = mesh.faceEdges()[faceI]; const labelList& fEdges = mesh.faceEdges()[faceI];
forAll(fEdges, fEdgeI) forAll(fEdges, fEdgeI)
@ -326,12 +319,7 @@ void Foam::regionSide::walkAllPointConnectedFaces
labelHashSet visitedPoint(4*regionFaces.size()); labelHashSet visitedPoint(4*regionFaces.size());
// Insert fence points so we don't visit them // Insert fence points so we don't visit them
for forAllConstIter(labelHashSet, fencePoints, iter)
(
labelHashSet::const_iterator iter = fencePoints.begin();
iter != fencePoints.end();
++iter
)
{ {
visitedPoint.insert(iter.key()); visitedPoint.insert(iter.key());
} }
@ -344,14 +332,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
Info<< "Excluding visit of points:" << visitedPoint << endl; Info<< "Excluding visit of points:" << visitedPoint << endl;
} }
for forAllConstIter(labelHashSet, regionFaces, iter)
(
labelHashSet::const_iterator iter = regionFaces.begin();
iter != regionFaces.end();
++iter
)
{ {
label faceI = iter.key(); const label faceI = iter.key();
// Get side of face. // Get side of face.
label cellI; label cellI;
@ -459,12 +442,7 @@ Foam::regionSide::regionSide
labelHashSet fencePoints(fenceEdges.size()); labelHashSet fencePoints(fenceEdges.size());
for forAllConstIter(labelHashSet, fenceEdges, iter)
(
labelHashSet::const_iterator iter = fenceEdges.begin();
iter != fenceEdges.end();
++iter
)
{ {
const edge& e = mesh.edges()[iter.key()]; const edge& e = mesh.edges()[iter.key()];

16
applications/utilities/miscellaneous/foamInfoExec/foamInfoExec.C
View File

@ -76,12 +76,7 @@ int main(int argc, char *argv[])
if (args.optionFound("keywords") && !args.optionFound("entry")) if (args.optionFound("keywords") && !args.optionFound("entry"))
{ {
for forAllConstIter(dictionary, dict, iter)
(
IDLList<entry>::iterator iter = dict.begin();
iter != dict.end();
++iter
)
{ {
Info<< iter().keyword() << endl; Info<< iter().keyword() << endl;
} }
@ -137,13 +132,8 @@ int main(int argc, char *argv[])
} }
*/ */
const dictionary& dict(entPtr->dict()); const dictionary& dict = entPtr->dict();
for forAllConstIter(dictionary, dict, iter)
(
IDLList<entry>::const_iterator iter = dict.begin();
iter != dict.end();
++iter
)
{ {
Info<< iter().keyword() << endl; Info<< iter().keyword() << endl;
} }

16
applications/utilities/parallelProcessing/decomposePar/domainDecompositionMesh.C
View File

@ -506,12 +506,7 @@ void Foam::domainDecomposition::decomposeMesh()
// Add internal and boundary faces // Add internal and boundary faces
// Remember to increment the index by one such that the // Remember to increment the index by one such that the
// turning index works properly. // turning index works properly.
for forAllIter(SLList<label>, curProcFaces, curProcFacesIter)
(
SLList<label>::iterator curProcFacesIter = curProcFaces.begin();
curProcFacesIter != curProcFaces.end();
++curProcFacesIter
)
{ {
curProcFaceAddressing[nFaces] = curProcFacesIter() + 1; curProcFaceAddressing[nFaces] = curProcFacesIter() + 1;
nFaces++; nFaces++;
@ -564,12 +559,11 @@ void Foam::domainDecomposition::decomposeMesh()
// add faces for this processor boundary // add faces for this processor boundary
for forAllIter
( (
SLList<label>::iterator curFacesIter = SLList<label>,
curInterProcBFacesIter().begin(); curInterProcBFacesIter(),
curFacesIter != curInterProcBFacesIter().end(); curFacesIter
++curFacesIter
) )
{ {
// add the face // add the face

17
applications/utilities/parallelProcessing/decomposePar/readFields.C
View File

@ -48,22 +48,13 @@ void Foam::readFields
// Construct the vol scalar fields // Construct the vol scalar fields
fields.setSize(fieldObjects.size()); fields.setSize(fieldObjects.size());
label fieldi=0; label fieldI = 0;
for forAllIter(IOobjectList, fieldObjects, iter)
(
IOobjectList::iterator iter = fieldObjects.begin();
iter != fieldObjects.end();
++iter
)
{ {
fields.set fields.set
( (
fieldi++, fieldI++,
new GeoField new GeoField(*iter(), mesh)
(
*iter(),
mesh
)
); );
} }
} }

58
applications/utilities/postProcessing/dataConversion/foamDataToFluent/foamDataToFluent.C
View File

@ -110,36 +110,23 @@ int main(int argc, char *argv[])
// Search list of objects for volScalarFields // Search list of objects for volScalarFields
IOobjectList scalarFields(objects.lookupClass("volScalarField")); IOobjectList scalarFields(objects.lookupClass("volScalarField"));
for forAllIter(IOobjectList, scalarFields, iter)
(
IOobjectList::iterator scalarFieldIter = scalarFields.begin();
scalarFieldIter != scalarFields.end();
++scalarFieldIter
)
{ {
// Read field // Read field
volScalarField field volScalarField field(*iter(), mesh);
(
*scalarFieldIter(),
mesh
);
// lookup field from dictionary // lookup field from dictionary and convert field
if (foamDataToFluentDict.found(field.name())) label unitNumber;
{ if
label unitNumber
( (
readLabel(foamDataToFluentDict.lookup(field.name())) foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
); && unitNumber > 0
)
// Convert field
if (unitNumber > 0)
{ {
Info<< " Converting field " << field.name() << endl; Info<< " Converting field " << field.name() << endl;
writeFluentField(field, unitNumber, fluentDataFile); writeFluentField(field, unitNumber, fluentDataFile);
} }
} }
}
// Converting volVectorField // Converting volVectorField
@ -148,36 +135,23 @@ int main(int argc, char *argv[])
// Search list of objects for volVectorFields // Search list of objects for volVectorFields
IOobjectList vectorFields(objects.lookupClass("volVectorField")); IOobjectList vectorFields(objects.lookupClass("volVectorField"));
for forAllIter(IOobjectList, vectorFields, iter)
(
IOobjectList::iterator vectorFieldIter = vectorFields.begin();
vectorFieldIter != vectorFields.end();
++vectorFieldIter
)
{ {
// Read field // Read field
volVectorField field volVectorField field(*iter(), mesh);
(
*vectorFieldIter(),
mesh
);
// lookup field from dictionary // lookup field from dictionary and convert field
if (foamDataToFluentDict.found(field.name())) label unitNumber;
{ if
label unitNumber
( (
readLabel(foamDataToFluentDict.lookup(field.name())) foamDataToFluentDict.readIfPresent(field.name(), unitNumber)
); && unitNumber > 0
)
// Convert field
if (unitNumber > 0)
{ {
Info<< " Converting field " << field.name() << endl; Info<< " Converting field " << field.name() << endl;
writeFluentField(field, unitNumber, fluentDataFile); writeFluentField(field, unitNumber, fluentDataFile);
} }
} }
}
Info<< endl; Info<< endl;
} }

12
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutput.H
View File

@ -22,11 +22,11 @@ for (label i=0; i < nTypes; i++)
if (fieldTypes[i] == "volScalarField") if (fieldTypes[i] == "volScalarField")
{ {
volScalarField gmvScalarField(fieldObject, mesh); volScalarField fld(fieldObject, mesh);
gmvFile << fieldName << " 0" << nl; gmvFile << fieldName << " 0" << nl;
for (label indx=0;indx<mesh.nCells();indx++) for (label indx=0;indx<mesh.nCells();indx++)
{ {
gmvFile << gmvScalarField[indx] << " "; gmvFile << fld[indx] << " ";
} }
gmvFile << nl; gmvFile << nl;
} }
@ -35,19 +35,19 @@ for (label i=0; i < nTypes; i++)
{ {
if (fieldName == vComp) if (fieldName == vComp)
{ {
volVectorField gmvVectorField(fieldObject, mesh); volVectorField fld(fieldObject, mesh);
gmvFile << "velocity 0" << nl; gmvFile << "velocity 0" << nl;
for (label indx=0;indx<mesh.nCells();indx++) for (label indx=0;indx<mesh.nCells();indx++)
{ {
gmvFile << gmvVectorField[indx].x() << " "; gmvFile << fld[indx].x() << " ";
} }
for (label indx=0;indx<mesh.nCells();indx++) for (label indx=0;indx<mesh.nCells();indx++)
{ {
gmvFile << gmvVectorField[indx].y() << " "; gmvFile << fld[indx].y() << " ";
} }
for (label indx=0;indx<mesh.nCells();indx++) for (label indx=0;indx<mesh.nCells();indx++)
{ {
gmvFile << gmvVectorField[indx].z() << " "; gmvFile << fld[indx].z() << " ";
} }
gmvFile << nl; gmvFile << nl;
} }

55
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputLagrangian.H
View File

@ -1,42 +1,27 @@
gmvFile << "tracers " << particles.size() << nl; gmvFile << "tracers " << particles.size() << nl;
for forAllConstIter(Cloud<passiveParticle>, particles, iter)
(
Cloud<passiveParticle>::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().x() << " "; gmvFile << iter().position().x() << ' ';
} }
gmvFile << nl; gmvFile << nl;
for forAllConstIter(Cloud<passiveParticle>, particles, iter)
(
Cloud<passiveParticle>::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().y() << " "; gmvFile << iter().position().y() << ' ';
} }
gmvFile << nl; gmvFile << nl;
for forAllConstIter(Cloud<passiveParticle>, particles, iter)
(
Cloud<passiveParticle>::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().z() << " "; gmvFile << iter().position().z() << ' ';
} }
gmvFile << nl; gmvFile << nl;
forAll(lagrangianScalarNames, i) forAll(lagrangianScalarNames, i)
{ {
word name = lagrangianScalarNames[i]; const word name = lagrangianScalarNames[i];
IOField<scalar> s IOField<scalar> fld
( (
IOobject IOobject
( (
@ -49,13 +34,13 @@ forAll(lagrangianScalarNames, i)
) )
); );
if (s.size()) if (fld.size())
{ {
gmvFile << name << nl; gmvFile << name << nl;
for (label n = 0; n < s.size(); n++) forAll(fld, n)
{ {
gmvFile << s[n] << token::SPACE; gmvFile << fld[n] << token::SPACE;
} }
gmvFile << nl; gmvFile << nl;
} }
@ -65,9 +50,9 @@ forAll(lagrangianScalarNames, i)
forAll(lagrangianVectorNames, i) forAll(lagrangianVectorNames, i)
{ {
word name = lagrangianVectorNames[i]; const word name = lagrangianVectorNames[i];
IOField<vector> v IOField<vector> fld
( (
IOobject IOobject
( (
@ -80,29 +65,29 @@ forAll(lagrangianVectorNames, i)
) )
); );
if (v.size()) if (fld.size())
{ {
gmvFile << name + "x" << nl; gmvFile << name + "x" << nl;
for (label n = 0; n < v.size(); n++) forAll(fld, n)
{ {
gmvFile << v[n].x() << token::SPACE; gmvFile << fld[n].x() << token::SPACE;
} }
gmvFile << nl; gmvFile << nl;
gmvFile << name + "y" << nl; gmvFile << name + "y" << nl;
for (label n = 0; n < v.size(); n++) forAll(fld, n)
{ {
gmvFile << v[n].y() << token::SPACE; gmvFile << fld[n].y() << token::SPACE;
} }
gmvFile << nl; gmvFile << nl;
gmvFile << name + "z" << nl; gmvFile << name + "z" << nl;
for (label n = 0; n < v.size(); n++) forAll(fld, n)
{ {
gmvFile << v[n].z() << token::SPACE; gmvFile << fld[n].z() << token::SPACE;
} }
gmvFile << nl; gmvFile << nl;
} }

69
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputParcels.H
View File

@ -1,81 +1,48 @@
gmvFile << "tracers " << particles.size() << nl; gmvFile << "tracers " << particles.size() << nl;
for forAllConstIter(discretePhase, particles, iter)
(
discretePhase::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().x() << " "; gmvFile << iter().position().x() << " ";
} }
gmvFile << nl; gmvFile << nl;
for
( forAllConstIter(discretePhase, particles, iter)
discretePhase::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().y() << " "; gmvFile << iter().position().y() << " ";
} }
gmvFile << nl; gmvFile << nl;
for
( forAllConstIter(discretePhase, particles, iter)
discretePhase::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().z() << " "; gmvFile << iter().position().z() << " ";
} }
gmvFile << nl; gmvFile << nl;
gmvFile << "U" << nl; gmvFile << "U" << nl;
for forAllConstIter(discretePhase, particles, iter)
(
discretePhase::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().velocity().x() << " "; gmvFile << iter().velocity().x() << " ";
} }
gmvFile << nl; gmvFile << nl;
gmvFile << "V" << nl; gmvFile << "V" << nl;
for forAllConstIter(discretePhase, particles, iter)
(
discretePhase::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().velocity().y() << " "; gmvFile << iter().velocity().y() << " ";
} }
gmvFile << nl; gmvFile << nl;
gmvFile << "W" << nl; gmvFile << "W" << nl;
for forAllConstIter(discretePhase, particles, iter)
(
discretePhase::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().velocity().z() << " "; {
gmvFile << iter().velocity().z() << " ";
} }
gmvFile << nl; gmvFile << nl;
gmvFile << "Diam" << nl; gmvFile << "Diam" << nl;
forAllConstIter(discretePhase, particles, iter)
for
(
discretePhase::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().d() << " "; gmvFile << iter().d() << " ";
} }
gmvFile << "endtrace"<< nl; gmvFile << "endtrace"<< nl;

33
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputSpray.H
View File

@ -1,32 +1,19 @@
gmvFile << "tracers " << particles.size() << nl; gmvFile << "tracers " << particles.size() << nl;
for forAllConstIter(Cloud<passiveParticle>, particles, iter)
(
Cloud<passiveParticle>::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().x() << " "; gmvFile << iter().position().x() << " ";
} }
gmvFile << nl; gmvFile << nl;
for
( forAllConstIter(Cloud<passiveParticle>, particles, iter)
Cloud<passiveParticle>::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().y() << " "; gmvFile << iter().position().y() << " ";
} }
gmvFile << nl; gmvFile << nl;
for
( forAllConstIter(Cloud<passiveParticle>, particles, iter)
Cloud<passiveParticles>::iterator elmnt = particles.begin();
elmnt != particles.end();
++elmnt
)
{ {
gmvFile << elmnt().position().z() << " "; gmvFile << iter().position().z() << " ";
} }
gmvFile << nl; gmvFile << nl;
@ -51,15 +38,13 @@ forAll(lagrangianScalarNames, i)
{ {
gmvFile << name << nl; gmvFile << name << nl;
for (label n = 0; n < s.size(); n++) forAll(s, n)
{ {
gmvFile << s[n] << token::SPACE; gmvFile << s[n] << token::SPACE;
} }
gmvFile << nl; gmvFile << nl;
} }
} }
gmvFile << "endtrace"<< nl; gmvFile << "endtrace"<< nl;

5
applications/utilities/postProcessing/dataConversion/foamToGMV/gmvOutputTail.H
View File

@ -1,2 +1,3 @@
gmvFile << "probtime " << runTime.timeName() << nl; gmvFile
gmvFile << "endgmv" << nl; << "probtime " << runTime.timeName() << nl
<< "endgmv" << nl;

1
applications/utilities/postProcessing/dataConversion/foamToGMV/readConversionProperties.H
View File

@ -33,6 +33,7 @@ if ( (format != "ascii") && (format != "ieeei4r8") )
<< abort(FatalError); << abort(FatalError);
} }
word cells word cells
( (
conversionProperties.lookup("cells") conversionProperties.lookup("cells")

7
applications/utilities/postProcessing/dataConversion/foamToTecplot360/readFields.C
View File

@ -50,12 +50,7 @@ void readFields
label nFields = fields.size(); label nFields = fields.size();
fields.setSize(nFields + fieldObjects.size()); fields.setSize(nFields + fieldObjects.size());
for forAllIter(IOobjectList::iterator, fieldObjects, iter)
(
IOobjectList::iterator iter = fieldObjects.begin();
iter != fieldObjects.end();
++iter
)
{ {
if (selectedFields.empty() || selectedFields.found(iter()->name())) if (selectedFields.empty() || selectedFields.found(iter()->name()))
{ {

7
applications/utilities/postProcessing/dataConversion/foamToVTK/readFields.C
View File

@ -50,12 +50,7 @@ void readFields
fields.setSize(fieldObjects.size()); fields.setSize(fieldObjects.size());
label nFields = 0; label nFields = 0;
for forAllIter(IOobjectList, fieldObjects, iter)
(
IOobjectList::iterator iter = fieldObjects.begin();
iter != fieldObjects.end();
++iter
)
{ {
if (selectedFields.empty() || selectedFields.found(iter()->name())) if (selectedFields.empty() || selectedFields.found(iter()->name()))
{ {

17
applications/utilities/postProcessing/dataConversion/foamToVTK/writeFaceSet.C
View File

@ -27,14 +27,9 @@ License
#include "OFstream.H" #include "OFstream.H"
#include "writeFuns.H" #include "writeFuns.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
void writeFaceSet void Foam::writeFaceSet
( (
const bool binary, const bool binary,
const vtkMesh& vMesh, const vtkMesh& vMesh,
@ -73,12 +68,7 @@ void writeFaceSet
labelList setFaceLabels(set.size()); labelList setFaceLabels(set.size());
label setFaceI = 0; label setFaceI = 0;
for forAllConstIter(faceSet, set, iter)
(
faceSet::const_iterator iter = set.begin();
iter != set.end();
++iter
)
{ {
setFaceLabels[setFaceI] = iter.key(); setFaceLabels[setFaceI] = iter.key();
setFaces[setFaceI] = faces[iter.key()]; setFaces[setFaceI] = faces[iter.key()];
@ -139,8 +129,5 @@ void writeFaceSet
writeFuns::write(pStream, binary, setFaceLabels); writeFuns::write(pStream, binary, setFaceLabels);
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

14
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_coords.H
View File

@ -47,19 +47,13 @@ int USERD_get_part_coords
} }
else if (part_number == nPatches+2) else if (part_number == nPatches+2)
{ {
label indx = 1; label indx = 1;
for forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
(
Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
elmnt != sprayPtr->end();
++elmnt
)
{ {
coord_array[0][indx] = (float)elmnt().position().x(); coord_array[0][indx] = (float)iter().position().x();
coord_array[1][indx] = (float)elmnt().position().y(); coord_array[1][indx] = (float)iter().position().y();
coord_array[2][indx] = (float)elmnt().position().z(); coord_array[2][indx] = (float)iter().position().z();
indx++; indx++;
} }

8
applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_get_part_node_ids.H
View File

@ -35,12 +35,8 @@ int USERD_get_part_node_ids
else if (part_number == nPatches+2) else if (part_number == nPatches+2)
{ {
label indx = 0; label indx = 0;
for
( forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
elmnt != sprayPtr->end();
++elmnt
)
{ {
nodeid_array[indx] = indx + 1; nodeid_array[indx] = indx + 1;
indx++; indx++;

7
applications/utilities/preProcessing/mapFields/MapConsistentVolFields.H
View File

@ -52,12 +52,7 @@ void MapConsistentVolFields
IOobjectList fields = objects.lookupClass(fieldClassName); IOobjectList fields = objects.lookupClass(fieldClassName);
for forAllIter(IOobjectList, fields, fieldIter)
(
IOobjectList::iterator fieldIter = fields.begin();
fieldIter != fields.end();
++fieldIter
)
{ {
Info<< " interpolating " << fieldIter()->name() Info<< " interpolating " << fieldIter()->name()
<< endl; << endl;

7
applications/utilities/preProcessing/mapFields/MapVolFields.H
View File

@ -52,12 +52,7 @@ void MapVolFields
IOobjectList fields = objects.lookupClass(fieldClassName); IOobjectList fields = objects.lookupClass(fieldClassName);
for forAllIter(IOobjectList, fields, fieldIter)
(
IOobjectList::iterator fieldIter = fields.begin();
fieldIter != fields.end();
++fieldIter
)
{ {
IOobject fieldTargetIOobject IOobject fieldTargetIOobject
( (

9
applications/utilities/preProcessing/mapFields/UnMapped.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. \\ / A nd | Copyright (C) 1991-2010 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -39,12 +39,7 @@ void UnMapped(const IOobjectList& objects)
{ {
IOobjectList fields = objects.lookupClass(Type::typeName); IOobjectList fields = objects.lookupClass(Type::typeName);
for forAllConstIter(IOobjectList, fields, fieldIter)
(
IOobjectList::iterator fieldIter = fields.begin();
fieldIter != fields.end();
++fieldIter
)
{ {
mvBak(fieldIter()->objectPath(), "unmapped"); mvBak(fieldIter()->objectPath(), "unmapped");
} }

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

@ -126,12 +126,7 @@ void dumpFaces
OFstream os(fName); OFstream os(fName);
for forAllConstIter(Map<label>, connectedFaces, iter)
(
Map<label>::const_iterator iter = connectedFaces.begin();
iter != connectedFaces.end();
++iter
)
{ {
const labelledTri& f = surf.localFaces()[iter.key()]; const labelledTri& f = surf.localFaces()[iter.key()];
@ -502,14 +497,9 @@ void calcPointVecs
boolList edgeDone(surf.nEdges(), false); boolList edgeDone(surf.nEdges(), false);
for forAllConstIter(Map<label>, faceToEdge, iter)
(
Map<label>::const_iterator iter = faceToEdge.begin();
iter != faceToEdge.end();
++iter
)
{ {
label edgeI = iter(); const label edgeI = iter();
if (!edgeDone[edgeI]) if (!edgeDone[edgeI])
{ {
@ -610,15 +600,9 @@ void renumberFaces
List<labelledTri>& newTris List<labelledTri>& newTris
) )
{ {
for forAllConstIter(Map<label>, faceToEdge, iter)
(
Map<label>::const_iterator iter = faceToEdge.begin();
iter != faceToEdge.end();
++iter
)
{ {
label faceI = iter.key(); const label faceI = iter.key();
const labelledTri& f = surf.localFaces()[faceI]; const labelledTri& f = surf.localFaces()[faceI];
forAll(f, fp) forAll(f, fp)

11
applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
View File

@ -51,7 +51,6 @@ int main(int argc, char *argv[])
{ {
# include "setRootCase.H" # include "setRootCase.H"
# include "createTime.H" # include "createTime.H"
Info<< nl << "Reading Burcat data IOdictionary" << endl; Info<< nl << "Reading Burcat data IOdictionary" << endl;
@ -119,17 +118,11 @@ int main(int argc, char *argv[])
); );
for forAllConstIter(SLPtrList<thermo>, EQreactions, iter)
(
SLPtrList<thermo>::iterator EQreactionsIter = EQreactions.begin();
EQreactionsIter != EQreactions.end();
++EQreactionsIter
)
{ {
Info<< "Kc(EQreactions) = " << EQreactionsIter().Kc(T) << endl; Info<< "Kc(EQreactions) = " << iter().Kc(T) << endl;
} }
Info<< nl << "end" << endl; Info<< nl << "end" << endl;
return 0; return 0;

14
src/OpenFOAM/db/IOobjectList/IOobjectList.C
View File

@ -152,12 +152,7 @@ Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& ClassName) const
{ {
IOobjectList objectsOfClass(size()); IOobjectList objectsOfClass(size());
for forAllConstIter(HashPtrTable<IOobject>, *this, iter)
(
HashPtrTable<IOobject>::const_iterator iter = begin();
iter != end();
++iter
)
{ {
if (iter()->headerClassName() == ClassName) if (iter()->headerClassName() == ClassName)
{ {
@ -192,12 +187,7 @@ Foam::wordList Foam::IOobjectList::names(const word& ClassName) const
wordList objectNames(size()); wordList objectNames(size());
label count = 0; label count = 0;
for forAllConstIter(HashPtrTable<IOobject>, *this, iter)
(
HashPtrTable<IOobject>::const_iterator iter = begin();
iter != end();
++iter
)
{ {
if (iter()->headerClassName() == ClassName) if (iter()->headerClassName() == ClassName)
{ {

7
src/OpenFOAM/graph/graph.C
View File

@ -193,12 +193,7 @@ void graph::writeTable(Ostream& os) const
{ {
os << setw(10) << x_[xi]; os << setw(10) << x_[xi];
for forAllConstIter(graph, *this, iter)
(
graph::const_iterator iter = begin();
iter != end();
++iter
)
{ {
os << token::SPACE << setw(10) << (*iter())[xi]; os << token::SPACE << setw(10) << (*iter())[xi];
} }

4
src/OpenFOAM/graph/writers/gnuplotGraph/gnuplotGraph.C
View File

@ -51,7 +51,7 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
bool firstField = true; bool firstField = true;
for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter) forAllConstIter(graph, g, iter)
{ {
if (!firstField) if (!firstField)
{ {
@ -64,7 +64,7 @@ void Foam::gnuplotGraph::write(const graph& g, Ostream& os) const
os << "; pause -1" << endl; os << "; pause -1" << endl;
for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter) forAllConstIter(graph, g, iter)
{ {
os << endl; os << endl;
writeXY(g.x(), *iter(), os); writeXY(g.x(), *iter(), os);

4
src/OpenFOAM/graph/writers/jplotGraph/jplotGraph.C
View File

@ -41,12 +41,12 @@ namespace Foam
void Foam::jplotGraph::write(const graph& g, Ostream& os) const void Foam::jplotGraph::write(const graph& g, Ostream& os) const
{ {
os << "# JPlot file" << endl os << "# JPlot file" << nl
<< "# column 1: " << g.xName() << endl; << "# column 1: " << g.xName() << endl;
label fieldI = 0; label fieldI = 0;
for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter) forAllConstIter(graph, g, iter)
{ {
os << "# column " << fieldI + 2 << ": " << (*iter()).name() << endl; os << "# column " << fieldI + 2 << ": " << (*iter()).name() << endl;
fieldI++; fieldI++;

10
src/OpenFOAM/graph/writers/xmgrGraph/xmgrGraph.C
View File

@ -42,17 +42,17 @@ namespace Foam
void Foam::xmgrGraph::write(const graph& g, Ostream& os) const void Foam::xmgrGraph::write(const graph& g, Ostream& os) const
{ {
os << "@title " << g.title() << endl os << "@title " << g.title() << nl
<< "@xaxis label " << g.xName() << endl << "@xaxis label " << g.xName() << nl
<< "@yaxis label " << g.yName() << endl; << "@yaxis label " << g.yName() << endl;
label fieldI = 0; label fieldI = 0;
for (graph::const_iterator iter = g.begin(); iter != g.end(); ++iter) forAllConstIter(graph, g, iter)
{ {
os << "@s" << fieldI << " legend " os << "@s" << fieldI << " legend "
<< iter()->name() << endl << iter()->name() << nl
<< "@target G0.S" << fieldI << endl << "@target G0.S" << fieldI << nl
<< "@type xy" << endl; << "@type xy" << endl;
writeXY(g.x(), *iter(), os); writeXY(g.x(), *iter(), os);

14
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
View File

@ -163,12 +163,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
{ {
faceCells_[nCoarseFaces] = contents[masterI]; faceCells_[nCoarseFaces] = contents[masterI];
for forAllIter(SLList<label>, faceFacesIter(), facesIter)
(
SLList<label>::iterator facesIter = faceFacesIter().begin();
facesIter != faceFacesIter().end();
++facesIter
)
{ {
faceRestrictAddressing_[facesIter()] = nCoarseFaces; faceRestrictAddressing_[facesIter()] = nCoarseFaces;
} }
@ -197,12 +192,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
{ {
faceCells_[nCoarseFaces] = nbrsIter(); faceCells_[nCoarseFaces] = nbrsIter();
for forAllIter(SLList<label>, faceFacesIter(), facesIter)
(
SLList<label>::iterator facesIter = faceFacesIter().begin();
facesIter != faceFacesIter().end();
++facesIter
)
{ {
faceRestrictAddressing_[facesIter() + sizeBy2] = nCoarseFaces; faceRestrictAddressing_[facesIter() + sizeBy2] = nCoarseFaces;
} }

14
src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
View File

@ -180,12 +180,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
{ {
faceCells_[nCoarseFaces] = contents[masterI]; faceCells_[nCoarseFaces] = contents[masterI];
for forAllIter(SLList<label>, faceFacesIter(), facesIter)
(
SLList<label>::iterator facesIter = faceFacesIter().begin();
facesIter != faceFacesIter().end();
++facesIter
)
{ {
faceRestrictAddressing_[facesIter()] = nCoarseFaces; faceRestrictAddressing_[facesIter()] = nCoarseFaces;
} }
@ -218,12 +213,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
{ {
faceCells_[nCoarseFaces] = nbrsIter(); faceCells_[nCoarseFaces] = nbrsIter();
for forAllIter(SLList<label>, faceFacesIter(), facesIter)
(
SLList<label>::iterator facesIter = faceFacesIter().begin();
facesIter != faceFacesIter().end();
++facesIter
)
{ {
faceRestrictAddressing_[facesIter()] = nCoarseFaces; faceRestrictAddressing_[facesIter()] = nCoarseFaces;
} }

9
src/OpenFOAM/meshes/meshShapes/cellMatcher/cellMatcher.C
View File

@ -123,14 +123,9 @@ Foam::label Foam::cellMatcher::calcLocalFaces
} }
// Create local to global vertex mapping // Create local to global vertex mapping
for forAllConstIter(Map<label>, localPoint_, iter)
(
Map<label>::iterator iter = localPoint_.begin();
iter != localPoint_.end();
++iter
)
{ {
label fp = iter(); const label fp = iter();
pointMap_[fp] = iter.key(); pointMap_[fp] = iter.key();
} }

7
src/OpenFOAM/meshes/polyMesh/polyPatches/basic/generic/genericPolyPatch.C
View File

@ -123,12 +123,7 @@ void Foam::genericPolyPatch::write(Ostream& os) const
os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl; os.writeKeyword("nFaces") << size() << token::END_STATEMENT << nl;
os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl; os.writeKeyword("startFace") << start() << token::END_STATEMENT << nl;
for forAllConstIter(dictionary, dict_, iter)
(
dictionary::const_iterator iter = dict_.begin();
iter != dict_.end();
++iter
)
{ {
if if
( (

18
src/OpenFOAM/meshes/primitiveMesh/PrimitivePatch/PrimitivePatchPointAddressing.C
View File

@ -83,14 +83,9 @@ calcPointEdges() const
pe[pointI].setSize(pointEdges[pointI].size()); pe[pointI].setSize(pointEdges[pointI].size());
label i = 0; label i = 0;
for forAllIter(SLList<label>, pointEdges[pointI], curEdgesIter)
(
SLList<label>::iterator curEdgesIter = pointEdges[pointI].begin();
curEdgesIter != pointEdges[pointI].end();
++curEdgesIter, ++i
)
{ {
pe[pointI][i] = curEdgesIter(); pe[pointI][i++] = curEdgesIter();
} }
} }
@ -158,14 +153,9 @@ calcPointFaces() const
pf[pointI].setSize(pointFcs[pointI].size()); pf[pointI].setSize(pointFcs[pointI].size());
label i = 0; label i = 0;
for forAllIter(SLList<label>, pointFcs[pointI], curFacesIter)
(
SLList<label>::iterator curFacesIter = pointFcs[pointI].begin();
curFacesIter != pointFcs[pointI].end();
++curFacesIter, ++i
)
{ {
pf[pointI][i] = curFacesIter(); pf[pointI][i++] = curFacesIter();
} }
} }

32
src/dynamicMesh/meshCut/edgeVertex/edgeVertex.C
View File

@ -68,12 +68,7 @@ void Foam::edgeVertex::updateLabels
// Iterate over map to see if anything changed // Iterate over map to see if anything changed
bool changed = false; bool changed = false;
for forAllConstIter(Map<label>, cellPairs, iter)
(
Map<label>::const_iterator iter = cellPairs.begin();
iter != cellPairs.end();
++iter
)
{ {
label newMaster = map[iter.key()]; label newMaster = map[iter.key()];
@ -97,12 +92,7 @@ void Foam::edgeVertex::updateLabels
{ {
Map<label> newCellPairs(2*cellPairs.size()); Map<label> newCellPairs(2*cellPairs.size());
for forAllConstIter(Map<label>, cellPairs, iter)
(
Map<label>::const_iterator iter = cellPairs.begin();
iter != cellPairs.end();
++iter
)
{ {
label newMaster = map[iter.key()]; label newMaster = map[iter.key()];
@ -144,14 +134,9 @@ void Foam::edgeVertex::updateLabels
// Iterate over map to see if anything changed // Iterate over map to see if anything changed
bool changed = false; bool changed = false;
for forAllConstIter(labelHashSet, cells, iter)
(
labelHashSet::const_iterator iter = cells.begin();
iter != cells.end();
++iter
)
{ {
label newCellI = map[iter.key()]; const label newCellI = map[iter.key()];
if (newCellI != iter.key()) if (newCellI != iter.key())
{ {
@ -166,14 +151,9 @@ void Foam::edgeVertex::updateLabels
{ {
labelHashSet newCells(2*cells.size()); labelHashSet newCells(2*cells.size());
for forAllConstIter(labelHashSet, cells, iter)
(
labelHashSet::const_iterator iter = cells.begin();
iter != cells.end();
++iter
)
{ {
label newCellI = map[iter.key()]; const label newCellI = map[iter.key()];
if (newCellI != -1) if (newCellI != -1)
{ {

15
src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
View File

@ -887,12 +887,7 @@ void Foam::meshCutAndRemove::setRefinement
const Map<edge>& faceSplitCuts = cuts.faceSplitCut(); const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
for forAllConstIter(Map<edge>, faceSplitCuts, iter)
(
Map<edge>::const_iterator iter = faceSplitCuts.begin();
iter != faceSplitCuts.end();
++iter
)
{ {
label faceI = iter.key(); label faceI = iter.key();
@ -1310,15 +1305,9 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
{ {
Map<label> newAddedFaces(addedFaces_.size()); Map<label> newAddedFaces(addedFaces_.size());
for forAllConstIter(Map<label>, addedFaces_, iter)
(
Map<label>::const_iterator iter = addedFaces_.begin();
iter != addedFaces_.end();
++iter
)
{ {
label cellI = iter.key(); label cellI = iter.key();
label newCellI = map.reverseCellMap()[cellI]; label newCellI = map.reverseCellMap()[cellI];
label addedFaceI = iter(); label addedFaceI = iter();

23
src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
View File

@ -737,12 +737,7 @@ void Foam::meshCutter::setRefinement
const Map<edge>& faceSplitCuts = cuts.faceSplitCut(); const Map<edge>& faceSplitCuts = cuts.faceSplitCut();
for forAllConstIter(Map<edge>, faceSplitCuts, iter)
(
Map<edge>::const_iterator iter = faceSplitCuts.begin();
iter != faceSplitCuts.end();
++iter
)
{ {
label faceI = iter.key(); label faceI = iter.key();
@ -1015,15 +1010,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
// key. // key.
Map<label> newAddedCells(addedCells_.size()); Map<label> newAddedCells(addedCells_.size());
for forAllConstIter(Map<label>, addedCells_, iter)
(
Map<label>::const_iterator iter = addedCells_.begin();
iter != addedCells_.end();
++iter
)
{ {
label cellI = iter.key(); label cellI = iter.key();
label newCellI = morphMap.reverseCellMap()[cellI]; label newCellI = morphMap.reverseCellMap()[cellI];
label addedCellI = iter(); label addedCellI = iter();
@ -1054,15 +1043,9 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
{ {
Map<label> newAddedFaces(addedFaces_.size()); Map<label> newAddedFaces(addedFaces_.size());
for forAllConstIter(Map<label>, addedFaces_, iter)
(
Map<label>::const_iterator iter = addedFaces_.begin();
iter != addedFaces_.end();
++iter
)
{ {
label cellI = iter.key(); label cellI = iter.key();
label newCellI = morphMap.reverseCellMap()[cellI]; label newCellI = morphMap.reverseCellMap()[cellI];
label addedFaceI = iter(); label addedFaceI = iter();

32
src/dynamicMesh/meshCut/meshModifiers/multiDirRefinement/multiDirRefinement.C
View File

@ -40,10 +40,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam defineTypeNameAndDebug(Foam::multiDirRefinement, 0);
{
defineTypeNameAndDebug(multiDirRefinement, 0);
}
// * * * * * * * * * * * * * Private Statc Functions * * * * * * * * * * * * // // * * * * * * * * * * * * * Private Statc Functions * * * * * * * * * * * * //
@ -93,12 +90,7 @@ void Foam::multiDirRefinement::update
{ {
field.setSize(field.size() + splitMap.size()); field.setSize(field.size() + splitMap.size());
for forAllConstIter(Map<label>, splitMap, iter)
(
Map<label>::const_iterator iter = splitMap.begin();
iter != splitMap.end();
++iter
)
{ {
field[iter()] = field[iter.key()]; field[iter()] = field[iter.key()];
} }
@ -116,12 +108,7 @@ void Foam::multiDirRefinement::addCells
labels.setSize(labels.size() + splitMap.size()); labels.setSize(labels.size() + splitMap.size());
for forAllConstIter(Map<label>, splitMap, iter)
(
Map<label>::const_iterator iter = splitMap.begin();
iter != splitMap.end();
++iter
)
{ {
labels[newCellI++] = iter(); labels[newCellI++] = iter();
} }
@ -165,12 +152,7 @@ void Foam::multiDirRefinement::addCells
} }
for forAllConstIter(Map<label>, splitMap, iter)
(
Map<label>::const_iterator iter = splitMap.begin();
iter != splitMap.end();
++iter
)
{ {
label masterI = iter.key(); label masterI = iter.key();
label newCellI = iter(); label newCellI = iter();
@ -307,7 +289,7 @@ void Foam::multiDirRefinement::refineHex8
// Increment count // Increment count
forAll(consistentCells, i) forAll(consistentCells, i)
{ {
label cellI = consistentCells[i]; const label cellI = consistentCells[i];
Map<label>::iterator iter = hexCellSet.find(cellI); Map<label>::iterator iter = hexCellSet.find(cellI);
@ -380,7 +362,7 @@ void Foam::multiDirRefinement::refineHex8
forAll(cellMap, cellI) forAll(cellMap, cellI)
{ {
label oldCellI = cellMap[cellI]; const label oldCellI = cellMap[cellI];
if (addedCells_[oldCellI].size()) if (addedCells_[oldCellI].size())
{ {
@ -439,7 +421,7 @@ void Foam::multiDirRefinement::refineAllDirs
// Non uniform directions. // Non uniform directions.
forAll(refCells, refI) forAll(refCells, refI)
{ {
label cellI = cellLabels_[refI]; const label cellI = cellLabels_[refI];
refCells[refI] = refineCell(cellI, dirField[cellI]); refCells[refI] = refineCell(cellI, dirField[cellI]);
} }

14
src/dynamicMesh/meshCut/meshModifiers/refinementIterator/refinementIterator.C
View File

@ -36,12 +36,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam defineTypeNameAndDebug(Foam::refinementIterator, 0);
{
defineTypeNameAndDebug(refinementIterator, 0);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
@ -212,12 +207,7 @@ Foam::Map<Foam::label> Foam::refinementIterator::setRefinement
// from meshRefiner.updateMesh call) and add to global list of added // from meshRefiner.updateMesh call) and add to global list of added
const Map<label>& addedNow = meshRefiner_.addedCells(); const Map<label>& addedNow = meshRefiner_.addedCells();
for forAllConstIter(Map<label>, addedNow, iter)
(
Map<label>::const_iterator iter = addedNow.begin();
iter != addedNow.end();
++iter
)
{ {
if (!addedCells.insert(iter.key(), iter())) if (!addedCells.insert(iter.key(), iter()))
{ {

13
src/dynamicMesh/meshCut/meshModifiers/undoableMeshCutter/undoableMeshCutter.C
View File

@ -36,10 +36,8 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam defineTypeNameAndDebug(Foam::undoableMeshCutter, 0);
{
defineTypeNameAndDebug(undoableMeshCutter, 0);
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -67,12 +65,7 @@ void Foam::undoableMeshCutter::printCellRefTree
// For debugging // For debugging
void Foam::undoableMeshCutter::printRefTree(Ostream& os) const void Foam::undoableMeshCutter::printRefTree(Ostream& os) const
{ {
for forAllConstIter(Map<splitCell*>, liveSplitCells_, iter)
(
Map<splitCell*>::const_iterator iter = liveSplitCells_.begin();
iter != liveSplitCells_.end();
++iter
)
{ {
const splitCell* splitPtr = iter(); const splitCell* splitPtr = iter();

10
src/dynamicMesh/perfectInterface/perfectInterface.C
View File

@ -299,15 +299,9 @@ void Foam::perfectInterface::setRefinement
// 2. Renumber (non patch0/1) faces. // 2. Renumber (non patch0/1) faces.
for forAllConstIter(labelHashSet, affectedFaces, iter)
(
labelHashSet::const_iterator iter = affectedFaces.begin();
iter != affectedFaces.end();
++iter
)
{ {
label faceI = iter.key(); const label faceI = iter.key();
const face& f = mesh.faces()[faceI]; const face& f = mesh.faces()[faceI];
face newFace(f.size()); face newFace(f.size());

14
src/dynamicMesh/polyTopoChange/polyTopoChange/faceCollapser.C
View File

@ -462,12 +462,7 @@ void Foam::faceCollapser::setRefinement
} }
} }
for forAllConstIter(Map<labelList>, splitEdges, iter)
(
Map<labelList>::const_iterator iter = splitEdges.begin();
iter != splitEdges.end();
++iter
)
{ {
Pout<< "Split edge:" << iter.key() Pout<< "Split edge:" << iter.key()
<< " verts:" << mesh_.edges()[iter.key()] << " verts:" << mesh_.edges()[iter.key()]
@ -500,12 +495,7 @@ void Foam::faceCollapser::setRefinement
// Modify faces affected (but not removed) // Modify faces affected (but not removed)
// //
for forAllConstIter(labelHashSet, affectedFaces, iter)
(
labelHashSet::const_iterator iter = affectedFaces.begin();
iter != affectedFaces.end();
++iter
)
{ {
filterFace(splitEdges, iter.key(), meshMod); filterFace(splitEdges, iter.key(), meshMod);
} }

7
src/dynamicMesh/setUpdater/setUpdaterTemplates.C
View File

@ -82,12 +82,7 @@ void setUpdater::updateSets(const mapPolyMesh& morphMap) const
IOobjectList fileSets(Objects.lookupClass(Type::typeName)); IOobjectList fileSets(Objects.lookupClass(Type::typeName));
for forAllConstIter(IOobjectList, fileSets, iter)
(
IOobjectList::const_iterator iter = fileSets.begin();
iter != fileSets.end();
++iter
)
{ {
if (!memSets.found(iter.key())) if (!memSets.found(iter.key()))
{ {

18
src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
View File

@ -28,20 +28,18 @@ License
#include "fvcMeshPhi.H" #include "fvcMeshPhi.H"
#include "surfaceInterpolate.H" #include "surfaceInterpolate.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(layeredEngineMesh, 0); defineTypeNameAndDebug(layeredEngineMesh, 0);
addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject); addToRunTimeSelectionTable(engineMesh, layeredEngineMesh, IOobject);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
layeredEngineMesh::layeredEngineMesh(const IOobject& io) Foam::layeredEngineMesh::layeredEngineMesh(const IOobject& io)
: :
engineMesh(io), engineMesh(io),
pistonLayers_("pistonLayers", dimLength, 0.0) pistonLayers_("pistonLayers", dimLength, 0.0)
@ -55,13 +53,13 @@ layeredEngineMesh::layeredEngineMesh(const IOobject& io)
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
layeredEngineMesh::~layeredEngineMesh() Foam::layeredEngineMesh::~layeredEngineMesh()
{} {}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void layeredEngineMesh::move() void Foam::layeredEngineMesh::move()
{ {
scalar deltaZ = engineDB_.pistonDisplacement().value(); scalar deltaZ = engineDB_.pistonDisplacement().value();
Info<< "deltaZ = " << deltaZ << endl; Info<< "deltaZ = " << deltaZ << endl;
@ -127,8 +125,4 @@ void layeredEngineMesh::move()
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

5
src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresVectors.C
View File

@ -29,10 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam defineTypeNameAndDebug(Foam::extendedLeastSquaresVectors, 0);
{
defineTypeNameAndDebug(extendedLeastSquaresVectors, 0);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

5
src/finiteVolume/finiteVolume/gradSchemes/leastSquaresGrad/leastSquaresVectors.C
View File

@ -29,10 +29,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam defineTypeNameAndDebug(Foam::leastSquaresVectors, 0);
{
defineTypeNameAndDebug(leastSquaresVectors, 0);
}
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //

21
src/finiteVolume/fvMesh/fvBoundaryMesh/fvBoundaryMesh.C
View File

@ -27,14 +27,9 @@ License
#include "fvBoundaryMesh.H" #include "fvBoundaryMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry) void Foam::fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
{ {
setSize(basicBdry.size()); setSize(basicBdry.size());
@ -50,7 +45,7 @@ void fvBoundaryMesh::addPatches(const polyBoundaryMesh& basicBdry)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
fvBoundaryMesh::fvBoundaryMesh Foam::fvBoundaryMesh::fvBoundaryMesh
( (
const fvMesh& m const fvMesh& m
) )
@ -60,7 +55,7 @@ fvBoundaryMesh::fvBoundaryMesh
{} {}
fvBoundaryMesh::fvBoundaryMesh Foam::fvBoundaryMesh::fvBoundaryMesh
( (
const fvMesh& m, const fvMesh& m,
const polyBoundaryMesh& basicBdry const polyBoundaryMesh& basicBdry
@ -75,7 +70,7 @@ fvBoundaryMesh::fvBoundaryMesh
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void fvBoundaryMesh::movePoints() void Foam::fvBoundaryMesh::movePoints()
{ {
forAll(*this, patchi) forAll(*this, patchi)
{ {
@ -89,7 +84,7 @@ void fvBoundaryMesh::movePoints()
} }
lduInterfacePtrsList fvBoundaryMesh::interfaces() const Foam::lduInterfacePtrsList Foam::fvBoundaryMesh::interfaces() const
{ {
lduInterfacePtrsList interfaces(size()); lduInterfacePtrsList interfaces(size());
@ -109,15 +104,11 @@ lduInterfacePtrsList fvBoundaryMesh::interfaces() const
} }
void fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry) void Foam::fvBoundaryMesh::readUpdate(const polyBoundaryMesh& basicBdry)
{ {
clear(); clear();
addPatches(basicBdry); addPatches(basicBdry);
} }
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //

143
src/genericPatchFields/genericFvPatchField/genericFvPatchField.C
View File

@ -81,12 +81,7 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
<< exit(FatalIOError); << exit(FatalIOError);
} }
for forAllConstIter(dictionary, dict_, iter)
(
dictionary::const_iterator iter = dict_.begin();
iter != dict_.end();
++iter
)
{ {
if (iter().keyword() != "type" && iter().keyword() != "value") if (iter().keyword() != "type" && iter().keyword() != "value")
{ {
@ -459,34 +454,31 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
actualTypeName_(ptf.actualTypeName_), actualTypeName_(ptf.actualTypeName_),
dict_(ptf.dict_) dict_(ptf.dict_)
{ {
for forAllConstIter
( (
HashPtrTable<scalarField>::const_iterator iter = HashPtrTable<scalarField>,
ptf.scalarFields_.begin(); ptf.scalarFields_,
iter != ptf.scalarFields_.end(); iter
++iter
) )
{ {
scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper)); scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
} }
for forAllConstIter
( (
HashPtrTable<vectorField>::const_iterator iter = HashPtrTable<vectorField>,
ptf.vectorFields_.begin(); ptf.vectorFields_,
iter != ptf.vectorFields_.end(); iter
++iter
) )
{ {
vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper)); vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
} }
for forAllConstIter
( (
HashPtrTable<sphericalTensorField>::const_iterator iter = HashPtrTable<sphericalTensorField>,
ptf.sphericalTensorFields_.begin(); ptf.sphericalTensorFields_,
iter != ptf.sphericalTensorFields_.end(); iter
++iter
) )
{ {
sphericalTensorFields_.insert sphericalTensorFields_.insert
@ -496,12 +488,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
); );
} }
for forAllConstIter
( (
HashPtrTable<symmTensorField>::const_iterator iter = HashPtrTable<symmTensorField>,
ptf.symmTensorFields_.begin(); ptf.symmTensorFields_,
iter != ptf.symmTensorFields_.end(); iter
++iter
) )
{ {
symmTensorFields_.insert symmTensorFields_.insert
@ -511,12 +502,11 @@ Foam::genericFvPatchField<Type>::genericFvPatchField
); );
} }
for forAllConstIter
( (
HashPtrTable<tensorField>::const_iterator iter = HashPtrTable<tensorField>,
ptf.tensorFields_.begin(); ptf.tensorFields_,
iter != ptf.tensorFields_.end(); iter
++iter
) )
{ {
tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper)); tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
@ -569,53 +559,51 @@ void Foam::genericFvPatchField<Type>::autoMap
{ {
calculatedFvPatchField<Type>::autoMap(m); calculatedFvPatchField<Type>::autoMap(m);
for forAllIter
( (
HashPtrTable<scalarField>::iterator iter = scalarFields_.begin(); HashPtrTable<scalarField>,
iter != scalarFields_.end(); scalarFields_,
++iter iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<vectorField>::iterator iter = vectorFields_.begin(); HashPtrTable<vectorField>,
iter != vectorFields_.end(); vectorFields_,
++iter iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<sphericalTensorField>::iterator iter = HashPtrTable<sphericalTensorField>,
sphericalTensorFields_.begin(); sphericalTensorFields_,
iter != sphericalTensorFields_.end(); iter
++iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<symmTensorField>::iterator iter = HashPtrTable<symmTensorField>,
symmTensorFields_.begin(); symmTensorFields_,
iter != symmTensorFields_.end(); iter
++iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<tensorField>::iterator iter = tensorFields_.begin(); HashPtrTable<tensorField>,
iter != tensorFields_.end(); tensorFields_,
++iter iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
@ -635,11 +623,11 @@ void Foam::genericFvPatchField<Type>::rmap
const genericFvPatchField<Type>& dptf = const genericFvPatchField<Type>& dptf =
refCast<const genericFvPatchField<Type> >(ptf); refCast<const genericFvPatchField<Type> >(ptf);
for forAllIter
( (
HashPtrTable<scalarField>::iterator iter = scalarFields_.begin(); HashPtrTable<scalarField>,
iter != scalarFields_.end(); scalarFields_,
++iter iter
) )
{ {
HashPtrTable<scalarField>::const_iterator dptfIter = HashPtrTable<scalarField>::const_iterator dptfIter =
@ -651,11 +639,11 @@ void Foam::genericFvPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<vectorField>::iterator iter = vectorFields_.begin(); HashPtrTable<vectorField>,
iter != vectorFields_.end(); vectorFields_,
++iter iter
) )
{ {
HashPtrTable<vectorField>::const_iterator dptfIter = HashPtrTable<vectorField>::const_iterator dptfIter =
@ -667,12 +655,11 @@ void Foam::genericFvPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<sphericalTensorField>::iterator iter = HashPtrTable<sphericalTensorField>,
sphericalTensorFields_.begin(); sphericalTensorFields_,
iter != sphericalTensorFields_.end(); iter
++iter
) )
{ {
HashPtrTable<sphericalTensorField>::const_iterator dptfIter = HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@ -684,12 +671,11 @@ void Foam::genericFvPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<symmTensorField>::iterator iter = HashPtrTable<symmTensorField>,
symmTensorFields_.begin(); symmTensorFields_,
iter != symmTensorFields_.end(); iter
++iter
) )
{ {
HashPtrTable<symmTensorField>::const_iterator dptfIter = HashPtrTable<symmTensorField>::const_iterator dptfIter =
@ -701,11 +687,11 @@ void Foam::genericFvPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<tensorField>::iterator iter = tensorFields_.begin(); HashPtrTable<tensorField>,
iter != tensorFields_.end(); tensorFields_,
++iter iter
) )
{ {
HashPtrTable<tensorField>::const_iterator dptfIter = HashPtrTable<tensorField>::const_iterator dptfIter =
@ -817,12 +803,7 @@ void Foam::genericFvPatchField<Type>::write(Ostream& os) const
{ {
os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl; os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
for forAllConstIter(dictionary, dict_, iter)
(
dictionary::const_iterator iter = dict_.begin();
iter != dict_.end();
++iter
)
{ {
if (iter().keyword() != "type" && iter().keyword() != "value") if (iter().keyword() != "type" && iter().keyword() != "value")
{ {

141
src/genericPatchFields/genericPointPatchField/genericPointPatchField.C
View File

@ -62,12 +62,7 @@ genericPointPatchField<Type>::genericPointPatchField
actualTypeName_(dict.lookup("type")), actualTypeName_(dict.lookup("type")),
dict_(dict) dict_(dict)
{ {
for forAllConstIter(dictionary, dict_, iter)
(
dictionary::const_iterator iter = dict_.begin();
iter != dict_.end();
++iter
)
{ {
if (iter().keyword() != "type") if (iter().keyword() != "type")
{ {
@ -357,34 +352,21 @@ genericPointPatchField<Type>::genericPointPatchField
actualTypeName_(ptf.actualTypeName_), actualTypeName_(ptf.actualTypeName_),
dict_(ptf.dict_) dict_(ptf.dict_)
{ {
for forAllConstIter(HashPtrTable<scalarField>, ptf.scalarFields_, iter)
(
HashPtrTable<scalarField>::const_iterator iter =
ptf.scalarFields_.begin();
iter != ptf.scalarFields_.end();
++iter
)
{ {
scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper)); scalarFields_.insert(iter.key(), new scalarField(*iter(), mapper));
} }
for forAllConstIter(HashPtrTable<vectorField>, ptf.vectorFields_, iter)
(
HashPtrTable<vectorField>::const_iterator iter =
ptf.vectorFields_.begin();
iter != ptf.vectorFields_.end();
++iter
)
{ {
vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper)); vectorFields_.insert(iter.key(), new vectorField(*iter(), mapper));
} }
for forAllConstIter
( (
HashPtrTable<sphericalTensorField>::const_iterator iter = HashPtrTable<sphericalTensorField>,
ptf.sphericalTensorFields_.begin(); ptf.sphericalTensorFields_,
iter != ptf.sphericalTensorFields_.end(); iter
++iter
) )
{ {
sphericalTensorFields_.insert sphericalTensorFields_.insert
@ -394,12 +376,11 @@ genericPointPatchField<Type>::genericPointPatchField
); );
} }
for forAllConstIter
( (
HashPtrTable<symmTensorField>::const_iterator iter = HashPtrTable<symmTensorField>,
ptf.symmTensorFields_.begin(); ptf.symmTensorFields_,
iter != ptf.symmTensorFields_.end(); iter
++iter
) )
{ {
symmTensorFields_.insert symmTensorFields_.insert
@ -409,12 +390,11 @@ genericPointPatchField<Type>::genericPointPatchField
); );
} }
for forAllConstIter
( (
HashPtrTable<tensorField>::const_iterator iter = HashPtrTable<tensorField>,
ptf.tensorFields_.begin(); ptf.tensorFields_,
iter != ptf.tensorFields_.end(); iter
++iter
) )
{ {
tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper)); tensorFields_.insert(iter.key(), new tensorField(*iter(), mapper));
@ -448,53 +428,51 @@ void genericPointPatchField<Type>::autoMap
const pointPatchFieldMapper& m const pointPatchFieldMapper& m
) )
{ {
for forAllIter
( (
HashPtrTable<scalarField>::iterator iter = scalarFields_.begin(); HashPtrTable<scalarField>,
iter != scalarFields_.end(); scalarFields_,
++iter iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<vectorField>::iterator iter = vectorFields_.begin(); HashPtrTable<vectorField>,
iter != vectorFields_.end(); vectorFields_,
++iter iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<sphericalTensorField>::iterator iter = HashPtrTable<sphericalTensorField>,
sphericalTensorFields_.begin(); sphericalTensorFields_,
iter != sphericalTensorFields_.end(); iter
++iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<symmTensorField>::iterator iter = HashPtrTable<symmTensorField>,
symmTensorFields_.begin(); symmTensorFields_,
iter != symmTensorFields_.end(); iter
++iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
} }
for forAllIter
( (
HashPtrTable<tensorField>::iterator iter = tensorFields_.begin(); HashPtrTable<tensorField>,
iter != tensorFields_.end(); tensorFields_,
++iter iter
) )
{ {
iter()->autoMap(m); iter()->autoMap(m);
@ -512,11 +490,11 @@ void genericPointPatchField<Type>::rmap
const genericPointPatchField<Type>& dptf = const genericPointPatchField<Type>& dptf =
refCast<const genericPointPatchField<Type> >(ptf); refCast<const genericPointPatchField<Type> >(ptf);
for forAllIter
( (
HashPtrTable<scalarField>::iterator iter = scalarFields_.begin(); HashPtrTable<scalarField>,
iter != scalarFields_.end(); scalarFields_,
++iter iter
) )
{ {
HashPtrTable<scalarField>::const_iterator dptfIter = HashPtrTable<scalarField>::const_iterator dptfIter =
@ -528,11 +506,11 @@ void genericPointPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<vectorField>::iterator iter = vectorFields_.begin(); HashPtrTable<vectorField>,
iter != vectorFields_.end(); vectorFields_,
++iter iter
) )
{ {
HashPtrTable<vectorField>::const_iterator dptfIter = HashPtrTable<vectorField>::const_iterator dptfIter =
@ -544,12 +522,11 @@ void genericPointPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<sphericalTensorField>::iterator iter = HashPtrTable<sphericalTensorField>,
sphericalTensorFields_.begin(); sphericalTensorFields_,
iter != sphericalTensorFields_.end(); iter
++iter
) )
{ {
HashPtrTable<sphericalTensorField>::const_iterator dptfIter = HashPtrTable<sphericalTensorField>::const_iterator dptfIter =
@ -561,12 +538,11 @@ void genericPointPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<symmTensorField>::iterator iter = HashPtrTable<symmTensorField>,
symmTensorFields_.begin(); symmTensorFields_,
iter != symmTensorFields_.end(); iter
++iter
) )
{ {
HashPtrTable<symmTensorField>::const_iterator dptfIter = HashPtrTable<symmTensorField>::const_iterator dptfIter =
@ -578,11 +554,11 @@ void genericPointPatchField<Type>::rmap
} }
} }
for forAllIter
( (
HashPtrTable<tensorField>::iterator iter = tensorFields_.begin(); HashPtrTable<tensorField>,
iter != tensorFields_.end(); tensorFields_,
++iter iter
) )
{ {
HashPtrTable<tensorField>::const_iterator dptfIter = HashPtrTable<tensorField>::const_iterator dptfIter =
@ -601,12 +577,7 @@ void genericPointPatchField<Type>::write(Ostream& os) const
{ {
os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl; os.writeKeyword("type") << actualTypeName_ << token::END_STATEMENT << nl;
for forAllConstIter(dictionary, dict_, iter)
(
dictionary::const_iterator iter = dict_.begin();
iter != dict_.end();
++iter
)
{ {
if (iter().keyword() != "type") if (iter().keyword() != "type")
{ {

103
src/lagrangian/dieselSpray/spray/sprayFunctions.C
View File

@ -93,14 +93,9 @@ scalar spray::liquidMass() const
{ {
scalar sum = 0.0; scalar sum = 0.0;
for forAllConstIter(spray, *this, iter)
(
spray::const_iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
sum += elmnt().m(); sum += iter().m();
} }
if (twoD()) if (twoD())
@ -119,30 +114,25 @@ scalar spray::liquidEnthalpy() const
scalar sum = 0.0; scalar sum = 0.0;
label Nf = fuels().components().size(); label Nf = fuels().components().size();
for forAllConstIter(spray, *this, iter)
(
spray::const_iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
scalar T = elmnt().T(); scalar T = iter().T();
scalar pc = p()[elmnt().cell()]; scalar pc = p()[iter().cell()];
scalar hlat = fuels().hl(pc, T, elmnt().X()); scalar hlat = fuels().hl(pc, T, iter().X());
scalar hg = 0.0; scalar hg = 0.0;
scalar Wl = fuels().W(elmnt().X()); scalar Wl = fuels().W(iter().X());
for (label j=0; j<Nf; j++) for (label j=0; j<Nf; j++)
{ {
label k = liquidToGasIndex_[j]; label k = liquidToGasIndex_[j];
hg += hg +=
gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j] gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
/Wl; /Wl;
} }
scalar h = hg - hlat; scalar h = hg - hlat;
sum += elmnt().m()*h; sum += iter().m()*h;
} }
if (twoD()) if (twoD())
@ -161,33 +151,28 @@ scalar spray::liquidTotalEnthalpy() const
scalar sum = 0.0; scalar sum = 0.0;
label Nf = fuels().components().size(); label Nf = fuels().components().size();
for forAllConstIter(spray, *this, iter)
(
spray::const_iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
label celli = elmnt().cell(); label celli = iter().cell();
scalar T = elmnt().T(); scalar T = iter().T();
scalar pc = p()[celli]; scalar pc = p()[celli];
scalar rho = fuels().rho(pc, T, elmnt().X()); scalar rho = fuels().rho(pc, T, iter().X());
scalar hlat = fuels().hl(pc, T, elmnt().X()); scalar hlat = fuels().hl(pc, T, iter().X());
scalar hg = 0.0; scalar hg = 0.0;
scalar Wl = fuels().W(elmnt().X()); scalar Wl = fuels().W(iter().X());
for (label j=0; j<Nf; j++) for (label j=0; j<Nf; j++)
{ {
label k = liquidToGasIndex_[j]; label k = liquidToGasIndex_[j];
hg += hg +=
gasProperties()[k].H(T)*gasProperties()[k].W()*elmnt().X()[j] gasProperties()[k].H(T)*gasProperties()[k].W()*iter().X()[j]
/Wl; /Wl;
} }
scalar psat = fuels().pv(pc, T, elmnt().X()); scalar psat = fuels().pv(pc, T, iter().X());
scalar h = hg - hlat + (pc - psat)/rho; scalar h = hg - hlat + (pc - psat)/rho;
sum += elmnt().m()*h; sum += iter().m()*h;
} }
if (twoD()) if (twoD())
@ -204,15 +189,11 @@ scalar spray::liquidTotalEnthalpy() const
scalar spray::liquidKineticEnergy() const scalar spray::liquidKineticEnergy() const
{ {
scalar sum = 0.0; scalar sum = 0.0;
for
( forAllConstIter(spray, *this, iter)
spray::const_iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
scalar ke = pow(mag(elmnt().U()), 2.0); const scalar ke = pow(mag(iter().U()), 2.0);
sum += elmnt().m()*ke; sum += iter().m()*ke;
} }
if (twoD()) if (twoD())
@ -286,13 +267,13 @@ scalar spray::liquidPenetration
for for
( (
spray::const_iterator elmnt = ++first; spray::const_iterator iter = ++first;
elmnt != end(); iter != end();
++elmnt ++iter
) )
{ {
scalar de = mag(elmnt().position() - ip); scalar de = mag(iter().position() - ip);
scalar me = elmnt().m(); scalar me = iter().m();
mTot += me; mTot += me;
n++; n++;
@ -357,8 +338,8 @@ scalar spray::liquidPenetration
{ {
if (Np > 0) if (Np > 0)
{ {
spray::const_iterator elmnt = begin(); spray::const_iterator iter = begin();
d = mag(elmnt().position() - ip); d = mag(iter().position() - ip);
} }
} }
@ -372,20 +353,15 @@ scalar spray::smd() const
{ {
scalar numerator = 0.0, denominator = VSMALL; scalar numerator = 0.0, denominator = VSMALL;
for forAllConstIter(spray, *this, iter)
(
spray::const_iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
label celli = elmnt().cell(); label celli = iter().cell();
scalar Pc = p()[celli]; scalar Pc = p()[celli];
scalar T = elmnt().T(); scalar T = iter().T();
scalar rho = fuels_->rho(Pc, T, elmnt().X()); scalar rho = fuels_->rho(Pc, T, iter().X());
scalar tmp = elmnt().N(rho)*pow(elmnt().d(), 2.0); scalar tmp = iter().N(rho)*pow(iter().d(), 2.0);
numerator += tmp*elmnt().d(); numerator += tmp*iter().d();
denominator += tmp; denominator += tmp;
} }
@ -400,14 +376,9 @@ scalar spray::maxD() const
{ {
scalar maxD = 0.0; scalar maxD = 0.0;
for forAllConstIter(spray, *this, iter)
(
spray::const_iterator elmnt = begin();
elmnt != end();
++elmnt
)
{ {
maxD = max(maxD, elmnt().d()); maxD = max(maxD, iter().d());
} }
reduce(maxD, maxOp<scalar>()); reduce(maxD, maxOp<scalar>());

19
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/gradientDispersionRAS/gradientDispersionRAS.C
View File

@ -74,20 +74,15 @@ void Foam::gradientDispersionRAS::disperseParcels() const
const volScalarField& epsilon = turbulence().epsilon(); const volScalarField& epsilon = turbulence().epsilon();
const volVectorField& U = spray_.U(); const volVectorField& U = spray_.U();
for forAllIter(spray, spray_, elmnt)
(
spray::iterator elmnt = spray_.begin();
elmnt != spray_.end();
++elmnt
)
{ {
label celli = elmnt().cell(); const label cellI = elmnt().cell();
scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb()); scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
scalar Tturb = min scalar Tturb = min
( (
k[celli]/epsilon[celli], k[cellI]/epsilon[cellI],
cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL) cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
); );
// parcel is perturbed by the turbulence // parcel is perturbed by the turbulence
if (dt < Tturb) if (dt < Tturb)
@ -98,8 +93,8 @@ void Foam::gradientDispersionRAS::disperseParcels() const
{ {
elmnt().tTurb() = 0.0; elmnt().tTurb() = 0.0;
scalar sigma = sqrt(2.0*k[celli]/3.0); scalar sigma = sqrt(2.0*k[cellI]/3.0);
vector dir = -gradk[celli]/(mag(gradk[celli]) + SMALL); vector dir = -gradk[cellI]/(mag(gradk[cellI]) + SMALL);
// numerical recipes... Ch. 7. Random Numbers... // numerical recipes... Ch. 7. Random Numbers...
scalar x1 = 0.0; scalar x1 = 0.0;

17
src/lagrangian/dieselSpray/spraySubModels/dispersionModel/stochasticDispersionRAS/stochasticDispersionRAS.C
View File

@ -75,20 +75,15 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
const volScalarField& epsilon = turbulence().epsilon(); const volScalarField& epsilon = turbulence().epsilon();
const volVectorField& U = spray_.U(); const volVectorField& U = spray_.U();
for forAllIter(spray, spray_, elmnt)
(
spray::iterator elmnt = spray_.begin();
elmnt != spray_.end();
++elmnt
)
{ {
label celli = elmnt().cell(); const label cellI = elmnt().cell();
scalar UrelMag = mag(elmnt().U() - U[celli] - elmnt().Uturb()); scalar UrelMag = mag(elmnt().U() - U[cellI] - elmnt().Uturb());
scalar Tturb = min scalar Tturb = min
( (
k[celli]/epsilon[celli], k[cellI]/epsilon[cellI],
cps*pow(k[celli], 1.5)/epsilon[celli]/(UrelMag + SMALL) cps*pow(k[cellI], 1.5)/epsilon[cellI]/(UrelMag + SMALL)
); );
// parcel is perturbed by the turbulence // parcel is perturbed by the turbulence
@ -100,7 +95,7 @@ void Foam::stochasticDispersionRAS::disperseParcels() const
{ {
elmnt().tTurb() = 0.0; elmnt().tTurb() = 0.0;
scalar sigma = sqrt(2.0*k[celli]/3.0); scalar sigma = sqrt(2.0*k[cellI]/3.0);
vector dir = 2.0*spray_.rndGen().vector01() - one; vector dir = 2.0*spray_.rndGen().vector01() - one;
dir /= mag(dir) + SMALL; dir /= mag(dir) + SMALL;

33
src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
View File

@ -25,20 +25,14 @@ License
if (mesh.time().timeIndex() % vacf.sampleSteps() == 0) if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
{ {
IDLList<molecule>::iterator mol(molecules.begin());
Field<vector> uVals(molecules.size()); Field<vector> uVals(molecules.size());
label uV = 0; label uV = 0;
for // or forAllConstIter
( forAllIter(IDLList<molecule>, molecules, mol)
mol = molecules.begin();
mol != molecules.end();
++mol, uV++
)
{ {
uVals[uV] = mol().U(); uVals[uV++] = mol().U();
} }
vacf.calculateCorrelationFunction(uVals); vacf.calculateCorrelationFunction(uVals);
@ -46,16 +40,10 @@ if (mesh.time().timeIndex() % vacf.sampleSteps() == 0)
if (mesh.time().timeIndex() % pacf.sampleSteps() == 0) if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
{ {
IDLList<molecule>::iterator mol(molecules.begin());
vector p = vector::zero; vector p = vector::zero;
for // or forAllConstIter
( forAllIter(IDLList<molecule>, molecules, mol)
mol = molecules.begin();
mol != molecules.end();
++mol
)
{ {
p.x() += p.x() +=
mol().mass() * mol().U().y() * mol().U().z() mol().mass() * mol().U().y() * mol().U().z()
@ -75,17 +63,10 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0) if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
{ {
IDLList<molecule>::iterator mol(molecules.begin());
vector s = vector::zero; vector s = vector::zero;
for // or forAllConstIter
( forAllIter(IDLList<molecule>, molecules, mol)
mol = molecules.begin();
mol != molecules.end();
++mol
)
{ {
s += s +=
( (

6
src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
View File

@ -54,11 +54,9 @@ label singleStepNMols = molecules.size();
label singleStepDOFs = 0; label singleStepDOFs = 0;
{ {
IDLList<molecule>::iterator mol(molecules.begin());
for for
( (
mol = molecules.begin(); IDLList<molecule>::iterator mol = molecules.begin();
mol != molecules.end(); mol != molecules.end();
++mol ++mol
) )
@ -79,7 +77,7 @@ label singleStepDOFs = 0;
for for
( (
mol = molecules.begin(); IDLList<molecule>::iterator mol = molecules.begin();
mol != molecules.end(); mol != molecules.end();
++mol ++mol
) )

20
src/meshTools/cellClassification/cellClassification.C
View File

@ -36,10 +36,7 @@ License
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
namespace Foam defineTypeNameAndDebug(Foam::cellClassification, 0);
{
defineTypeNameAndDebug(cellClassification, 0);
}
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -829,15 +826,10 @@ Foam::label Foam::cellClassification::fillRegionPoints
label nChanged = 0; label nChanged = 0;
for forAllConstIter(labelHashSet, nonManifoldPoints, iter)
(
labelHashSet::const_iterator iter = nonManifoldPoints.begin();
iter != nonManifoldPoints.end();
++iter
)
{ {
// Find a face on fp using point and remove it. // Find a face on fp using point and remove it.
label patchPointI = meshPointMap[iter.key()]; const label patchPointI = meshPointMap[iter.key()];
const labelList& pFaces = fp.pointFaces()[patchPointI]; const labelList& pFaces = fp.pointFaces()[patchPointI];
@ -846,16 +838,14 @@ Foam::label Foam::cellClassification::fillRegionPoints
// one would be best to remove. // one would be best to remove.
forAll(pFaces, i) forAll(pFaces, i)
{ {
label patchFaceI = pFaces[i]; const label patchFaceI = pFaces[i];
const label ownerCell = outsideOwner[patchFaceI];
label ownerCell = outsideOwner[patchFaceI];
if (operator[](ownerCell) == meshType) if (operator[](ownerCell) == meshType)
{ {
operator[](ownerCell) = fillType; operator[](ownerCell) = fillType;
nChanged++; nChanged++;
break; break;
} }
} }

34
src/meshTools/sets/cellSources/faceToCell/faceToCell.C
View File

@ -73,18 +73,13 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
// Handle owner/neighbour/any selection // Handle owner/neighbour/any selection
for forAllConstIter(faceSet, loadedSet, iter)
(
faceSet::const_iterator iter = loadedSet.begin();
iter != loadedSet.end();
++iter
)
{ {
label faceI = iter.key(); const label faceI = iter.key();
if ((option_ == OWNER) || (option_ == ANY)) if ((option_ == OWNER) || (option_ == ANY))
{ {
label cellI = mesh_.faceOwner()[faceI]; const label cellI = mesh_.faceOwner()[faceI];
addOrDelete(set, cellI, add); addOrDelete(set, cellI, add);
} }
@ -93,7 +88,7 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
{ {
if ((option_ == NEIGHBOUR) || (option_ == ANY)) if ((option_ == NEIGHBOUR) || (option_ == ANY))
{ {
label cellI = mesh_.faceNeighbour()[faceI]; const label cellI = mesh_.faceNeighbour()[faceI];
addOrDelete(set, cellI, add); addOrDelete(set, cellI, add);
} }
@ -107,16 +102,10 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
Map<label> facesPerCell(loadedSet.size()); Map<label> facesPerCell(loadedSet.size());
for forAllConstIter(faceSet, loadedSet, iter)
(
faceSet::const_iterator iter = loadedSet.begin();
iter != loadedSet.end();
++iter
)
{ {
label faceI = iter.key(); const label faceI = iter.key();
const label own = mesh_.faceOwner()[faceI];
label own = mesh_.faceOwner()[faceI];
Map<label>::iterator fndOwn = facesPerCell.find(own); Map<label>::iterator fndOwn = facesPerCell.find(own);
@ -148,14 +137,9 @@ void Foam::faceToCell::combine(topoSet& set, const bool add) const
// Include cells that are referenced as many times as they have faces // Include cells that are referenced as many times as they have faces
// -> all faces in set. // -> all faces in set.
for forAllConstIter(Map<label>, facesPerCell, iter)
(
Map<label>::const_iterator iter = facesPerCell.begin();
iter != facesPerCell.end();
++iter
)
{ {
label cellI = iter.key(); const label cellI = iter.key();
if (iter() == mesh_.cells()[cellI].size()) if (iter() == mesh_.cells()[cellI].size())
{ {

10
src/meshTools/sets/cellSources/pointToCell/pointToCell.C
View File

@ -72,15 +72,9 @@ void Foam::pointToCell::combine(topoSet& set, const bool add) const
// Handle any selection // Handle any selection
if (option_ == ANY) if (option_ == ANY)
{ {
for forAllConstIter(pointSet, loadedSet, iter)
(
pointSet::const_iterator iter = loadedSet.begin();
iter != loadedSet.end();
++iter
)
{ {
label pointI = iter.key(); const label pointI = iter.key();
const labelList& pCells = mesh_.pointCells()[pointI]; const labelList& pCells = mesh_.pointCells()[pointI];
forAll(pCells, pCellI) forAll(pCells, pCellI)

12
src/meshTools/sets/faceSources/cellToFace/cellToFace.C
View File

@ -79,15 +79,9 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
if (option_ == ALL) if (option_ == ALL)
{ {
// Add all faces from cell // Add all faces from cell
for forAllConstIter(cellSet, loadedSet, iter)
(
cellSet::const_iterator iter = loadedSet.begin();
iter != loadedSet.end();
++iter
)
{ {
label cellI = iter.key(); const label cellI = iter.key();
const labelList& cFaces = mesh_.cells()[cellI]; const labelList& cFaces = mesh_.cells()[cellI];
forAll(cFaces, cFaceI) forAll(cFaces, cFaceI)
@ -100,7 +94,7 @@ void Foam::cellToFace::combine(topoSet& set, const bool add) const
{ {
// Add all faces whose both neighbours are in set. // Add all faces whose both neighbours are in set.
label nInt = mesh_.nInternalFaces(); const label nInt = mesh_.nInternalFaces();
const labelList& own = mesh_.faceOwner(); const labelList& own = mesh_.faceOwner();
const labelList& nei = mesh_.faceNeighbour(); const labelList& nei = mesh_.faceNeighbour();
const polyBoundaryMesh& patches = mesh_.boundaryMesh(); const polyBoundaryMesh& patches = mesh_.boundaryMesh();

24
src/meshTools/sets/faceSources/pointToFace/pointToFace.C
View File

@ -73,15 +73,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
if (option_ == ANY) if (option_ == ANY)
{ {
// Add faces with any point in loadedSet // Add faces with any point in loadedSet
for forAllConstIter(pointSet, loadedSet, iter)
(
pointSet::const_iterator iter = loadedSet.begin();
iter != loadedSet.end();
++iter
)
{ {
label pointI = iter.key(); const label pointI = iter.key();
const labelList& pFaces = mesh_.pointFaces()[pointI]; const labelList& pFaces = mesh_.pointFaces()[pointI];
forAll(pFaces, pFaceI) forAll(pFaces, pFaceI)
@ -99,13 +93,12 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
forAllConstIter(pointSet, loadedSet, iter) forAllConstIter(pointSet, loadedSet, iter)
{ {
label pointI = iter.key(); const label pointI = iter.key();
const labelList& pFaces = mesh_.pointFaces()[pointI]; const labelList& pFaces = mesh_.pointFaces()[pointI];
forAll(pFaces, pFaceI) forAll(pFaces, pFaceI)
{ {
label faceI = pFaces[pFaceI]; const label faceI = pFaces[pFaceI];
Map<label>::iterator fndFace = numPoints.find(faceI); Map<label>::iterator fndFace = numPoints.find(faceI);
@ -123,14 +116,9 @@ void Foam::pointToFace::combine(topoSet& set, const bool add) const
// Include faces that are referenced as many times as there are points // Include faces that are referenced as many times as there are points
// in face -> all points of face // in face -> all points of face
for forAllConstIter(Map<label>, numPoints, iter)
(
Map<label>::const_iterator iter = numPoints.begin();
iter != numPoints.end();
++iter
)
{ {
label faceI = iter.key(); const label faceI = iter.key();
if (iter() == mesh_.faces()[faceI].size()) if (iter() == mesh_.faces()[faceI].size())
{ {

10
src/meshTools/sets/pointSources/cellToPoint/cellToPoint.C
View File

@ -68,15 +68,9 @@ void Foam::cellToPoint::combine(topoSet& set, const bool add) const
cellSet loadedSet(mesh_, setName_); cellSet loadedSet(mesh_, setName_);
// Add all point from cells in loadedSet // Add all point from cells in loadedSet
for forAllConstIter(cellSet, loadedSet, iter)
(
cellSet::const_iterator iter = loadedSet.begin();
iter != loadedSet.end();
++iter
)
{ {
label cellI = iter.key(); const label cellI = iter.key();
const labelList& cFaces = mesh_.cells()[cellI]; const labelList& cFaces = mesh_.cells()[cellI];
forAll(cFaces, cFaceI) forAll(cFaces, cFaceI)

7
src/meshTools/sets/pointSources/faceToPoint/faceToPoint.C
View File

@ -68,12 +68,7 @@ void Foam::faceToPoint::combine(topoSet& set, const bool add) const
faceSet loadedSet(mesh_, setName_); faceSet loadedSet(mesh_, setName_);
// Add all points from faces in loadedSet // Add all points from faces in loadedSet
for forAllConstIter(faceSet, loadedSet, iter)
(
faceSet::const_iterator iter = loadedSet.begin();
iter != loadedSet.end();
++iter
)
{ {
const face& f = mesh_.faces()[iter.key()]; const face& f = mesh_.faces()[iter.key()];

54
src/meshTools/sets/topoSets/topoSet.C
View File

@ -154,12 +154,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
// Iterate over map to see if anything changed // Iterate over map to see if anything changed
bool changed = false; bool changed = false;
for forAllConstIter(labelHashSet, *this, iter)
(
labelHashSet::const_iterator iter = begin();
iter != end();
++iter
)
{ {
if ((iter.key() < 0) || (iter.key() > map.size())) if ((iter.key() < 0) || (iter.key() > map.size()))
{ {
@ -172,7 +167,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
<< abort(FatalError); << abort(FatalError);
} }
label newCellI = map[iter.key()]; const label newCellI = map[iter.key()];
if (newCellI != iter.key()) if (newCellI != iter.key())
{ {
@ -187,14 +182,9 @@ void topoSet::topoSet::updateLabels(const labelList& map)
{ {
labelHashSet newSet(2*size()); labelHashSet newSet(2*size());
for forAllConstIter(labelHashSet, *this, iter)
(
labelHashSet::const_iterator iter = begin();
iter != end();
++iter
)
{ {
label newCellI = map[iter.key()]; const label newCellI = map[iter.key()];
if (newCellI >= 0) if (newCellI >= 0)
{ {
@ -209,12 +199,7 @@ void topoSet::topoSet::updateLabels(const labelList& map)
void topoSet::topoSet::check(const label maxLabel) void topoSet::topoSet::check(const label maxLabel)
{ {
for forAllConstIter(topoSet, *this, iter)
(
topoSet::const_iterator iter = begin();
iter != end();
++iter
)
{ {
if ((iter.key() < 0) || (iter.key() > maxLabel)) if ((iter.key() < 0) || (iter.key() > maxLabel))
{ {
@ -309,9 +294,7 @@ void topoSet::writeDebug
writeDebug(os, coords, halfLen, iter, n); writeDebug(os, coords, halfLen, iter, n);
os<< endl os << nl << " .." << nl << endl;
<< " .." << endl
<< endl;
for (; n < size() - halfLen; ++n) for (; n < size() - halfLen; ++n)
{ {
@ -505,12 +488,7 @@ void topoSet::subset(const topoSet& set)
clear(); clear();
resize(2*min(currentSet.size(), set.size())); resize(2*min(currentSet.size(), set.size()));
for forAllConstIter(labelHashSet, currentSet, iter)
(
labelHashSet::const_iterator iter = currentSet.begin();
iter != currentSet.end();
++iter
)
{ {
if (set.found(iter.key())) if (set.found(iter.key()))
{ {
@ -523,12 +501,7 @@ void topoSet::subset(const topoSet& set)
void topoSet::addSet(const topoSet& set) void topoSet::addSet(const topoSet& set)
{ {
for forAllConstIter(topoSet, set, iter)
(
topoSet::const_iterator iter = set.begin();
iter != set.end();
++iter
)
{ {
insert(iter.key()); insert(iter.key());
} }
@ -537,12 +510,7 @@ void topoSet::addSet(const topoSet& set)
void topoSet::deleteSet(const topoSet& set) void topoSet::deleteSet(const topoSet& set)
{ {
for forAllConstIter(topoSet, set, iter)
(
topoSet::const_iterator iter = set.begin();
iter != set.end();
++iter
)
{ {
erase(iter.key()); erase(iter.key());
} }
@ -574,9 +542,7 @@ void topoSet::writeDebug(Ostream& os, const label maxLen) const
writeDebug(os, halfLen, iter, n); writeDebug(os, halfLen, iter, n);
os<< endl os << nl << " .." << nl << endl;
<< " .." << endl
<< endl;
for (; n < size() - halfLen; ++n) for (; n < size() - halfLen; ++n)
{ {

24
src/meshTools/surfaceSets/surfaceSets.C
View File

@ -121,12 +121,7 @@ License
// // Snap outside points to surface // // Snap outside points to surface
// pointField newPoints(points); // pointField newPoints(points);
// //
// for // forAllConstIter(labelHashSet, flatCandidates, iter)
// (
// labelHashSet::const_iterator iter = flatCandidates.begin();
// iter != flatCandidates.end();
// ++iter
// )
// { // {
// const cell& cFaces = cells[iter.key()]; // const cell& cFaces = cells[iter.key()];
// //
@ -152,12 +147,7 @@ License
// //
// // Calculate new volume for mixed cells // // Calculate new volume for mixed cells
// label nRemoved = 0; // label nRemoved = 0;
// for // forAllConstIter(labelHashSet, flatCandidates, iter)
// (
// labelHashSet::const_iterator iter = flatCandidates.begin();
// iter != flatCandidates.end();
// ++iter
// )
// { // {
// label cellI = iter.key(); // label cellI = iter.key();
// //
@ -404,15 +394,9 @@ Foam::labelHashSet Foam::surfaceSets::getHangingCells
labelHashSet mixedOnlyCells(internalCells.size()); labelHashSet mixedOnlyCells(internalCells.size());
for forAllConstIter(labelHashSet, internalCells, iter)
(
labelHashSet::const_iterator iter = internalCells.begin();
iter != internalCells.end();
++iter
)
{ {
label cellI = iter.key(); const label cellI = iter.key();
const cell& cFaces = cells[cellI]; const cell& cFaces = cells[cellI];
label usesMixedOnly = true; label usesMixedOnly = true;

9
src/meshTools/triSurface/booleanOps/intersectedSurface/edgeSurface.C
View File

@ -255,15 +255,10 @@ Foam::edgeSurface::edgeSurface
// Add intersection edges to faceEdges // Add intersection edges to faceEdges
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
for forAllConstIter(labelPairLookup, inter.facePairToEdge(), iter)
(
labelPairLookup::const_iterator iter = inter.facePairToEdge().begin();
iter != inter.facePairToEdge().end();
++iter
)
{ {
// Edge label in intersection // Edge label in intersection
label edgeI = iter(); const label edgeI = iter();
// Get the face from the correct surface // Get the face from the correct surface
const FixedList<label, 2>& twoFaces = iter.key(); const FixedList<label, 2>& twoFaces = iter.key();

25
src/meshTools/triSurface/surfaceFeatures/surfaceFeatures.C
View File

@ -826,12 +826,7 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
OFstream objStream("nearestSamples.obj"); OFstream objStream("nearestSamples.obj");
label vertI = 0; label vertI = 0;
for forAllConstIter(Map<label>, nearest, iter)
(
Map<label>::const_iterator iter = nearest.begin();
iter != nearest.end();
++iter
)
{ {
meshTools::writeOBJ(objStream, samples[iter.key()]); vertI++; meshTools::writeOBJ(objStream, samples[iter.key()]); vertI++;
meshTools::writeOBJ(objStream, surfPoints[iter()]); vertI++; meshTools::writeOBJ(objStream, surfPoints[iter()]); vertI++;
@ -957,14 +952,9 @@ Foam::Map<Foam::label> Foam::surfaceFeatures::nearestSamples
OFstream objStream("nearestEdges.obj"); OFstream objStream("nearestEdges.obj");
label vertI = 0; label vertI = 0;
for forAllConstIter(Map<label>, nearest, iter)
(
Map<label>::const_iterator iter = nearest.begin();
iter != nearest.end();
++iter
)
{ {
label sampleI = iter.key(); const label sampleI = iter.key();
meshTools::writeOBJ(objStream, samples[sampleI]); vertI++; meshTools::writeOBJ(objStream, samples[sampleI]); vertI++;
@ -1119,14 +1109,9 @@ Foam::Map<Foam::pointIndexHit> Foam::surfaceFeatures::nearestEdges
OFstream objStream("nearestEdges.obj"); OFstream objStream("nearestEdges.obj");
label vertI = 0; label vertI = 0;
for forAllConstIter(Map<pointIndexHit>, nearest, iter)
(
Map<pointIndexHit>::const_iterator iter = nearest.begin();
iter != nearest.end();
++iter
)
{ {
label sampleEdgeI = iter.key(); const label sampleEdgeI = iter.key();
const edge& sampleEdge = sampleEdges[sampleEdgeI]; const edge& sampleEdge = sampleEdges[sampleEdgeI];

43
src/meshTools/triSurface/triSurfaceTools/triSurfaceTools.C
View File

@ -2341,17 +2341,10 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
label newPatchI = 0; label newPatchI = 0;
for forAllConstIter(labelHashSet, includePatches, iter)
(
labelHashSet::const_iterator iter = includePatches.begin();
iter != includePatches.end();
++iter
)
{ {
label patchI = iter.key(); const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI]; const polyPatch& patch = bMesh[patchI];
const pointField& points = patch.points(); const pointField& points = patch.points();
label nTriTotal = 0; label nTriTotal = 0;
@ -2402,19 +2395,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulate
newPatchI = 0; newPatchI = 0;
for forAllConstIter(labelHashSet, includePatches, iter)
(
labelHashSet::const_iterator iter = includePatches.begin();
iter != includePatches.end();
++iter
)
{ {
label patchI = iter.key(); const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI]; const polyPatch& patch = bMesh[patchI];
surface.patches()[newPatchI].name() = patch.name(); surface.patches()[newPatchI].name() = patch.name();
surface.patches()[newPatchI].geometricType() = patch.type(); surface.patches()[newPatchI].geometricType() = patch.type();
newPatchI++; newPatchI++;
@ -2460,15 +2446,9 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
label newPatchI = 0; label newPatchI = 0;
for forAllConstIter(labelHashSet, includePatches, iter)
(
labelHashSet::const_iterator iter = includePatches.begin();
iter != includePatches.end();
++iter
)
{ {
label patchI = iter.key(); const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI]; const polyPatch& patch = bMesh[patchI];
label nTriTotal = 0; label nTriTotal = 0;
@ -2518,19 +2498,12 @@ Foam::triSurface Foam::triSurfaceTools::triangulateFaceCentre
newPatchI = 0; newPatchI = 0;
for forAllConstIter(labelHashSet, includePatches, iter)
(
labelHashSet::const_iterator iter = includePatches.begin();
iter != includePatches.end();
++iter
)
{ {
label patchI = iter.key(); const label patchI = iter.key();
const polyPatch& patch = bMesh[patchI]; const polyPatch& patch = bMesh[patchI];
surface.patches()[newPatchI].name() = patch.name(); surface.patches()[newPatchI].name() = patch.name();
surface.patches()[newPatchI].geometricType() = patch.type(); surface.patches()[newPatchI].geometricType() = patch.type();
newPatchI++; newPatchI++;

7
src/triSurface/triSurface/interfaces/OBJ/readOBJ.C
View File

@ -173,12 +173,7 @@ bool triSurface::readOBJ(const fileName& OBJfileName)
} }
else else
{ {
for forAllConstIter(HashTable<label>, groupToPatch, iter)
(
HashTable<label>::const_iterator iter = groupToPatch.begin();
iter != groupToPatch.end();
++iter
)
{ {
patches[iter()] = geometricSurfacePatch patches[iter()] = geometricSurfacePatch
( (

7
src/triSurface/triSurface/interfaces/TRI/readTRI.C
View File

@ -136,12 +136,7 @@ bool triSurface::readTRI(const fileName& TRIfileName)
pointField rawPoints(STLpoints.size()); pointField rawPoints(STLpoints.size());
label i = 0; label i = 0;
for forAllIter(SLList<STLpoint>, STLpoints, iter)
(
SLList<STLpoint>::iterator iter = STLpoints.begin();
iter != STLpoints.end();
++iter
)
{ {
rawPoints[i++] = *iter; rawPoints[i++] = *iter;
} }