dynamicCode/functionObjectTemplate: Updated and simplified by deriving from the regionFunctionObject base-class

etc/codeTemplates/dynamicCode/functionObjectTemplate.C

@@ -77,12 +77,6 @@ ${localCode}
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-const objectRegistry& ${typeName}FunctionObject::obr() const
-{
-    return obr_;
-}
-
-
 const fvMesh& ${typeName}FunctionObject::mesh() const
 {
     return refCast<const fvMesh>(obr_);
@@ -98,14 +92,7 @@ ${typeName}FunctionObject::${typeName}FunctionObject
     const dictionary& dict
 )
 :
-    functionObject(name),
-    obr_
-    (
-        runTime.lookupObject<objectRegistry>
-        (
-            dict.lookupOrDefault("region", polyMesh::defaultRegion)
-        )
-    )
+    functionObjects::regionFunctionObject(name, runTime, dict)
 {
     read(dict);
 }

etc/codeTemplates/dynamicCode/functionObjectTemplate.H

@@ -33,7 +33,7 @@ SourceFiles
 #ifndef functionObjectTemplate_H
 #define functionObjectTemplate_H
 
-#include "functionObject.H"
+#include "regionFunctionObject.H"
 
 //{{{ begin codeInclude
 ${codeInclude}
@@ -45,7 +45,6 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class objectRegistry;
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
@@ -54,13 +53,10 @@ class fvMesh;
 
 class ${typeName}FunctionObject
 :
-    public functionObject
+    public functionObjects::regionFunctionObject
 {
     // Private data
 
-        //- Reference to the objectRegistry
-        const objectRegistry& obr_;
-
 //{{{ begin codeData
         ${codeData}
 //}}} end codeData
@@ -68,8 +64,6 @@ class ${typeName}FunctionObject
 
     // Private Member Functions
 
-        const objectRegistry& obr() const;
-
         const fvMesh& mesh() const;
 
         //- Disallow default bitwise copy construct