diff --git a/applications/utilities/postProcessing/sampling/sample/sample.C b/applications/utilities/postProcessing/sampling/sample/sample.C index f2b27de8ead3eb94729c5c54366f64253b134537..306c8d7aed227ab1235ef6f53d046a6eee1d0ae6 100644 --- a/applications/utilities/postProcessing/sampling/sample/sample.C +++ b/applications/utilities/postProcessing/sampling/sample/sample.C @@ -101,8 +101,23 @@ int main(int argc, char *argv[]) instantList timeDirs = timeSelector::select0(runTime, args); # include "createMesh.H" - IOsampledSets sSets(mesh, "sampleDict", IOobject::MUST_READ, true); - IOsampledSurfaces sSurfs(mesh, "sampleDict", IOobject::MUST_READ, true); + IOsampledSets sSets + ( + sampledSets::typeName, + mesh, + "sampleDict", + IOobject::MUST_READ, + true + ); + + IOsampledSurfaces sSurfs + ( + sampledSurfaces::typeName, + mesh, + "sampleDict", + IOobject::MUST_READ, + true + ); forAll(timeDirs, timeI) { diff --git a/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.C b/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.C index e76c2252d476afde8a40196ccdf551bdc4ef140f..11fef3ee17462872c39d862bdb113c6a45b3a133 100644 --- a/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.C +++ b/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.C @@ -32,6 +32,7 @@ License template<class OutputFilter> Foam::IOOutputFilter<OutputFilter>::IOOutputFilter ( + const word& outputFilterName, const objectRegistry& obr, const fileName& dictName, const IOobject::readOption rOpt, @@ -49,7 +50,7 @@ Foam::IOOutputFilter<OutputFilter>::IOOutputFilter IOobject::NO_WRITE ) ), - OutputFilter(OutputFilter::typeName, obr, *this, readFromFiles) + OutputFilter(outputFilterName, obr, *this, readFromFiles) {} diff --git a/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.H b/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.H index d166a9ea19888fa4dd6742ad4ffa1fb9dde53555..82a7679846743c70965fc744d5ee1262f5c1b658 100644 --- a/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.H +++ b/src/sampling/outputFilters/IOOutputFilter/IOOutputFilter.H @@ -60,7 +60,7 @@ class IOOutputFilter { // Private Member Functions - //- Disallow default bitwise copy construct and assignment + // Disallow default bitwise copy construct and assignment IOOutputFilter(const IOOutputFilter&); void operator=(const IOOutputFilter&); @@ -74,6 +74,7 @@ public: // Allow the possibility to load fields from files IOOutputFilter ( + const word& outputFilterName, const objectRegistry&, const fileName& dictName = OutputFilter::typeName() + "Dict", const IOobject::readOption rOpt = IOobject::MUST_READ, @@ -81,9 +82,8 @@ public: ); - // Destructor - - virtual ~IOOutputFilter(); + //- Destructor + virtual ~IOOutputFilter(); // Member Functions diff --git a/src/sampling/outputFilters/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/sampling/outputFilters/OutputFilterFunctionObject/OutputFilterFunctionObject.C index 605b946d7cc30b29b5de9539f50094d2a73ec0c9..51ef0cf149bacc82d247950c5c7375d5185a6820 100644 --- a/src/sampling/outputFilters/OutputFilterFunctionObject/OutputFilterFunctionObject.C +++ b/src/sampling/outputFilters/OutputFilterFunctionObject/OutputFilterFunctionObject.C @@ -78,6 +78,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::start() ( new IOOutputFilter<OutputFilter> ( + name_, time_.lookupObject<objectRegistry>(regionName_), dictName_ )