Function1: Renamed integrate -> integral for consistency with value

The integral function returns the integral as the value function returns the
value.

etc/codeTemplates/dynamicCode/Function1Template.C

@@ -127,7 +127,7 @@ Foam::Function1s::${typeName}Function1${TemplateType}::
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::${TemplateType}
-Foam::Function1s::${typeName}Function1${TemplateType}::integrate
+Foam::Function1s::${typeName}Function1${TemplateType}::integral
 (
     const scalar x1,
     const scalar x2

etc/codeTemplates/dynamicCode/Function1Template.H

@@ -107,7 +107,7 @@ public:
         }
 
         //- Integrate between two values
-        virtual ${TemplateType} integrate
+        virtual ${TemplateType} integral
         (
             const scalar x1,
             const scalar x2

etc/codeTemplates/dynamicCode/Function2Template.C

@@ -62,6 +62,17 @@ extern "C"
 }
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::Function2s::${typeName}Function2${TemplateType}::writeData
+(
+    Ostream& os
+) const
+{
+    NotImplemented;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::Function2s::${typeName}Function2${TemplateType}::
@@ -113,15 +124,4 @@ Foam::Function2s::${typeName}Function2${TemplateType}::
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::Function2s::${typeName}Function2${TemplateType}::writeData
-(
-    Ostream& os
-) const
-{
-    NotImplemented;
-}
-
-
 // ************************************************************************* i/

etc/codeTemplates/dynamicCode/Function2Template.H

@@ -55,6 +55,11 @@ class ${typeName}Function2${TemplateType}
 :
     public FieldFunction2<${TemplateType}, ${typeName}Function2${TemplateType}>
 {
+    // Private Member Functions
+
+        //- Write data to dictionary stream
+        virtual void writeData(Ostream& os) const;
+
 
 public:
 
@@ -105,9 +110,6 @@ public:
 //}}} end code
         }
 
-        //- Write in dictionary format
-        virtual void writeData(Ostream& os) const;
-
 
     // Member Operators