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

ENH: Better handling for regExp usage in sampledSurfaces

Browse Source
This commit is contained in:
andy
2013-04-09 16:26:08 +01:00
parent 2ba1b4d410
commit 99eee3c0d6
1 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C
View File

@ -168,18 +168,32 @@ void Foam::sampledSurfaces::sampleAndWrite
template<class GeoField> template<class GeoField>
void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects) void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
{ {
wordList names;
if (loadFromFiles_) if (loadFromFiles_)
{ {
IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName)); IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
names = fieldObjects.names();
}
else
{
names = mesh_.thisDb().names<GeoField>();
}
wordList names(fieldObjects.names()); labelList nameIDs(findStrings(fieldSelection_, names));
labelList fieldNames(findStrings(fieldSelection_, names)); wordHashSet fieldNames(wordList(names, nameIDs));
forAll(fieldNames, fieldI) forAllConstIter(wordHashSet, fieldNames, iter)
{
const word& fieldName = iter.key();
if ((Pstream::master()) && verbose_)
{ {
const word& fieldName = names[fieldNames[fieldI]]; Pout<< "sampleAndWrite: " << fieldName << endl;
}
if (loadFromFiles_)
{
const GeoField fld const GeoField fld
( (
IOobject IOobject
@ -192,30 +206,10 @@ void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
mesh_ mesh_
); );
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite(fld); sampleAndWrite(fld);
} }
} else
else
{
const wordList fieldNames
(
mesh_.thisDb().names<GeoField>(fieldSelection_)
);
forAll(fieldNames, i)
{ {
const word& fieldName = fieldNames[i];
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite sampleAndWrite
( (
mesh_.thisDb().lookupObject<GeoField>(fieldName) mesh_.thisDb().lookupObject<GeoField>(fieldName)