From 2ce9d80e90e27ae02f4529675f3a35440535658a Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 15 Mar 2012 15:43:09 +0000
Subject: [PATCH] ENH: globalMeshData: allow call with empty transformed
 elements list

---
 .../polyMesh/globalMeshData/globalMeshData.C  |  6 ++---
 .../globalMeshData/globalMeshDataTemplates.C  | 24 +++++++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index d1b4926e76..3ccbdd4043 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -2403,7 +2403,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     (
         masterGlobalPoint,
         pointSlaves,
-        labelListList(cpp.nPoints()),   // no transforms
+        labelListList(0),   // no transforms
         pointSlavesMap,
         maxEqOp<label>()
     );
@@ -2684,7 +2684,7 @@ Foam::autoPtr<Foam::globalIndex> Foam::globalMeshData::mergePoints
     (
         globalMaster,
         pointSlaves,
-        labelListList(cpp.nPoints()),   // no transforms
+        labelListList(0),   // no transforms
         pointSlavesMap,
         maxEqOp<label>()
     );
diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
index 22428ace15..b5d18c2cd8 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -50,10 +50,17 @@ void Foam::globalMeshData::syncData
         Type& elem = elems[i];
 
         const labelList& slavePoints = slaves[i];
-        const labelList& transformSlavePoints = transformedSlaves[i];
+        label nTransformSlavePoints =
+        (
+            transformedSlaves.size() == 0
+          ? 0
+          : transformedSlaves[i].size()
+        );
 
-        if (slavePoints.size()+transformSlavePoints.size() > 0)
+        if (slavePoints.size()+nTransformSlavePoints > 0)
         {
+            const labelList& transformSlavePoints = transformedSlaves[i];
+
             // Combine master with untransformed slave data
             forAll(slavePoints, j)
             {
@@ -109,10 +116,17 @@ void Foam::globalMeshData::syncData
         Type& elem = elems[i];
 
         const labelList& slavePoints = slaves[i];
-        const labelList& transformSlavePoints = transformedSlaves[i];
+        label nTransformSlavePoints =
+        (
+            transformedSlaves.size() == 0
+          ? 0
+          : transformedSlaves[i].size()
+        );
 
-        if (slavePoints.size()+transformSlavePoints.size() > 0)
+        if (slavePoints.size()+nTransformSlavePoints > 0)
         {
+            const labelList& transformSlavePoints = transformedSlaves[i];
+
             // Combine master with untransformed slave data
             forAll(slavePoints, j)
             {