From d5326a7d271913f4d14386ed5deb64bd3728c578 Mon Sep 17 00:00:00 2001
From: Henrik Rusche <h.rusche@wikki-gmbh.de>
Date: Wed, 10 Jul 2013 23:24:29 +0200
Subject: [PATCH] Revert changes to regionCouplePolyPatch.C

---
 .../regionCouple/regionCouplePolyPatch.C      | 43 +++++--------------
 1 file changed, 11 insertions(+), 32 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.C
index 42485878e..e4b7904ae 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/regionCouple/regionCouplePolyPatch.C
@@ -800,10 +800,7 @@ void Foam::regionCouplePolyPatch::attach() const
         // Patch-to-patch interpolation does not need to be cleared,
         // only face/cell centres and interpolation factors
         // HJ, 6/Jun/2011
-
-        // Breaks simple parallel CHT cases
-        // HR, 8/Jun/2012
-        //clearGeom();
+        clearGeom();
     }
 }
 
@@ -818,10 +815,7 @@ void Foam::regionCouplePolyPatch::detach() const
         // Patch-to-patch interpolation does not need to be cleared,
         // only face/cell centres and interpolation factors
         // HJ, 6/Jun/2011
-
-        // Breaks simple parallel CHT cases
-        // HR, 8/Jun/2012
-        //clearGeom();
+        clearGeom();
     }
 }
 
@@ -889,17 +883,15 @@ Foam::regionCouplePolyPatch::patchToPatch() const
 const Foam::vectorField&
 Foam::regionCouplePolyPatch::reconFaceCellCentres() const
 {
-// Breaks simple parallel CHT cases
-// HR, 8/Jun/2012
-//    if (!attached_)
-//    {
-//        FatalErrorIn
-//        (
-//            "const vectorField& "
-//            "regionCouplePolyPatch::reconFaceCellCentres() const"
-//        )   << "Requesting reconFaceCellCentres in detached state"
-//            << abort(FatalError);
-//    }
+    if (!attached_)
+    {
+        FatalErrorIn
+        (
+            "const vectorField& "
+            "regionCouplePolyPatch::reconFaceCellCentres() const"
+        )   << "Requesting reconFaceCellCentres in detached state"
+            << abort(FatalError);
+    }
 
     if (!reconFaceCellCentresPtr_)
     {
@@ -927,10 +919,6 @@ void Foam::regionCouplePolyPatch::initAddressing()
         {
             // Calculate send addressing
             sendAddr();
-
-            // Deferred execution on startup
-            // HR, 8/Jun/2012
-            shadow().sendAddr();
         }
     }
 
@@ -955,12 +943,6 @@ void Foam::regionCouplePolyPatch::initGeometry()
         {
             reconFaceCellCentres();
         }
-        else
-        {
-            // Deferred execution on startup
-            // HR, 8/Jun/2012
-            shadow().reconFaceCellCentres();
-        }
     }
 
     polyPatch::initGeometry();
@@ -1005,9 +987,6 @@ void Foam::regionCouplePolyPatch::initMovePoints(const pointField& p)
         }
     }
 
-    // Reconsider: Two communication in one function call may not work in parallel
-    // HR, 8/Jun/2012
-
     if (active() && master())
     {
         reconFaceCellCentres();