From 53133e9c86a872afb5bb10fc0ac147a56bba2b39 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Tue, 19 Aug 2008 18:05:46 +0100
Subject: [PATCH] consistency update IntegrationResult->integrationResult

---
 .../intermediate/IntegrationScheme/Analytical/Analytical.C  | 4 ++--
 .../intermediate/IntegrationScheme/Analytical/Analytical.H  | 2 +-
 src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C | 4 ++--
 src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H | 2 +-
 .../IntegrationScheme/IntegrationScheme/IntegrationScheme.H | 6 +++---
 .../parcels/Templates/ThermoParcel/ThermoParcel.C           | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
index cb73887cb4..02471bdc2e 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
@@ -50,7 +50,7 @@ Foam::Analytical<Type>::~Analytical()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-typename Foam::IntegrationScheme<Type>::IntegrationResult
+typename Foam::IntegrationScheme<Type>::integrationResult
 Foam::Analytical<Type>::integrate
 (
     const Type phi,
@@ -59,7 +59,7 @@ Foam::Analytical<Type>::integrate
     const scalar beta
 ) const
 {
-    typename IntegrationScheme<Type>::IntegrationResult retValue;
+    typename IntegrationScheme<Type>::integrationResult retValue;
     retValue.average() = alpha + (phi - alpha)*(1 - exp(-beta*dt))/(beta*dt);
     retValue.value() =  alpha + (phi - alpha)*exp(-beta*dt);
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index 6f4ec94e8a..3c6bdd3b1f 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -74,7 +74,7 @@ public:
     // Member Functions
 
         //- Perform the integration
-        virtual typename IntegrationScheme<Type>::IntegrationResult integrate
+        virtual typename IntegrationScheme<Type>::integrationResult integrate
         (
             const Type phi,
             const scalar dt,
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
index e56eb6e8d3..2b39e9fd68 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
@@ -50,7 +50,7 @@ Foam::Euler<Type>::~Euler()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-typename Foam::IntegrationScheme<Type>::IntegrationResult
+typename Foam::IntegrationScheme<Type>::integrationResult
 Foam::Euler<Type>::integrate
 (
     const Type phi,
@@ -59,7 +59,7 @@ Foam::Euler<Type>::integrate
     const scalar beta
 ) const
 {
-    typename IntegrationScheme<Type>::IntegrationResult retValue;
+    typename IntegrationScheme<Type>::integrationResult retValue;
     retValue.value() = (phi + beta*dt*alpha)/(1.0 + beta*dt);
     retValue.average() = 0.5*(phi + retValue.value());
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
index a46d32dd67..a3c925e9f0 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
@@ -74,7 +74,7 @@ public:
     // Member Functions
 
         //- Perform the integration
-        virtual typename IntegrationScheme<Type>::IntegrationResult integrate
+        virtual typename IntegrationScheme<Type>::integrationResult integrate
         (
             const Type phi,
             const scalar dt,
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 7a1d5a2383..bac74a898c 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -57,7 +57,7 @@ class IntegrationScheme
 public:
 
     //- Helper class to supply results of integration
-    class IntegrationResult
+    class integrationResult
     {
         //- Integration value
         Type value_;
@@ -69,7 +69,7 @@ public:
     public:
 
         //- Constructor
-        IntegrationResult()
+        integrationResult()
         :
             value_(pTraits<Type>::zero),
             average_(pTraits<Type>::zero)
@@ -177,7 +177,7 @@ public:
     // Member Functions
 
         //- Perform the Integration
-        virtual IntegrationResult integrate
+        virtual integrationResult integrate
         (
             const Type phi,
             const scalar dt,
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index dd8240684f..39722c321f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -204,7 +204,7 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
     //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     // Integrate to find the new parcel temperature
-    IntegrationScheme<scalar>::IntegrationResult Tres =
+    IntegrationScheme<scalar>::integrationResult Tres =
         td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
 
     // Using average parcel temperature for enthalpy transfer calculation