ENH: added timeFunctionObject virtual class in inheritance hierarchy

- simply a functionObject with an additional Time reference, which is
  a combination frequently used by concrete functionObjects
This commit is contained in:
Mark Olesen
2019-01-25 08:56:21 +01:00
parent 8433ddee0e
commit ad7f29466a
27 changed files with 225 additions and 178 deletions

View File

@ -124,13 +124,12 @@ Foam::functionObjects::codedFunctionObject::codeDict() const
Foam::functionObjects::codedFunctionObject::codedFunctionObject
(
const word& name,
const Time& time,
const Time& runTime,
const dictionary& dict
)
:
functionObject(name),
timeFunctionObject(name, runTime),
codedBase(),
time_(time),
dict_(dict)
{
read(dict_);
@ -140,12 +139,6 @@ Foam::functionObjects::codedFunctionObject::codedFunctionObject
}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
Foam::functionObjects::codedFunctionObject::~codedFunctionObject()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
Foam::functionObject&

View File

@ -75,7 +75,7 @@ SourceFiles
#ifndef functionObjects_codedFunctionObject_H
#define functionObjects_codedFunctionObject_H
#include "functionObject.H"
#include "timeFunctionObject.H"
#include "codedBase.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -91,16 +91,13 @@ namespace functionObjects
class codedFunctionObject
:
public functionObject,
public functionObjects::timeFunctionObject,
public codedBase
{
protected:
// Protected data
//- Reference to the time database
const Time& time_;
//- Input dictionary
dictionary dict_;
@ -153,13 +150,13 @@ public:
codedFunctionObject
(
const word& name,
const Time& time,
const Time& runTime,
const dictionary& dict
);
//- Destructor
virtual ~codedFunctionObject();
virtual ~codedFunctionObject() = default;
// Member Functions