ENH: Updated sampledSurfaces output

This commit is contained in:
andy
2013-04-08 17:33:10 +01:00
parent 56df414d11
commit 3382bd825c

View File

@ -27,6 +27,7 @@ License
#include "volFields.H" #include "volFields.H"
#include "surfaceFields.H" #include "surfaceFields.H"
#include "ListListOps.H" #include "ListListOps.H"
#include "stringListOps.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -146,7 +147,6 @@ void Foam::sampledSurfaces::sampleAndWrite
} }
template<class Type> template<class Type>
void Foam::sampledSurfaces::sampleAndWrite void Foam::sampledSurfaces::sampleAndWrite
( (
@ -172,61 +172,54 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
{ {
IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName)); IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
forAll(fieldSelection_, fieldI) wordList names(fieldObjects.names());
labelList fieldNames(findStrings(fieldSelection_, names));
forAll(fieldNames, fieldI)
{ {
const wordRe fieldNameRe = fieldSelection_[fieldI]; const word& fieldName = names[fieldNames[fieldI]];
IOobjectList fieldIO = fieldObjects.lookupRe(fieldNameRe);
forAllConstIter(IOobjectList, fieldIO, iter) const GeoField fld
{ (
const word& fieldName = iter()->name(); IOobject
const GeoField fld
( (
IOobject fieldName,
( mesh_.time().timeName(),
fieldName, mesh_,
mesh_.time().timeName(), IOobject::MUST_READ
mesh_, ),
IOobject::MUST_READ mesh_
), );
mesh_
);
if ((Pstream::master()) && verbose_) if ((Pstream::master()) && verbose_)
{ {
Pout<< "sampleAndWrite: " << fieldName << endl; Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite(fld);
} }
sampleAndWrite(fld);
} }
} }
else else
{ {
forAll(fieldSelection_, fieldI) const wordList fieldNames
(
mesh_.thisDb().names<GeoField>(fieldSelection_)
);
forAll(fieldNames, i)
{ {
const wordRe& fieldNameRe = fieldSelection_[fieldI]; const word& fieldName = fieldNames[i];
const wordList dbFields if ((Pstream::master()) && verbose_)
(
mesh_.thisDb().foundObjectRe<GeoField>(fieldNameRe)
);
forAll(dbFields, i)
{ {
const word& fieldName = dbFields[i]; Pout<< "sampleAndWrite: " << fieldName << endl;
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite
(
mesh_.thisDb().lookupObject<GeoField>(fieldName)
);
} }
sampleAndWrite
(
mesh_.thisDb().lookupObject<GeoField>(fieldName)
);
} }
} }
} }