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

OutputFilterFunctionObject: Removed support for "dictionary" option

Browse Source 
Superseded by the more general #include dictionary directive.
This commit is contained in:
Henry Weller
2016-05-11 23:08:48 +01:00
parent acdfa68116
commit 84f6355ad0
3 changed files with 25 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.C
View File

@ -24,7 +24,6 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "OutputFilterFunctionObject.H" #include "OutputFilterFunctionObject.H"
#include "IOOutputFilter.H"
#include "polyMesh.H" #include "polyMesh.H"
#include "mapPolyMesh.H" #include "mapPolyMesh.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
@ -32,10 +31,8 @@ License
// * * * * * * * * * * * * * * * Private Members * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Private Members * * * * * * * * * * * * * * //
template<class OutputFilter> 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("timeStart", timeStart_);
dict_.readIfPresent("timeEnd", timeEnd_); dict_.readIfPresent("timeEnd", timeEnd_);
dict_.readIfPresent("nStepsToStartTimeChange", nStepsToStartTimeChange_); dict_.readIfPresent("nStepsToStartTimeChange", nStepsToStartTimeChange_);
@ -64,8 +61,7 @@ Foam::OutputFilterFunctionObject<OutputFilter>::OutputFilterFunctionObject
functionObject(name), functionObject(name),
time_(t), time_(t),
dict_(dict), dict_(dict),
regionName_(polyMesh::defaultRegion), regionName_(dict.lookupOrDefault("region", polyMesh::defaultRegion)),
dictName_(),
timeStart_(-VGREAT), timeStart_(-VGREAT),
timeEnd_(VGREAT), timeEnd_(VGREAT),
nStepsToStartTimeChange_ nStepsToStartTimeChange_
@ -73,41 +69,15 @@ Foam::OutputFilterFunctionObject<OutputFilter>::OutputFilterFunctionObject
dict.lookupOrDefault("nStepsToStartTimeChange", 3) dict.lookupOrDefault("nStepsToStartTimeChange", 3)
), ),
outputControl_(t, dict, "output"), outputControl_(t, dict, "output"),
evaluateControl_(t, dict, "evaluate") evaluateControl_(t, dict, "evaluate"),
{ filter_
readDict();
if (dictName_.size())
{
ptr_.reset
(
new IOOutputFilter<OutputFilter>
(
name,
time_.lookupObject<objectRegistry>(regionName_),
dictName_
)
);
}
else
{
ptr_.reset
(
new OutputFilter
( (
name, name,
time_.lookupObject<objectRegistry>(regionName_), time_.lookupObject<objectRegistry>(regionName_),
dict_ dict_
) )
);
}
if (!ptr_.valid())
{ {
FatalErrorInFunction readControls();
<< "Cannot construct " << OutputFilter::typeName
<< exit(FatalError);
}
} }
@ -123,12 +93,12 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute
{ {
if (evaluateControl_.output()) if (evaluateControl_.output())
{ {
ptr_->execute(); filter_.execute();
} }
if (forceWrite || outputControl_.output()) if (forceWrite || outputControl_.output())
{ {
ptr_->write(); filter_.write();
} }
} }
@ -139,11 +109,11 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::execute
template<class OutputFilter> template<class OutputFilter>
bool Foam::OutputFilterFunctionObject<OutputFilter>::end() bool Foam::OutputFilterFunctionObject<OutputFilter>::end()
{ {
ptr_->end(); filter_.end();
if (outputControl_.output()) if (outputControl_.output())
{ {
ptr_->write(); filter_.write();
} }
return true; return true;
@ -155,7 +125,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::timeSet()
{ {
if (active()) if (active())
{ {
ptr_->timeSet(); filter_.timeSet();
} }
return true; return true;
@ -169,7 +139,7 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::adjustTimeStep()
( (
active() active()
&& outputControl_.outputControl() && outputControl_.outputControl()
== outputFilterOutputControl::ocAdjustableTime == outputFilterOutputControl::ocAdjustableRunTime
) )
{ {
const label outputTimeIndex = outputControl_.outputTimeLastDump(); const label outputTimeIndex = outputControl_.outputTimeLastDump();
@ -219,7 +189,8 @@ bool Foam::OutputFilterFunctionObject<OutputFilter>::read
dict_ = dict; dict_ = dict;
outputControl_.read(dict); outputControl_.read(dict);
readDict(); evaluateControl_.read(dict);
readControls();
return true; return true;
} }
@ -238,7 +209,7 @@ void Foam::OutputFilterFunctionObject<OutputFilter>::updateMesh
{ {
if (active() && mpm.mesh().name() == regionName_) 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_) if (active() && mesh.name() == regionName_)
{ {
ptr_->movePoints(mesh); filter_.movePoints(mesh);
} }
} }

14
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObject.H
View File

@ -72,10 +72,7 @@ class OutputFilterFunctionObject
// Optional user inputs // Optional user inputs
//- Name of region - defaults to name of polyMesh::defaultRegion //- Name of region - defaults to name of polyMesh::defaultRegion
word regionName_; const word regionName_;
//- Dictionary name to supply required inputs
word dictName_;
//- Activation time - defaults to -VGREAT //- Activation time - defaults to -VGREAT
scalar timeStart_; scalar timeStart_;
@ -94,14 +91,14 @@ class OutputFilterFunctionObject
//- Evaluate controls //- Evaluate controls
outputFilterOutputControl evaluateControl_; outputFilterOutputControl evaluateControl_;
//- Pointer to the output filter //- The output filter
autoPtr<OutputFilter> ptr_; OutputFilter filter_;
// Private Member Functions // Private Member Functions
//- Read relevant dictionary entries //- Read relevant dictionary entries
void readDict(); void readControls();
//- Returns true if within time bounds //- Returns true if within time bounds
bool active() const; bool active() const;
@ -143,9 +140,6 @@ public:
//- Return the region name //- Return the region name
inline const word& regionName() const; inline const word& regionName() const;
//- Return the optional dictionary name
inline const word& dictName() const;
//- Return the output control object //- Return the output control object
inline const outputFilterOutputControl& outputControl() const; inline const outputFilterOutputControl& outputControl() const;

10
src/OpenFOAM/db/functionObjects/OutputFilterFunctionObject/OutputFilterFunctionObjectI.H
View File

@ -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> template<class OutputFilter>
inline const Foam::outputFilterOutputControl& inline const Foam::outputFilterOutputControl&
Foam::OutputFilterFunctionObject<OutputFilter>::outputControl() const Foam::OutputFilterFunctionObject<OutputFilter>::outputControl() const
@ -69,7 +61,7 @@ template<class OutputFilter>
inline const OutputFilter& inline const OutputFilter&
Foam::OutputFilterFunctionObject<OutputFilter>::outputFilter() const Foam::OutputFilterFunctionObject<OutputFilter>::outputFilter() const
{ {
return ptr_(); return filter_;
} }