Changed the IOOutputFilter constructor to accept a "name" argument. For details see the changes proposed by Vincent Tang:

http://openfoam.cfd-online.com/cgi-bin/forum/show.cgi?126/10405
This commit is contained in:
henry
2008-12-30 21:18:04 +00:00
parent 7386e4c94d
commit bf92e869a9
4 changed files with 24 additions and 7 deletions

View File

@ -101,8 +101,23 @@ int main(int argc, char *argv[])
instantList timeDirs = timeSelector::select0(runTime, args); instantList timeDirs = timeSelector::select0(runTime, args);
# include "createMesh.H" # include "createMesh.H"
IOsampledSets sSets(mesh, "sampleDict", IOobject::MUST_READ, true); IOsampledSets sSets
IOsampledSurfaces sSurfs(mesh, "sampleDict", IOobject::MUST_READ, true); (
sampledSets::typeName,
mesh,
"sampleDict",
IOobject::MUST_READ,
true
);
IOsampledSurfaces sSurfs
(
sampledSurfaces::typeName,
mesh,
"sampleDict",
IOobject::MUST_READ,
true
);
forAll(timeDirs, timeI) forAll(timeDirs, timeI)
{ {

View File

@ -32,6 +32,7 @@ License
template<class OutputFilter> template<class OutputFilter>
Foam::IOOutputFilter<OutputFilter>::IOOutputFilter Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
( (
const word& outputFilterName,
const objectRegistry& obr, const objectRegistry& obr,
const fileName& dictName, const fileName& dictName,
const IOobject::readOption rOpt, const IOobject::readOption rOpt,
@ -49,7 +50,7 @@ Foam::IOOutputFilter<OutputFilter>::IOOutputFilter
IOobject::NO_WRITE IOobject::NO_WRITE
) )
), ),
OutputFilter(OutputFilter::typeName, obr, *this, readFromFiles) OutputFilter(outputFilterName, obr, *this, readFromFiles)
{} {}

View File

@ -60,7 +60,7 @@ class IOOutputFilter
{ {
// Private Member Functions // Private Member Functions
//- Disallow default bitwise copy construct and assignment // Disallow default bitwise copy construct and assignment
IOOutputFilter(const IOOutputFilter&); IOOutputFilter(const IOOutputFilter&);
void operator=(const IOOutputFilter&); void operator=(const IOOutputFilter&);
@ -74,6 +74,7 @@ public:
// Allow the possibility to load fields from files // Allow the possibility to load fields from files
IOOutputFilter IOOutputFilter
( (
const word& outputFilterName,
const objectRegistry&, const objectRegistry&,
const fileName& dictName = OutputFilter::typeName() + "Dict", const fileName& dictName = OutputFilter::typeName() + "Dict",
const IOobject::readOption rOpt = IOobject::MUST_READ, const IOobject::readOption rOpt = IOobject::MUST_READ,
@ -81,8 +82,7 @@ public:
); );
// Destructor //- Destructor
virtual ~IOOutputFilter(); virtual ~IOOutputFilter();

View File

@ -78,6 +78,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::start()
( (
new IOOutputFilter<OutputFilter> new IOOutputFilter<OutputFilter>
( (
name_,
time_.lookupObject<objectRegistry>(regionName_), time_.lookupObject<objectRegistry>(regionName_),
dictName_ dictName_
) )