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

Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

Browse Source 
Conflicts:
	src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
	src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C
	src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C
This commit is contained in:
mattijs
2010-04-13 11:07:19 +01:00
parent 130dfe7dc6 9544796a98
commit defea5836e
960 changed files with 4013 additions and 5378 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());
for
(
labelHashSet::const_iterator iter = cutCells.begin();
iter != cutCells.end();
++iter
)
forAllConstIter(labelHashSet, cutCells, iter)
{
label cellI = iter.key();
const label cellI = iter.key();
const labelList& cFaces = mesh.cells()[cellI];
forAll(cFaces, i)
{
label faceI = cFaces[i];
const label faceI = cFaces[i];
if (mesh.isInternalFace(faceI))
{
@ -331,12 +325,7 @@ void addCutNeighbours
Info<< " Selected an additional " << addCutFaces.size()
<< " neighbours of cutCells to refine" << endl;
for
(
labelHashSet::const_iterator iter = addCutFaces.begin();
iter != addCutFaces.end();
++iter
)
forAllConstIter(labelHashSet, addCutFaces, iter)
{
cutCells.insert(iter.key());
}
@ -386,21 +375,15 @@ bool limitRefinementLevel
labelHashSet addCutCells(cutCells.size());
for
(
labelHashSet::const_iterator iter = cutCells.begin();
iter != cutCells.end();
++iter
)
forAllConstIter(labelHashSet, cutCells, iter)
{
// cellI will be refined.
label cellI = iter.key();
const label cellI = iter.key();
const labelList& cCells = mesh.cellCells()[cellI];
forAll(cCells, i)
{
label nbr = cCells[i];
const label nbr = cCells[i];
if (!excludeCells.found(nbr) && !cutCells.found(nbr))
{
@ -419,12 +402,8 @@ bool limitRefinementLevel
Info<< "Added an additional " << addCutCells.size() << " cells"
<< " to satisfy 1:" << limitDiff << " refinement level"
<< endl;
for
(
labelHashSet::const_iterator iter = addCutCells.begin();
iter != addCutCells.end();
++iter
)
forAllConstIter(labelHashSet, addCutCells, iter)
{
cutCells.insert(iter.key());
}

5
applications/utilities/mesh/advanced/modifyMesh/cellSplitter.H
View File

@ -108,9 +108,8 @@ public:
cellSplitter(const polyMesh& mesh);
// Destructor
~cellSplitter();
//- Destructor
~cellSplitter();
// Member Functions

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()
<< nl << endl;
for
(
cellSet::const_iterator iter = cells.begin();
iter != cells.end();
++iter
)
forAllConstIter(cellSet, cells, iter)
{
cutCells.erase(iter.key());
}
@ -131,7 +126,7 @@ int main(int argc, char *argv[])
forAll(meshPoints, pointI)
{
label meshPointI = meshPoints[pointI];
const label meshPointI = meshPoints[pointI];
vertOnPatch[meshPointI] = true;
}
@ -151,8 +146,7 @@ int main(int argc, char *argv[])
forAll(pEdges, pEdgeI)
{
label edgeI = pEdges[pEdgeI];
const label edgeI = pEdges[pEdgeI];
const edge& e = mesh.edges()[edgeI];
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);
scalarField edgeWeight(mesh.nEdges(), -GREAT);
for
(
cellSet::const_iterator iter = cellsToCut.begin();
iter != cellsToCut.end();
++iter
)
forAllConstIter(cellSet, cellsToCut, iter)
{
label cellI = iter.key();
const label cellI = iter.key();
const labelList& cEdges = cellEdges[cellI];
forAll(cEdges, i)

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

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

5
applications/utilities/mesh/conversion/cfx4ToFoam/block.H
View File

@ -100,9 +100,8 @@ public:
return autoPtr<block>(NULL);
}
// Destructor
~block();
//- Destructor
~block();
// Member Functions

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

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

5
applications/utilities/mesh/conversion/sammToFoam/sammMesh.H
View File

@ -238,9 +238,8 @@ public:
);
// Destructor
~sammMesh();
//- Destructor
~sammMesh();
// Member Functions

5
applications/utilities/mesh/conversion/star3ToFoam/starMesh.H
View File

@ -299,9 +299,8 @@ public:
);
// Destructor
~starMesh();
//- Destructor
~starMesh();
// Member Functions

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
Info<< "Regions:" << endl;
for
(
Map<label>::const_iterator iter = regionToPatch.begin();
iter != regionToPatch.end();
++iter
)
forAllConstIter(Map<label>, regionToPatch, iter)
{
Info<< " region:" << iter.key() << '\t' << "patch:"
<< iter() << endl;

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

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

23
applications/utilities/mesh/generation/extrudeToRegionMesh/extrudeToRegionMesh.C
View File

@ -143,12 +143,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
mesh.objectRegistry::lookupClass<GeoField>()
);
for
(
typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
iter != flds.end();
++iter
)
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@ -183,12 +178,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
mesh.objectRegistry::lookupClass<GeoField>()
);
for
(
typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
iter != flds.end();
++iter
)
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@ -209,12 +199,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
mesh.objectRegistry::lookupClass<GeoField>()
);
for
(
typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
iter != flds.end();
++iter
)
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@ -1461,7 +1446,7 @@ int main(int argc, char *argv[])
mesh.setInstance(meshInstance);
}
// Change master and slave boundary conditions on originating mesh

7
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.H
View File

@ -102,10 +102,9 @@ public:
mergePolyMesh(const IOobject& io);
// Destructor
virtual ~mergePolyMesh()
{}
//- Destructor
virtual ~mergePolyMesh()
{}
// Member Functions

5
applications/utilities/mesh/manipulation/mirrorMesh/mirrorFvMesh.H
View File

@ -76,9 +76,8 @@ public:
mirrorFvMesh(const IOobject& io);
// Destructor
~mirrorFvMesh();
//- Destructor
~mirrorFvMesh();
// Member Functions

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;
for
(
IOobjectList::const_iterator iter = pointObjects.begin();
iter != pointObjects.end();
++iter
)
forAllConstIter(IOobjectList, pointObjects, iter)
{
// Not in memory. Load it.
pointSet set(*iter());
@ -149,12 +144,7 @@ int main(int argc, char *argv[])
//Pout<< "faceSets:" << faceObjects.names() << endl;
for
(
IOobjectList::const_iterator iter = faceObjects.begin();
iter != faceObjects.end();
++iter
)
forAllConstIter(IOobjectList, faceObjects, iter)
{
// Not in memory. Load it.
faceSet set(*iter());
@ -288,12 +278,7 @@ int main(int argc, char *argv[])
//Pout<< "cellSets:" << cellObjects.names() << endl;
for
(
IOobjectList::const_iterator iter = cellObjects.begin();
iter != cellObjects.end();
++iter
)
forAllConstIter(IOobjectList, cellObjects, iter)
{
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)
{
label otherEdgeI = fEdges[fEdgeI];
const label otherEdgeI = fEdges[fEdgeI];
const edge& otherE = mesh.edges()[otherEdgeI];
if
@ -300,15 +299,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
//
labelHashSet regionEdges(4*regionFaces.size());
for
(
labelHashSet::const_iterator iter = regionFaces.begin();
iter != regionFaces.end();
++iter
)
forAllConstIter(labelHashSet, regionFaces, iter)
{
label faceI = iter.key();
const label faceI = iter.key();
const labelList& fEdges = mesh.faceEdges()[faceI];
forAll(fEdges, fEdgeI)
@ -326,12 +319,7 @@ void Foam::regionSide::walkAllPointConnectedFaces
labelHashSet visitedPoint(4*regionFaces.size());
// Insert fence points so we don't visit them
for
(
labelHashSet::const_iterator iter = fencePoints.begin();
iter != fencePoints.end();
++iter
)
forAllConstIter(labelHashSet, fencePoints, iter)
{
visitedPoint.insert(iter.key());
}
@ -344,14 +332,9 @@ void Foam::regionSide::walkAllPointConnectedFaces
Info<< "Excluding visit of points:" << visitedPoint << endl;
}
for
(
labelHashSet::const_iterator iter = regionFaces.begin();
iter != regionFaces.end();
++iter
)
forAllConstIter(labelHashSet, regionFaces, iter)
{
label faceI = iter.key();
const label faceI = iter.key();
// Get side of face.
label cellI;
@ -459,12 +442,7 @@ Foam::regionSide::regionSide
labelHashSet fencePoints(fenceEdges.size());
for
(
labelHashSet::const_iterator iter = fenceEdges.begin();
iter != fenceEdges.end();
++iter
)
forAllConstIter(labelHashSet, fenceEdges, iter)
{
const edge& e = mesh.edges()[iter.key()];

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

@ -99,12 +99,7 @@ void addPatchFields(fvMesh& mesh, const word& patchFieldType)
mesh.objectRegistry::lookupClass<GeoField>()
);
for
(
typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
iter != flds.end();
++iter
)
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@ -139,12 +134,7 @@ void trimPatchFields(fvMesh& mesh, const label nPatches)
mesh.objectRegistry::lookupClass<GeoField>()
);
for
(
typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
iter != flds.end();
++iter
)
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();
@ -165,12 +155,7 @@ void reorderPatchFields(fvMesh& mesh, const labelList& oldToNew)
mesh.objectRegistry::lookupClass<GeoField>()
);
for
(
typename HashTable<const GeoField*>::const_iterator iter = flds.begin();
iter != flds.end();
++iter
)
forAllConstIter(typename HashTable<const GeoField*>, flds, iter)
{
const GeoField& fld = *iter();

2
applications/utilities/mesh/manipulation/stitchMesh/stitchMesh.C
View File

@ -360,7 +360,7 @@ int main(int argc, char *argv[])
labelList osf(slavePatch.size());
forAll (osf, i)
forAll(osf, i)
{
osf[i] = slavePatch.start() + i;
}

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

5
applications/utilities/parallelProcessing/decomposePar/domainDecomposition.H
View File

@ -126,9 +126,8 @@ public:
domainDecomposition(const IOobject& io);
// Destructor
~domainDecomposition();
//- Destructor
~domainDecomposition();
// Member Functions

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

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

5
applications/utilities/parallelProcessing/decomposePar/fvFieldDecomposer.H
View File

@ -230,9 +230,8 @@ public:
);
// Destructor
~fvFieldDecomposer();
//- Destructor
~fvFieldDecomposer();
// Member Functions

2
applications/utilities/parallelProcessing/decomposePar/lagrangianFieldDecomposer.C
View File

@ -55,7 +55,7 @@ Foam::lagrangianFieldDecomposer::lagrangianFieldDecomposer
{
SLList<indexedParticle*>& particlePtrs = *cellParticles[celli];
forAllIter(SLList<indexedParticle*>, particlePtrs, iter)
forAllConstIter(SLList<indexedParticle*>, particlePtrs, iter)
{
const indexedParticle& ppi = *iter();
particleIndices_[pi++] = ppi.index();

5
applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposer.H
View File

@ -138,9 +138,8 @@ public:
);
// Destructor
~pointFieldDecomposer();
//- Destructor
~pointFieldDecomposer();
// Member Functions

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -26,13 +26,14 @@ word format
conversionProperties.lookup("format")
);
if ( (format != "ascii") && (format != "ieeei4r8") )
if ((format != "ascii") && (format != "ieeei4r8"))
{
FatalError << "format type: " << format << " unknown."
<< " Valid options are: ascii ieeei4r8"
<< abort(FatalError);
}
word cells
(
conversionProperties.lookup("cells")

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

@ -50,12 +50,7 @@ void readFields
label nFields = fields.size();
fields.setSize(nFields + fieldObjects.size());
for
(
IOobjectList::iterator iter = fieldObjects.begin();
iter != fieldObjects.end();
++iter
)
forAllIter(IOobjectList, fieldObjects, iter)
{
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());
label nFields = 0;
for
(
IOobjectList::iterator iter = fieldObjects.begin();
iter != fieldObjects.end();
++iter
)
forAllIter(IOobjectList, fieldObjects, iter)
{
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 "writeFuns.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * //
void writeFaceSet
void Foam::writeFaceSet
(
const bool binary,
const vtkMesh& vMesh,
@ -73,12 +68,7 @@ void writeFaceSet
labelList setFaceLabels(set.size());
label setFaceI = 0;
for
(
faceSet::const_iterator iter = set.begin();
iter != set.end();
++iter
)
forAllConstIter(faceSet, set, iter)
{
setFaceLabels[setFaceI] = iter.key();
setFaces[setFaceI] = faces[iter.key()];
@ -139,8 +129,5 @@ void writeFaceSet
writeFuns::write(pStream, binary, setFaceLabels);
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
// ************************************************************************* //

1
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/PV3FoamReader/vtkPV3FoamReader.h
View File

@ -187,7 +187,6 @@ protected:
);
//- Get the mesh/fields for a particular time
//- Destructor
virtual int RequestData
(
vtkInformation*,

3
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.H
View File

@ -693,8 +693,7 @@ public:
//- Destructor
~vtkPV3Foam();
~vtkPV3Foam();
// Member Functions

3
applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/vtkPV3blockMesh/vtkPV3blockMesh.H
View File

@ -312,8 +312,7 @@ public:
//- Destructor
~vtkPV3blockMesh();
~vtkPV3blockMesh();
// Member Functions

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)
{
label indx = 1;
for
(
Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
elmnt != sprayPtr->end();
++elmnt
)
forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
{
coord_array[0][indx] = (float)elmnt().position().x();
coord_array[1][indx] = (float)elmnt().position().y();
coord_array[2][indx] = (float)elmnt().position().z();
coord_array[0][indx] = (float)iter().position().x();
coord_array[1][indx] = (float)iter().position().y();
coord_array[2][indx] = (float)iter().position().z();
indx++;
}

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

@ -17,7 +17,7 @@ int USERD_get_part_node_ids
nodeid_array[indx] = indx + 1;
}
}
else if (part_number < nPatches+2)
else if (part_number < nPatches+2)
{
label patchi = part_number-2;
@ -32,18 +32,14 @@ int USERD_get_part_node_ids
}
}
else if (part_number == nPatches+2)
else if (part_number == nPatches+2)
{
label indx = 0;
for
(
Cloud<passiveParticle>::iterator elmnt = sprayPtr->begin();
elmnt != sprayPtr->end();
++elmnt
)
forAllConstIter(Cloud<passiveParticle>, *sprayPtr, iter)
{
nodeid_array[indx] = indx + 1;
indx++;
nodeid_array[indx] = indx + 1;
indx++;
}
}
else

5
applications/utilities/postProcessing/graphics/fieldview9Reader/readerDatabase.H
View File

@ -116,9 +116,8 @@ public:
readerDatabase();
// Destructor
~readerDatabase();
//- Destructor
~readerDatabase();
// Member Functions

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

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

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

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

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

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

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

@ -126,18 +126,13 @@ void dumpFaces
OFstream os(fName);
for
(
Map<label>::const_iterator iter = connectedFaces.begin();
iter != connectedFaces.end();
++iter
)
forAllConstIter(Map<label>, connectedFaces, iter)
{
const labelledTri& f = surf.localFaces()[iter.key()];
point ctr(f.centre(surf.localPoints()));
os << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
os << "v " << ctr.x() << ' ' << ctr.y() << ' ' << ctr.z() << endl;
}
}
@ -502,14 +497,9 @@ void calcPointVecs
boolList edgeDone(surf.nEdges(), false);
for
(
Map<label>::const_iterator iter = faceToEdge.begin();
iter != faceToEdge.end();
++iter
)
forAllConstIter(Map<label>, faceToEdge, iter)
{
label edgeI = iter();
const label edgeI = iter();
if (!edgeDone[edgeI])
{
@ -610,15 +600,9 @@ void renumberFaces
List<labelledTri>& newTris
)
{
for
(
Map<label>::const_iterator iter = faceToEdge.begin();
iter != faceToEdge.end();
++iter
)
forAllConstIter(Map<label>, faceToEdge, iter)
{
label faceI = iter.key();
const label faceI = iter.key();
const labelledTri& f = surf.localFaces()[faceI];
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 "createTime.H"
Info<< nl << "Reading Burcat data IOdictionary" << endl;
@ -119,17 +118,11 @@ int main(int argc, char *argv[])
);
for
(
SLPtrList<thermo>::iterator EQreactionsIter = EQreactions.begin();
EQreactionsIter != EQreactions.end();
++EQreactionsIter
)
forAllConstIter(SLPtrList<thermo>, EQreactions, iter)
{
Info<< "Kc(EQreactions) = " << EQreactionsIter().Kc(T) << endl;
Info<< "Kc(EQreactions) = " << iter().Kc(T) << endl;
}
Info<< nl << "end" << endl;
return 0;