functionObjects: rewritten to all be derived from 'functionObject'

- Avoids the need for the 'OutputFilterFunctionObject' wrapper
  - Time-control for execution and writing is now provided by the
    'timeControlFunctionObject' which instantiates the processing
    'functionObject' and controls its operation.
  - Alternative time-control functionObjects can now be written and
    selected at run-time without the need to compile wrapped version of
    EVERY existing functionObject which would have been required in the
    old structure.
  - The separation of 'execute' and 'write' functions is now formalized in the
    'functionObject' base-class and all derived classes implement the
    two functions.
  - Unnecessary implementations of functions with appropriate defaults
    in the 'functionObject' base-class have been removed reducing
    clutter and simplifying implementation of new functionObjects.
  - The 'coded' 'functionObject' has also been updated, simplified and tested.
  - Further simplification is now possible by creating some general
    intermediate classes derived from 'functionObject'.
This commit is contained in:
Henry Weller
2016-05-15 16:40:01 +01:00
parent 1441f8cab0
commit 91aba2db2e
230 changed files with 2731 additions and 8756 deletions

View File

@ -26,6 +26,7 @@ License
#include "systemCall.H"
#include "Time.H"
#include "dynamicCode.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@ -34,6 +35,13 @@ namespace Foam
namespace functionObjects
{
defineTypeNameAndDebug(systemCall, 0);
addToRunTimeSelectionTable
(
functionObject,
systemCall,
dictionary
);
}
}
@ -43,12 +51,11 @@ namespace functionObjects
Foam::functionObjects::systemCall::systemCall
(
const word& name,
const objectRegistry&,
const dictionary& dict,
const bool
const Time&,
const dictionary& dict
)
:
name_(name),
functionObject(name),
executeCalls_(),
endCalls_(),
writeCalls_()
@ -65,7 +72,7 @@ Foam::functionObjects::systemCall::~systemCall()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::functionObjects::systemCall::read(const dictionary& dict)
bool Foam::functionObjects::systemCall::read(const dictionary& dict)
{
dict.readIfPresent("executeCalls", executeCalls_);
dict.readIfPresent("endCalls", endCalls_);
@ -93,37 +100,41 @@ void Foam::functionObjects::systemCall::read(const dictionary& dict)
<< " $WM_PROJECT_DIR/etc/controlDict" << nl << nl
<< exit(FatalError);
}
return true;
}
void Foam::functionObjects::systemCall::execute()
bool Foam::functionObjects::systemCall::execute(const bool postProcess)
{
forAll(executeCalls_, callI)
{
Foam::system(executeCalls_[callI]);
}
return true;
}
void Foam::functionObjects::systemCall::end()
bool Foam::functionObjects::systemCall::end()
{
forAll(endCalls_, callI)
{
Foam::system(endCalls_[callI]);
}
return true;
}
void Foam::functionObjects::systemCall::timeSet()
{}
void Foam::functionObjects::systemCall::write()
bool Foam::functionObjects::systemCall::write(const bool postProcess)
{
forAll(writeCalls_, callI)
{
Foam::system(writeCalls_[callI]);
}
return true;
}