From 5bd03e06327bc3809130305437c75f40fb0b56d0 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Wed, 11 May 2016 23:08:48 +0100
Subject: [PATCH] OutputFilterFunctionObject: Removed support for "dictionary"
option Superseded by the more general #include dictionary directive.
---
.../OutputFilterFunctionObject.C | 69 ++++++-------------
.../OutputFilterFunctionObject.H | 14 ++--
.../OutputFilterFunctionObjectI.H | 10 +--
3 files changed, 25 insertions(+), 68 deletions(-)
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
index 2c36cd6d41..acdde24b1f 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
@@ -24,7 +24,6 @@ License
\*---------------------------------------------------------------------------*/
#include "OutputFilterFunctionObject.H"
-#include "IOOutputFilter.H"
#include "polyMesh.H"
#include "mapPolyMesh.H"
#include "addToRunTimeSelectionTable.H"
@@ -32,10 +31,8 @@ License
// * * * * * * * * * * * * * * * Private Members * * * * * * * * * * * * * * //
template<class OutputFilter>
-void Foam::OutputFilterFunctionObject<OutputFilter>::readDict()
+void Foam::OutputFilterFunctionObject<OutputFilter>::readControls()
{
- dict_.readIfPresent("region", regionName_);
- dict_.readIfPresent("dictionary", dictName_);
dict_.readIfPresent("timeStart", timeStart_);
dict_.readIfPresent("timeEnd", timeEnd_);
dict_.readIfPresent("nStepsToStartTimeChange", nStepsToStartTimeChange_);
@@ -64,8 +61,7 @@ Foam::OutputFilterFunctionObject<OutputFilter>::OutputFilterFunctionObject
functionObject(name),
time_(t),
dict_(dict),
- regionName_(polyMesh::defaultRegion),
- dictName_(),
+ regionName_(dict.lookupOrDefault("region", polyMesh::defaultRegion)),
timeStart_(-VGREAT),
timeEnd_(VGREAT),
nStepsToStartTimeChange_
@@ -73,41 +69,15 @@ Foam::OutputFilterFunctionObject<OutputFilter>::OutputFilterFunctionObject
dict.lookupOrDefault("nStepsToStartTimeChange", 3)
),
outputControl_(t, dict, "output"),
- evaluateControl_(t, dict, "evaluate")
+ evaluateControl_(t, dict, "evaluate"),
+ filter_
+ (
+ name,
+ time_.lookupObject<objectRegistry>(regionName_),
+ dict_
+ )
{
- readDict();
-
- if (dictName_.size())
- {
- ptr_.reset
- (
- new IOOutputFilter<OutputFilter>
- (
- name,
- time_.lookupObject<objectRegistry>(regionName_),
- dictName_
- )
- );
- }
- else
- {
- ptr_.reset
- (
- new OutputFilter
- (
- name,
- time_.lookupObject<objectRegistry>(regionName_),
- dict_
- )
- );
- }
-
- if (!ptr_.valid())
- {
- FatalErrorInFunction
- << "Cannot construct " << OutputFilter::typeName
- << exit(FatalError);
- }
+ readControls();
}
@@ -123,12 +93,12 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute
{
if (evaluateControl_.output())
{
- ptr_->execute();
+ filter_.execute();
}
if (forceWrite || outputControl_.output())
{
- ptr_->write();
+ filter_.write();
}
}
@@ -139,11 +109,11 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute
template<class OutputFilter>
bool Foam::OutputFilterFunctionObject<OutputFilter>::end()
{
- ptr_->end();
+ filter_.end();
if (outputControl_.output())
{
- ptr_->write();
+ filter_.write();
}
return true;
@@ -155,7 +125,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::timeSet()
{
if (active())
{
- ptr_->timeSet();
+ filter_.timeSet();
}
return true;
@@ -169,7 +139,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::adjustTimeStep()
(
active()
&& outputControl_.outputControl()
- == outputFilterOutputControl::ocAdjustableTime
+ == outputFilterOutputControl::ocAdjustableRunTime
)
{
const label outputTimeIndex = outputControl_.outputTimeLastDump();
@@ -219,7 +189,8 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::read
dict_ = dict;
outputControl_.read(dict);
- readDict();
+ evaluateControl_.read(dict);
+ readControls();
return true;
}
@@ -238,7 +209,7 @@ void Foam::OutputFilterFunctionObject<OutputFilter>::updateMesh
{
if (active() && mpm.mesh().name() == regionName_)
{
- ptr_->updateMesh(mpm);
+ filter_.updateMesh(mpm);
}
}
@@ -251,7 +222,7 @@ void Foam::OutputFilterFunctionObject<OutputFilter>::movePoints
{
if (active() && mesh.name() == regionName_)
{
- ptr_->movePoints(mesh);
+ filter_.movePoints(mesh);
}
}
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
index 500dd77755..d62e5afdec 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
@@ -72,10 +72,7 @@ class OutputFilterFunctionObject
// Optional user inputs
//- Name of region - defaults to name of polyMesh::defaultRegion
- word regionName_;
-
- //- Dictionary name to supply required inputs
- word dictName_;
+ const word regionName_;
//- Activation time - defaults to -VGREAT
scalar timeStart_;
@@ -94,14 +91,14 @@ class OutputFilterFunctionObject
//- Evaluate controls
outputFilterOutputControl evaluateControl_;
- //- Pointer to the output filter
- autoPtr<OutputFilter> ptr_;
+ //- The output filter
+ OutputFilter filter_;
// Private Member Functions
//- Read relevant dictionary entries
- void readDict();
+ void readControls();
//- Returns true if within time bounds
bool active() const;
@@ -143,9 +140,6 @@ public:
//- Return the region name
inline const word& regionName() const;
- //- Return the optional dictionary name
- inline const word& dictName() const;
-
//- Return the output control object
inline const outputFilterOutputControl& outputControl() const;
diff --git a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
index 6a23b5914e..0e8be54e32 100644
--- a/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
+++ b/src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
@@ -49,14 +49,6 @@ Foam::OutputFilterFunctionObject<OutputFilter>::regionName() const
}
-template<class OutputFilter>
-inline const Foam::word&
-Foam::OutputFilterFunctionObject<OutputFilter>::dictName() const
-{
- return dictName_;
-}
-
-
template<class OutputFilter>
inline const Foam::outputFilterOutputControl&
Foam::OutputFilterFunctionObject<OutputFilter>::outputControl() const
@@ -69,7 +61,7 @@ template<class OutputFilter>
inline const OutputFilter&
Foam::OutputFilterFunctionObject<OutputFilter>::outputFilter() const
{
- return ptr_();
+ return filter_;
}
--
GitLab