Commit b3f4d585 authored by Henry Weller's avatar Henry Weller
Browse files

functionObjects: Simplified the handling of the post-processing mode

Replaced the 'postProcess' argument to the 'write' and 'execute'
functions with the single static member 'postProcess' in the
functionObject base-class.
parent 41c2e4bc
......@@ -74,13 +74,13 @@ bool Foam::functionObjects::writeVTK::read(const dictionary& dict)
}
bool Foam::functionObjects::writeVTK::execute(const bool postProcess)
bool Foam::functionObjects::writeVTK::execute()
{
return true;
}
bool Foam::functionObjects::writeVTK::write(const bool postProcess)
bool Foam::functionObjects::writeVTK::write()
{
Info<< type() << " " << name() << " output:" << nl;
......
......@@ -129,10 +129,10 @@ public:
virtual bool read(const dictionary&);
//- Execute, currently does nothing
virtual bool execute(const bool postProcess = false);
virtual bool execute();
//- Write the writeVTK
virtual bool write(const bool postProcess = false);
virtual bool write();
};
......
......@@ -113,7 +113,7 @@ void executeFunctionObjects
Info<< nl << "Executing functionObjects" << endl;
// Execute the functionObjects in post-processing mode
functions.execute(true);
functions.execute();
while (!storedObjects.empty())
{
......
......@@ -26,8 +26,8 @@ Solution:
- copy the flowRatePatch file into the case system directory (not
flowRatePatch.cfg)
- edit system/flowRatePatch to set the patch name
replace "patch <patchName>;"
with "patch outlet;"
replace "name <patchName>;"
with "name outlet;"
- activate the function object by including the flowRatePatch file in functions
sub-dictionary in the case controlDict file, e.g.
functions
......
......@@ -14,7 +14,7 @@ Description
flowRatePatch
{
patch <patchName>;
name <patchName>;
#includeEtc "caseDicts/postProcessing/flowRate/flowRatePatch.cfg"
}
......
......@@ -9,6 +9,5 @@
#includeEtc "caseDicts/postProcessing/surfaceRegion/surfaceRegion.cfg"
regionType patch;
name $patch;
// ************************************************************************* //
......@@ -12,8 +12,8 @@ Description
patchAverage
{
patch <patchName>;
fields (<field names>);
name <patchName>;
fields (<field names>);
operation average;
#includeEtc "caseDicts/postProcessing/surfaceRegion/patch.cfg"
......
......@@ -12,7 +12,7 @@ Description
patchIntegrate
{
patch <patchName>;
name <patchName>;
fields (<field names>);
operation areaIntegrate;
......
......@@ -121,7 +121,7 @@ bool ${typeName}FunctionObject::read(const dictionary& dict)
}
bool ${typeName}FunctionObject::execute(const bool postProcess)
bool ${typeName}FunctionObject::execute()
{
if (${verbose:-false})
{
......@@ -136,7 +136,7 @@ bool ${typeName}FunctionObject::execute(const bool postProcess)
}
bool ${typeName}FunctionObject::write(const bool postProcess)
bool ${typeName}FunctionObject::write()
{
if (${verbose:-false})
{
......
......@@ -100,13 +100,13 @@ public:
virtual bool read(const dictionary&);
//- Execute the "executeCalls" at each time-step
virtual bool execute(const bool postProcess = false);
virtual bool execute();
//- Execute the "endCalls" at the final time-loop
virtual bool end();
//- Write, execute the "writeCalls"
virtual bool write(const bool postProcess = false);
virtual bool write();
};
......
......@@ -76,7 +76,7 @@ bool Foam::functionObjects::FUNCTIONOBJECT::read(const dictionary& dict)
}
bool Foam::functionObjects::FUNCTIONOBJECT::execute(const bool postProcess)
bool Foam::functionObjects::FUNCTIONOBJECT::execute()
{
return true;
}
......@@ -88,7 +88,7 @@ bool Foam::functionObjects::FUNCTIONOBJECT::end()
}
bool Foam::functionObjects::FUNCTIONOBJECT::write(const bool postProcess)
bool Foam::functionObjects::FUNCTIONOBJECT::write()
{
return true;
}
......
......@@ -125,13 +125,13 @@ public:
virtual bool read(const dictionary&);
//- Execute, currently does nothing
virtual bool execute(const bool postProcess = false);
virtual bool execute();
//- Execute at the final time-loop, currently does nothing
virtual bool end();
//- Write the FUNCTIONOBJECT
virtual bool write(const bool postProcess = false);
virtual bool write();
};
......
......@@ -122,9 +122,9 @@ bool Foam::IOOutputFilter<OutputFilter>::read()
template<class OutputFilter>
bool Foam::IOOutputFilter<OutputFilter>::write(const bool postProcess)
bool Foam::IOOutputFilter<OutputFilter>::write()
{
return OutputFilter::write(postProcess);
return OutputFilter::write();
}
......
......@@ -126,7 +126,7 @@ public:
using regIOobject::write;
//- Sample and write
virtual bool write(const bool postProcess = false);
virtual bool write();
//- Update for changes of mesh
virtual void updateMesh(const mapPolyMesh& mpm);
......
......@@ -211,12 +211,12 @@ public:
//- Called at each ++ or += of the time-loop.
// postProcess overrides the usual executeControl behaviour and
// forces execution (used in post-processing mode)
virtual bool execute(const bool postProcess = false) = 0;
virtual bool execute() = 0;
//- Called at each ++ or += of the time-loop.
// postProcess overrides the usual writeControl behaviour and
// forces writing always (used in post-processing mode)
virtual bool write(const bool postProcess = false) = 0;
virtual bool write() = 0;
//- Called when Time::run() determines that the time-loop exits.
// By default it simply calls execute().
......
......@@ -145,7 +145,7 @@ bool Foam::functionObjectList::readFunctionObject
// 'patchAverage(patch=inlet, p)' -> funcName = patchAverage;
// args = (patch=inlet, p); field = p
word funcName;
word funcName(funcNameArgs);
int argLevel = 0;
wordList args;
......@@ -436,7 +436,7 @@ bool Foam::functionObjectList::start()
}
bool Foam::functionObjectList::execute(const bool postProcess)
bool Foam::functionObjectList::execute()
{
bool ok = true;
......@@ -449,8 +449,8 @@ bool Foam::functionObjectList::execute(const bool postProcess)
forAll(*this, objectI)
{
ok = operator[](objectI).execute(postProcess) && ok;
ok = operator[](objectI).write(postProcess) && ok;
ok = operator[](objectI).execute() && ok;
ok = operator[](objectI).write() && ok;
}
}
......
......@@ -235,7 +235,7 @@ public:
//- Called at each ++ or += of the time-loop.
// postProcess overrides the usual executeControl behaviour and
// forces execution (used in post-processing mode)
bool execute(const bool postProcess = false);
bool execute();
//- Called when Time::run() determines that the time-loop exits
bool end();
......
......@@ -136,7 +136,7 @@ if (argList::postProcess(argc, argv))
#include INCLUDE_FILE(CREATE_FIELDS_3)
#endif
functionsPtr->execute(true);
functionsPtr->execute();
}
catch (IOerror& err)
{
......
......@@ -85,7 +85,7 @@ Foam::functionObjects::timeControl::timeControl
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::functionObjects::timeControl::execute(const bool postProcess)
bool Foam::functionObjects::timeControl::execute()
{
if (active() && (postProcess || executeControl_.execute()))
{
......@@ -96,7 +96,7 @@ bool Foam::functionObjects::timeControl::execute(const bool postProcess)
}
bool Foam::functionObjects::timeControl::write(const bool postProcess)
bool Foam::functionObjects::timeControl::write()
{
if (active() && (postProcess || writeControl_.execute()))
{
......
......@@ -151,12 +151,12 @@ public:
//- Called at each ++ or += of the time-loop.
// postProcess overrides the usual executeControl behaviour and
// forces execution (used in post-processing mode)
virtual bool execute(const bool postProcess = false);
virtual bool execute();
//- Called at each ++ or += of the time-loop.
// postProcess overrides the usual writeControl behaviour and
// forces writing (used in post-processing mode)
virtual bool write(const bool postProcess = false);
virtual bool write();
//- Called when Time::run() determines that the time-loop exits
virtual bool end();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment