ENH: improve syncTools handling of PackedList and bitSet

- create a subset copy for sending on the processor patches instead of
  a List of unsigned ints. Reduces memory overhead and data transfer
  amount.

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.H

@@ -499,7 +499,7 @@ public:
             template<class Type, class CombineOp, class TransformOp>
             static void syncData
             (
-                List<Type>& pointData,
+                List<Type>& elems,
                 const labelListList& slaves,
                 const labelListList& transformedSlaves,
                 const mapDistribute& slavesMap,
@@ -512,7 +512,7 @@ public:
             template<class Type, class CombineOp>
             static void syncData
             (
-                List<Type>& pointData,
+                List<Type>& elems,
                 const labelListList& slaves,
                 const labelListList& transformedSlaves,
                 const mapDistribute& slavesMap,

src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshDataTemplates.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,44 +50,36 @@ void Foam::globalMeshData::syncData
         Type& elem = elems[i];
 
         const labelList& slavePoints = slaves[i];
-        label nTransformSlavePoints =
+
+        const labelList& transformSlavePoints =
         (
-            transformedSlaves.size() == 0
-          ? 0
-          : transformedSlaves[i].size()
+            transformedSlaves.empty()
+          ? Foam::emptyLabelList
+          : transformedSlaves[i]
         );
 
-        if (slavePoints.size()+nTransformSlavePoints > 0)
+
+        // Combine master with untransformed slave data
+        for (const label pointi : slavePoints)
+        {
+            cop(elem, elems[pointi]);
+        }
+
+        // Combine master with transformed slave data
+        for (const label pointi : transformSlavePoints)
+        {
+            cop(elem, elems[pointi]);
+        }
+
+        // Copy result back to slave slots
+        for (const label pointi : slavePoints)
+        {
+            elems[pointi] = elem;
+        }
+
+        for (const label pointi : transformSlavePoints)
         {
-            // Combine master with untransformed slave data
-            forAll(slavePoints, j)
-            {
-                cop(elem, elems[slavePoints[j]]);
-            }
-
-            // Combine master with transformed slave data
-            if (nTransformSlavePoints)
-            {
-                const labelList& transformSlavePoints = transformedSlaves[i];
-                forAll(transformSlavePoints, j)
-                {
-                    cop(elem, elems[transformSlavePoints[j]]);
-                }
-            }
-
-            // Copy result back to slave slots
-            forAll(slavePoints, j)
-            {
-                elems[slavePoints[j]] = elem;
-            }
-            if (nTransformSlavePoints)
-            {
-                const labelList& transformSlavePoints = transformedSlaves[i];
-                forAll(transformSlavePoints, j)
-                {
-                    elems[transformSlavePoints[j]] = elem;
-                }
-            }
+            elems[pointi] = elem;
         }
     }
 
@@ -121,44 +113,36 @@ void Foam::globalMeshData::syncData
         Type& elem = elems[i];
 
         const labelList& slavePoints = slaves[i];
-        label nTransformSlavePoints =
+
+        const labelList& transformSlavePoints =
         (
-            transformedSlaves.size() == 0
-          ? 0
-          : transformedSlaves[i].size()
+            transformedSlaves.empty()
+          ? Foam::emptyLabelList
+          : transformedSlaves[i]
         );
 
-        if (slavePoints.size()+nTransformSlavePoints > 0)
+
+        // Combine master with untransformed slave data
+        for (const label pointi : slavePoints)
+        {
+            cop(elem, elems[pointi]);
+        }
+
+        // Combine master with transformed slave data
+        for (const label pointi : transformSlavePoints)
+        {
+            cop(elem, elems[pointi]);
+        }
+
+        // Copy result back to slave slots
+        for (const label pointi : slavePoints)
+        {
+            elems[pointi] = elem;
+        }
+
+        for (const label pointi : transformSlavePoints)
         {
-            // Combine master with untransformed slave data
-            forAll(slavePoints, j)
-            {
-                cop(elem, elems[slavePoints[j]]);
-            }
-
-            // Combine master with transformed slave data
-            if (nTransformSlavePoints)
-            {
-                const labelList& transformSlavePoints = transformedSlaves[i];
-                forAll(transformSlavePoints, j)
-                {
-                    cop(elem, elems[transformSlavePoints[j]]);
-                }
-            }
-
-            // Copy result back to slave slots
-            forAll(slavePoints, j)
-            {
-                elems[slavePoints[j]] = elem;
-            }
-            if (nTransformSlavePoints)
-            {
-                const labelList& transformSlavePoints = transformedSlaves[i];
-                forAll(transformSlavePoints, j)
-                {
-                    elems[transformSlavePoints[j]] = elem;
-                }
-            }
+            elems[pointi] = elem;
         }
     }
 

src/OpenFOAM/meshes/polyMesh/syncTools/syncTools.H

@@ -96,7 +96,7 @@ public:
             template<class T, class CombineOp, class TransformOp>
             static void syncPointMap
             (
-                const polyMesh&,
+                const polyMesh& mesh,
                 Map<T>& pointValues,
                 const CombineOp& cop,
                 const TransformOp& top
@@ -106,7 +106,7 @@ public:
             template<class T, class CombineOp, class TransformOp>
             static void syncEdgeMap
             (
-                const polyMesh&,
+                const polyMesh& mesh,
                 EdgeMap<T>& edgeValues,
                 const CombineOp& cop,
                 const TransformOp& top
@@ -116,8 +116,8 @@ public:
             template<class T, class CombineOp, class TransformOp>
             static void syncPointList
             (
-                const polyMesh&,
-                List<T>&,
+                const polyMesh& mesh,
+                List<T>& pointValues,
                 const CombineOp& cop,
                 const T& nullValue,
                 const TransformOp& top
@@ -127,9 +127,9 @@ public:
             template<class T, class CombineOp, class TransformOp>
             static void syncPointList
             (
-                const polyMesh&,
-                const labelList& meshPoints,
-                List<T>&,
+                const polyMesh& mesh,
+                const labelUList& meshPoints,
+                List<T>& pointValues,
                 const CombineOp& cop,
                 const T& nullValue,
                 const TransformOp& top
@@ -139,8 +139,8 @@ public:
             template<class T, class CombineOp, class TransformOp>
             static void syncEdgeList
             (
-                const polyMesh&,
-                List<T>&,
+                const polyMesh& mesh,
+                List<T>& edgeValues,
                 const CombineOp& cop,
                 const T& nullValue,
                 const TransformOp& top
@@ -150,9 +150,9 @@ public:
             template<class T, class CombineOp, class TransformOp>
             static void syncEdgeList
             (
-                const polyMesh&,
+                const polyMesh& mesh,
                 const labelList& meshEdges,
-                List<T>&,
+                List<T>& edgeValues,
                 const CombineOp& cop,
                 const T& nullValue,
                 const TransformOp& top
@@ -162,8 +162,8 @@ public:
             template<class T, class CombineOp, class TransformOp>
             static void syncBoundaryFaceList
             (
-                const polyMesh&,
-                UList<T>&,
+                const polyMesh& mesh,
+                UList<T>& faceValues,
                 const CombineOp& cop,
                 const TransformOp& top,
                 const bool parRun = Pstream::parRun()
@@ -177,7 +177,7 @@ public:
             static void syncPointList
             (
                 const polyMesh& mesh,
-                List<T>& l,
+                List<T>& pointValues,
                 const CombineOp& cop,
                 const T& nullValue
             )
@@ -185,7 +185,7 @@ public:
                 syncPointList
                 (
                     mesh,
-                    l,
+                    pointValues,
                     cop,
                     nullValue,
                     mapDistribute::transform()
@@ -197,7 +197,7 @@ public:
             static void syncPointPositions
             (
                 const polyMesh& mesh,
-                List<point>& l,
+                List<point>& positions,
                 const CombineOp& cop,
                 const point& nullValue
             )
@@ -205,7 +205,7 @@ public:
                 syncPointList
                 (
                     mesh,
-                    l,
+                    positions,
                     cop,
                     nullValue,
                     mapDistribute::transformPosition()
@@ -218,7 +218,7 @@ public:
             (
                 const polyMesh& mesh,
                 const labelList& meshPoints,
-                List<T>& l,
+                List<T>& pointValues,
                 const CombineOp& cop,
                 const T& nullValue
             )
@@ -227,7 +227,7 @@ public:
                 (
                     mesh,
                     meshPoints,
-                    l,
+                    pointValues,
                     cop,
                     nullValue,
                     mapDistribute::transform()
@@ -240,7 +240,7 @@ public:
             (
                 const polyMesh& mesh,
                 const labelList& meshPoints,
-                List<point>& l,
+                List<point>& positions,
                 const CombineOp& cop,
                 const point& nullValue
             )
@@ -249,7 +249,7 @@ public:
                 (
                     mesh,
                     meshPoints,
-                    l,
+                    positions,
                     cop,
                     nullValue,
                     mapDistribute::transformPosition()
@@ -264,7 +264,7 @@ public:
             static void syncEdgeList
             (
                 const polyMesh& mesh,
-                List<T>& l,
+                List<T>& edgeValues,
                 const CombineOp& cop,
                 const T& nullValue
             )
@@ -272,7 +272,7 @@ public:
                 syncEdgeList
                 (
                     mesh,
-                    l,
+                    edgeValues,
                     cop,
                     nullValue,
                     mapDistribute::transform()
@@ -284,7 +284,7 @@ public:
             static void syncEdgePositions
             (
                 const polyMesh& mesh,
-                List<point>& l,
+                List<point>& positions,
                 const CombineOp& cop,
                 const point& nullValue
             )
@@ -292,7 +292,7 @@ public:
                 syncEdgeList
                 (
                     mesh,
-                    l,
+                    positions,
                     cop,
                     nullValue,
                     mapDistribute::transformPosition()
@@ -305,7 +305,7 @@ public:
             (
                 const polyMesh& mesh,
                 const labelList& meshEdges,
-                List<T>& l,
+                List<T>& edgeValues,
                 const CombineOp& cop,
                 const T& nullValue
             )
@@ -314,7 +314,7 @@ public:
                 (
                     mesh,
                     meshEdges,
-                    l,
+                    edgeValues,
                     cop,
                     nullValue,
                     mapDistribute::transform()
@@ -327,7 +327,7 @@ public:
             (
                 const polyMesh& mesh,
                 const labelList& meshEdges,
-                List<point>& l,
+                List<point>& positions,
                 const CombineOp& cop,
                 const point& nullValue
             )
@@ -336,7 +336,7 @@ public:
                 (
                     mesh,
                     meshEdges,
-                    l,
+                    positions,
                     cop,
                     nullValue,
                     mapDistribute::transformPosition()
@@ -352,11 +352,17 @@ public:
             static void syncBoundaryFaceList
             (
                 const polyMesh& mesh,
-                UList<T>& l,
+                UList<T>& faceValues,
                 const CombineOp& cop
             )
             {
-                syncBoundaryFaceList(mesh, l, cop, mapDistribute::transform());
+                syncBoundaryFaceList
+                (
+                    mesh,
+                    faceValues,
+                    cop,
+                    mapDistribute::transform()
+                );
             }
 
             //- Synchronize locations on boundary faces only.
@@ -364,14 +370,14 @@ public:
             static void syncBoundaryFacePositions
             (
                 const polyMesh& mesh,
-                UList<point>& l,
+                UList<point>& positions,
                 const CombineOp& cop
             )
             {
                 syncBoundaryFaceList
                 (
                     mesh,
-                    l,
+                    positions,
                     cop,
                     mapDistribute::transformPosition()
                 );
@@ -382,13 +388,13 @@ public:
             static void syncFaceList
             (
                 const polyMesh& mesh,
-                UList<T>& l,
+                UList<T>& faceValues,
                 const CombineOp& cop
             )
             {
                 SubList<T> bndValues
                 (
-                    l,
+                    faceValues,
                     mesh.nFaces()-mesh.nInternalFaces(),
                     mesh.nInternalFaces()
                 );
@@ -407,13 +413,13 @@ public:
             static void syncFacePositions
             (
                 const polyMesh& mesh,
-                UList<point>& l,
+                UList<point>& positions,
                 const CombineOp& cop
             )
             {
                 SubList<point> bndValues
                 (
-                    l,
+                    positions,
                     mesh.nFaces()-mesh.nInternalFaces(),
                     mesh.nInternalFaces()
                 );
@@ -431,29 +437,29 @@ public:
             static void swapBoundaryFaceList
             (
                 const polyMesh& mesh,
-                UList<T>& l
+                UList<T>& faceValues
             )
             {
                 syncBoundaryFaceList
                 (
                     mesh,
-                    l,
+                    faceValues,
                     eqOp<T>(),
                     mapDistribute::transform()
                 );
             }
 
-             //- Swap coupled positions.
+            //- Swap coupled positions.
             static void swapBoundaryFacePositions
             (
                 const polyMesh& mesh,
-                UList<point>& l
+                UList<point>& positions
             )
             {
                 syncBoundaryFaceList
                 (
                     mesh,
-                    l,
+                    positions,
                     eqOp<point>(),
                     mapDistribute::transformPosition()
                 );
@@ -464,12 +470,12 @@ public:
             static void swapFaceList
             (
                 const polyMesh& mesh,
-                UList<T>& l
+                UList<T>& faceValues
             )
             {
                 SubList<T> bndValues
                 (
-                    l,
+                    faceValues,
                     mesh.nFaces()-mesh.nInternalFaces(),
                     mesh.nInternalFaces()
                 );
@@ -506,11 +512,17 @@ public:
             static void syncPointMap
             (
                 const polyMesh& mesh,
-                Map<T>& l,
+                Map<T>& pointValues,
                 const CombineOp& cop
             )
             {
-                syncPointMap(mesh, l, cop, mapDistribute::transform());
+                syncPointMap
+                (
+                    mesh,
+                    pointValues,
+                    cop,
+                    mapDistribute::transform()
+                );
             }
 
             //- Synchronize locations on selected points.
@@ -518,11 +530,17 @@ public:
             static void syncPointPositions
             (
                 const polyMesh& mesh,
-                Map<point>& l,
+                Map<point>& positions,
                 const CombineOp& cop
             )
             {
-                syncPointMap(mesh, l, cop, mapDistribute::transformPosition());
+                syncPointMap
+                (
+                    mesh,
+                    positions,
+                    cop,
+                    mapDistribute::transformPosition()
+                );
             }
 
             //- Synchronize values on selected edges. Edges are represented
@@ -532,11 +550,17 @@ public:
             static void syncEdgeMap
             (
                 const polyMesh& mesh,
-                EdgeMap<T>& l,
+                EdgeMap<T>& edgeValues,
                 const CombineOp& cop
             )
             {
-                syncEdgeMap(mesh, l, cop, mapDistribute::transform());
+                syncEdgeMap
+                (
+                    mesh,
+                    edgeValues,
+                    cop,
+                    mapDistribute::transform()
+                );
             }
 
             //- Synchronize locations on selected edges.
@@ -544,11 +568,17 @@ public:
             static void syncEdgePositions
             (
                 const polyMesh& mesh,
-                EdgeMap<point>& l,
+                EdgeMap<point>& edgePositions,
                 const CombineOp& cop
             )
             {
-                syncEdgeMap(mesh, l, cop, mapDistribute::transformPosition());
+                syncEdgeMap
+                (
+                    mesh,
+                    edgePositions,
+                    cop,
+                    mapDistribute::transformPosition()
+                );
             }
 
         // PackedList versions

src/OpenFOAM/meshes/polyMesh/syncTools/syncToolsTemplates.C

@@ -766,7 +766,7 @@ template<class T, class CombineOp, class TransformOp>
 void Foam::syncTools::syncPointList
 (
     const polyMesh& mesh,
-    const labelList& meshPoints,
+    const labelUList& meshPoints,
     List<T>& pointValues,
     const CombineOp& cop,
     const T& nullValue,
@@ -1061,38 +1061,35 @@ void Foam::syncTools::syncFaceList
 
         for (const polyPatch& pp : patches)
         {
-            if (isA<processorPolyPatch>(pp) && pp.size() > 0)
+            if (isA<processorPolyPatch>(pp) && pp.size())
             {
                 const processorPolyPatch& procPatch =
                     refCast<const processorPolyPatch>(pp);
 
-                List<unsigned int> patchInfo(procPatch.size());
-                forAll(procPatch, i)
-                {
-                    patchInfo[i] = faceValues[procPatch.start()+i];
-                }
-
+                // Send slice of values on the patch
                 UOPstream toNbr(procPatch.neighbProcNo(), pBufs);
-                toNbr << patchInfo;
+                toNbr
+                    << PackedList<Width>(faceValues, procPatch.range());
             }
         }
 
-
         pBufs.finishedSends();