From 59e15370ce77a25f27494a24a07f315fafafd5a3 Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 29 Sep 2011 10:42:09 +0100
Subject: [PATCH] fixing regionCoupleFvPatchField double templating

Conflicts:

	src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.C
---
 .../regionCoupling/regionCouplingFvPatchField.C | 17 ++++++++++-------
 .../regionCoupling/regionCouplingFvPatchField.H |  8 ++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.C
index b47ccecd7..8222bd452 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.C
@@ -30,6 +30,8 @@ Author
 #include "regionCouplingFvPatchField.H"
 #include "symmTransformField.H"
 #include "magLongDelta.H"
+#include "volFields.H"
+#include "surfaceFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -150,19 +152,19 @@ regionCouplingFvPatchField<Type>::regionCouplingFvPatchField
 
 // Return a named shadow patch field
 template<class Type>
-template<class GeometricField, class Type2>
-const typename GeometricField::PatchFieldType&
+template<class LookupField, class LookupType>
+const typename LookupField::PatchFieldType&
 regionCouplingFvPatchField<Type>::lookupShadowPatchField
 (
     const word& name,
-    const GeometricField*,
-    const Type2*
+    const LookupField*,
+    const LookupType*
 ) const
 {
     // Lookup neighbour field
-    const GeometricField& shadowField =
+    const LookupField& shadowField =
         regionCouplePatch_.shadowRegion().
-        objectRegistry::lookupObject<GeometricField>(name);
+        objectRegistry::lookupObject<LookupField>(name);
 
     return shadowField.boundaryField()[regionCouplePatch_.shadowIndex()];
 }
@@ -183,7 +185,7 @@ regionCouplingFvPatchField<Type>::shadowPatchField() const
 }
 
 
-// Return neighbour field
+// Return neighbour field given internal cell data
 template<class Type>
 tmp<Field<Type> > regionCouplingFvPatchField<Type>::patchNeighbourField() const
 {
@@ -236,6 +238,7 @@ tmp<Field<Type> > regionCouplingFvPatchField<Type>::patchNeighbourField
 }
 
 
+
 template<class Type>
 void regionCouplingFvPatchField<Type>::initEvaluate
 (
diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.H
index bce85b7c3..864ac748b 100644
--- a/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/constraint/regionCoupling/regionCouplingFvPatchField.H
@@ -172,13 +172,13 @@ public:
             }
 
             //- Return a named shadow patch field
-            template<class GeometricField, class Type2>
-            const typename GeometricField::PatchFieldType&
+            template<class LookupField, class LookupType>
+            const typename LookupField::PatchFieldType&
             lookupShadowPatchField
             (
                 const word& name,
-                const GeometricField* = NULL,
-                const Type2* = NULL
+                const LookupField* = NULL,
+                const LookupType* = NULL
             ) const;