zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

etc/codeTemplates/functionObject: Updated and simplified using fvMeshFunctionObject as the base-class

Browse Source
This commit is contained in:
Henry Weller
2016-05-16 22:16:22 +01:00
parent 18725ed3ac
commit d8c5eb43f7
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
etc/codeTemplates/functionObject/FUNCTIONOBJECT.C
View File

@ -49,14 +49,7 @@ Foam::functionObjects::FUNCTIONOBJECT::FUNCTIONOBJECT
const dictionary& dict const dictionary& dict
) )
: :
functionObject(name), fvMeshFunctionObject(name, runTime, dict),
obr_
(
runTime.lookupObject<objectRegistry>
(
dict.lookupOrDefault("region", polyMesh::defaultRegion)
)
),
wordData_(dict.lookupOrDefault<word>("wordData", "defaultWord")), wordData_(dict.lookupOrDefault<word>("wordData", "defaultWord")),
scalarData_(readScalar(dict.lookup("scalarData"))), scalarData_(readScalar(dict.lookup("scalarData"))),
labelData_(readLabel(dict.lookup("labelData"))) labelData_(readLabel(dict.lookup("labelData")))

25
etc/codeTemplates/functionObject/FUNCTIONOBJECT.H
View File

@ -59,16 +59,12 @@ SourceFiles
#ifndef FUNCTIONOBJECT_H #ifndef FUNCTIONOBJECT_H
#define FUNCTIONOBJECT_H #define FUNCTIONOBJECT_H
#include "functionObject.H" #include "fvMeshFunctionObject.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam namespace Foam
{ {
// Forward declaration of classes
class objectRegistry;
namespace functionObjects namespace functionObjects
{ {
@ -78,23 +74,18 @@ namespace functionObjects
class FUNCTIONOBJECT class FUNCTIONOBJECT
: :
public functionObject public fvMeshFunctionObject
{ {
// Private data // Private data
//- Refererence to the objectRegistry //- word
const objectRegistry& obr_; word wordData_;
// Read from dictionary //- scalar
scalar scalarData_;
//- word //- label
word wordData_; label labelData_;
//- scalar
scalar scalarData_;
//- label
label labelData_;
// Private Member Functions // Private Member Functions