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

BUG: Corrected sampling - handling of field regExps and field surface output

Browse Source
This commit is contained in:
andy
2013-04-05 11:36:07 +01:00
parent 42f4950532
commit bf8df5f502
4 changed files with 58 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/sampling/sampledSurface/sampledSurface/sampledSurface.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -259,6 +259,7 @@ Foam::tmp<Foam::vectorField> Foam::sampledSurface::sample
return tmp<vectorField>(NULL); return tmp<vectorField>(NULL);
} }
Foam::tmp<Foam::sphericalTensorField> Foam::sampledSurface::sample Foam::tmp<Foam::sphericalTensorField> Foam::sampledSurface::sample
( (
const surfaceSphericalTensorField& sField const surfaceSphericalTensorField& sField

22
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View File

@ -171,17 +171,19 @@ void Foam::sampledSurfaces::write()
writeGeometry(); writeGeometry();
} }
sampleAndWrite<volScalarField>(); const IOobjectList objects(mesh_, mesh_.time().timeName());
sampleAndWrite<volVectorField>();
sampleAndWrite<volSphericalTensorField>();
sampleAndWrite<volSymmTensorField>();
sampleAndWrite<volTensorField>();
sampleAndWrite<surfaceScalarField>(); sampleAndWrite<volScalarField>(objects);
sampleAndWrite<surfaceVectorField>(); sampleAndWrite<volVectorField>(objects);
sampleAndWrite<surfaceSphericalTensorField>(); sampleAndWrite<volSphericalTensorField>(objects);
sampleAndWrite<surfaceSymmTensorField>(); sampleAndWrite<volSymmTensorField>(objects);
sampleAndWrite<surfaceTensorField>(); sampleAndWrite<volTensorField>(objects);
sampleAndWrite<surfaceScalarField>(objects);
sampleAndWrite<surfaceVectorField>(objects);
sampleAndWrite<surfaceSphericalTensorField>(objects);
sampleAndWrite<surfaceSymmTensorField>(objects);
sampleAndWrite<surfaceTensorField>(objects);
} }
} }

5
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H
View File

@ -89,6 +89,7 @@ class sampledSurfaces
//- Tolerance for merging points (fraction of mesh bounding box) //- Tolerance for merging points (fraction of mesh bounding box)
static scalar mergeTol_; static scalar mergeTol_;
// Private data // Private data
//- Name of this set of surfaces, //- Name of this set of surfaces,
@ -113,6 +114,7 @@ class sampledSurfaces
//- Interpolation scheme to use //- Interpolation scheme to use
word interpolationScheme_; word interpolationScheme_;
// surfaces // surfaces
//- Information for merging surfaces //- Information for merging surfaces
@ -159,7 +161,7 @@ class sampledSurfaces
); );
//- Sample and write all sampled fields //- Sample and write all sampled fields
template<class Type> void sampleAndWrite(); template<class Type> void sampleAndWrite(const IOobjectList& objects);
//- Disallow default bitwise copy construct and assignment //- Disallow default bitwise copy construct and assignment
sampledSurfaces(const sampledSurfaces&); sampledSurfaces(const sampledSurfaces&);
@ -233,7 +235,6 @@ public:
//- Update for changes of mesh due to readUpdate - expires the surfaces //- Update for changes of mesh due to readUpdate - expires the surfaces
virtual void readUpdate(const polyMesh::readUpdateState state); virtual void readUpdate(const polyMesh::readUpdateState state);
}; };

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

@ -166,36 +166,26 @@ void Foam::sampledSurfaces::sampleAndWrite
template<class GeoField> template<class GeoField>
void Foam::sampledSurfaces::sampleAndWrite() void Foam::sampledSurfaces::sampleAndWrite(const IOobjectList& objects)
{ {
DynamicList<wordRe> fields; if (loadFromFiles_)
bool found = false;
forAll (fieldSelection_, fieldI)
{ {
const wordRe field = fieldSelection_[fieldI]; IOobjectList fieldObjects(objects.lookupClass(GeoField::typeName));
if (mesh_.thisDb().foundObject<GeoField>(field))
{
found = true;
fields.append(field);
}
}
if (fields.size() && found)
{
forAll (fields, fieldI)
{
const wordRe field = fields[fieldI];
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << field << endl;
}
if (loadFromFiles_) forAll(fieldSelection_, fieldI)
{
const wordRe fieldNameRe = fieldSelection_[fieldI];
IOobjectList fieldIO = fieldObjects.lookupRe(fieldNameRe);
forAllConstIter(IOobjectList, fieldIO, iter)
{ {
const GeoField geoField const word& fieldName = iter()->name();
const GeoField fld
( (
IOobject IOobject
( (
field, fieldName,
mesh_.time().timeName(), mesh_.time().timeName(),
mesh_, mesh_,
IOobject::MUST_READ IOobject::MUST_READ
@ -203,13 +193,38 @@ void Foam::sampledSurfaces::sampleAndWrite()
mesh_ mesh_
); );
sampleAndWrite(geoField); if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite(fld);
} }
else }
}
else
{
forAll(fieldSelection_, fieldI)
{
const wordRe& fieldNameRe = fieldSelection_[fieldI];
const wordList dbFields
(
mesh_.thisDb().foundObjectRe<GeoField>(fieldNameRe)
);
forAll(dbFields, i)
{ {
const word& fieldName = dbFields[i];
if ((Pstream::master()) && verbose_)
{
Pout<< "sampleAndWrite: " << fieldName << endl;
}
sampleAndWrite sampleAndWrite
( (
mesh_.thisDb().lookupObject<GeoField>(field) mesh_.thisDb().lookupObject<GeoField>(fieldName)
); );
} }
} }