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,14 +172,13 @@ 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());
{
const wordRe fieldNameRe = fieldSelection_[fieldI];
IOobjectList fieldIO = fieldObjects.lookupRe(fieldNameRe);
forAllConstIter(IOobjectList, fieldIO, iter) labelList fieldNames(findStrings(fieldSelection_, names));
forAll(fieldNames, fieldI)
{ {
const word& fieldName = iter()->name(); const word& fieldName = names[fieldNames[fieldI]];
const GeoField fld const GeoField fld
( (
@ -201,21 +200,16 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
sampleAndWrite(fld); sampleAndWrite(fld);
} }
} }
}
else else
{ {
forAll(fieldSelection_, fieldI) const wordList fieldNames
{
const wordRe& fieldNameRe = fieldSelection_[fieldI];
const wordList dbFields
( (
mesh_.thisDb().foundObjectRe<GeoField>(fieldNameRe) mesh_.thisDb().names<GeoField>(fieldSelection_)
); );
forAll(dbFields, i) forAll(fieldNames, i)
{ {
const word& fieldName = dbFields[i]; const word& fieldName = fieldNames[i];
if ((Pstream::master()) && verbose_) if ((Pstream::master()) && verbose_)
{ {
@ -229,7 +223,6 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
} }
} }
} }
}
// ************************************************************************* // // ************************************************************************* //