ENH: allow wordHashSet filter for IOobjectList::names

- simplifies usage.
  Support syncPar check on names() to detect inconsistencies.

- simplify readFields, ReadFields and other routines by using these
  new methods.
This commit is contained in:
Mark Olesen
2018-07-26 14:56:52 +02:00
parent a8ef5610d0
commit 02ad76df4f
51 changed files with 1434 additions and 1397 deletions

View File

@ -54,7 +54,7 @@ void RotateFields
// Objects of field type
IOobjectList fields(objects.lookupClass(GeometricField::typeName));
forAllIter(IOobjectList, fields, fieldIter)
forAllConstIters(fields, fieldIter)
{
Info<< " Rotating " << fieldIter()->name() << endl;

View File

@ -193,7 +193,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
if (cellSets.size())
{
os << "cellSets:" << endl;
forAllConstIter(IOobjectList, cellSets, iter)
forAllConstIters(cellSets, iter)
{
cellSet set(*iter());
os << '\t' << set.name() << "\tsize:" << set.size() << endl;
@ -203,7 +203,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
if (faceSets.size())
{
os << "faceSets:" << endl;
forAllConstIter(IOobjectList, faceSets, iter)
forAllConstIters(faceSets, iter)
{
faceSet set(*iter());
os << '\t' << set.name() << "\tsize:" << set.size() << endl;
@ -213,7 +213,7 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
if (pointSets.size())
{
os << "pointSets:" << endl;
forAllConstIter(IOobjectList, pointSets, iter)
forAllConstIters(pointSets, iter)
{
pointSet set(*iter());
os << '\t' << set.name() << "\tsize:" << set.size() << endl;
@ -224,9 +224,8 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
if (cellZones.size())
{
os << "cellZones:" << endl;
forAll(cellZones, i)
for (const cellZone& zone : cellZones)
{
const cellZone& zone = cellZones[i];
os << '\t' << zone.name() << "\tsize:" << zone.size() << endl;
}
}
@ -234,9 +233,8 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
if (faceZones.size())
{
os << "faceZones:" << endl;
forAll(faceZones, i)
for (const faceZone& zone : faceZones)
{
const faceZone& zone = faceZones[i];
os << '\t' << zone.name() << "\tsize:" << zone.size() << endl;
}
}
@ -244,9 +242,8 @@ void printAllSets(const polyMesh& mesh, Ostream& os)
if (pointZones.size())
{
os << "pointZones:" << endl;
forAll(pointZones, i)
for (const pointZone& zone : pointZones)
{
const pointZone& zone = pointZones[i];
os << '\t' << zone.name() << "\tsize:" << zone.size() << endl;
}
}

View File

@ -107,7 +107,7 @@ int main(int argc, char *argv[])
//Pout<< "pointSets:" << pointObjects.names() << endl;
forAllConstIter(IOobjectList, pointObjects, iter)
forAllConstIters(pointObjects, iter)
{
// Not in memory. Load it.
pointSet set(*iter());
@ -143,7 +143,7 @@ int main(int argc, char *argv[])
//Pout<< "faceSets:" << faceObjects.names() << endl;
forAllConstIter(IOobjectList, faceObjects, iter)
forAllConstIters(faceObjects, iter)
{
// Not in memory. Load it.
faceSet set(*iter());
@ -269,7 +269,7 @@ int main(int argc, char *argv[])
//Pout<< "cellSets:" << cellObjects.names() << endl;
forAllConstIter(IOobjectList, cellObjects, iter)
forAllConstIters(cellObjects, iter)
{
if (!slaveCellSets.found(iter.key()))
{

View File

@ -286,7 +286,7 @@ template<class TopoSet>
void subsetTopoSets
(
const fvMesh& mesh,
const IOobjectList& objectsList,
const IOobjectList& objects,
const labelList& map,
const fvMesh& subMesh,
PtrList<TopoSet>& subSets
@ -294,7 +294,7 @@ void subsetTopoSets
{
// Read original sets
PtrList<TopoSet> sets;
ReadFields<TopoSet>(objectsList, sets);
ReadFields<TopoSet>(objects, sets);
subSets.setSize(sets.size());
forAll(sets, i)