etc/codeTemplates/functionObject: Updated to correspond to the new functionObject structure

This commit is contained in:
Henry Weller
2016-05-15 21:47:18 +01:00
parent 248ab45998
commit ee0aff67ce
5 changed files with 55 additions and 99 deletions

View File

@ -22,7 +22,7 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::FUNCTIONOBJECT
Foam::functionObjects::FUNCTIONOBJECT
Group
@ -59,7 +59,7 @@ SourceFiles
#ifndef FUNCTIONOBJECT_H
#define FUNCTIONOBJECT_H
#include "runTimeSelectionTables.H"
#include "functionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -68,22 +68,21 @@ namespace Foam
// Forward declaration of classes
class objectRegistry;
class dictionary;
class polyMesh;
class mapPolyMesh;
namespace functionObjects
{
/*---------------------------------------------------------------------------*\
Class FUNCTIONOBJECT Declaration
\*---------------------------------------------------------------------------*/
class FUNCTIONOBJECT
:
public functionObject
{
// Private data
//- Name of this set of FUNCTIONOBJECT
word name_;
//- Refererence to Db
//- Refererence to the objectRegistry
const objectRegistry& obr_;
// Read from dictionary
@ -116,14 +115,12 @@ public:
// Constructors
//- Construct for given objectRegistry and dictionary.
// Allow the possibility to load fields from files
//- Construct from Time and dictionary
FUNCTIONOBJECT
(
const word& name,
const objectRegistry&,
const dictionary&,
const bool loadFromFiles = false
const Time& runTime,
const dictionary& dict
);
@ -133,39 +130,26 @@ public:
// Member Functions
//- Return name of the FUNCTIONOBJECT
const word& name() const
{
return name_;
}
//- Read the FUNCTIONOBJECT data
virtual void read(const dictionary&);
virtual bool read(const dictionary&);
//- Execute, currently does nothing
virtual void execute();
virtual bool execute(const bool postProcess = false);
//- Execute at the final time-loop, currently does nothing
virtual void end();
virtual bool end();
//- Called when time was set at the end of the Time::operator++
virtual void timeSet();
virtual bool timeSet();
//- Write the FUNCTIONOBJECT
virtual void write();
//- Update for changes of mesh
virtual void updateMesh(const mapPolyMesh&)
{}
//- Update for changes of mesh
virtual void movePoints(const polyMesh&)
{}
virtual bool write(const bool postProcess = false);
};
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace functionObjects
} // End namespace Foam
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //