From bf92e869a933c2282045c288083a508cd99007ea Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Tue, 30 Dec 2008 21:18:04 +0000
Subject: [PATCH] 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
---
.../postProcessing/sampling/sample/sample.C | 19 +++++++++++++++++--
.../IOOutputFilter/IOOutputFilter.C | 3 ++-
.../IOOutputFilter/IOOutputFilter.H | 8 ++++----
.../OutputFilterFunctionObject.C | 1 +
4 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/applications/utilities/postProcessing/sampling/sample/sample.C b/applications/utilities/postProcessing/sampling/sample/sample.C
index f2b27de8ead..306c8d7aed2 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 e76c2252d47..11fef3ee174 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 d166a9ea198..82a76798467 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 605b946d7cc..51ef0cf149b 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_
)
--
GitLab