From e693f21d69cd160c185e83b00141f9472511f5bd Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 5 Feb 2020 09:56:14 +0100
Subject: [PATCH] STYLE: use ListOps::appendEqOp instead of local version

BUG: bad buffer size in globalMeshData::sharedPoints()

- introduced by vector::zero -> Zero replacement (commit 683cfb9d97c6)
---
 .../polyMesh/globalMeshData/globalMeshData.C  |  2 +-
 .../medialAxisMeshMover.C                     |  6 ++--
 src/sampling/meshToMesh/meshToMesh.C          | 10 +++---
 src/sampling/meshToMesh/meshToMeshTemplates.C | 32 -------------------
 4 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
index 854f5581eb..f9626e0d5d 100644
--- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
+++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalMeshData.C
@@ -1940,7 +1940,7 @@ Foam::pointField Foam::globalMeshData::sharedPoints() const
             (
                 Pstream::commsTypes::blocking,
                 slave,
-                sharedPoints.size()*sizeof(Zero)
+                sharedPoints.size()*sizeof(Foam::vector)  // byteSize()
             );
             toSlave << sharedPoints;
         }
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
index 650a8df1d0..07963d45a6 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/medialAxisMeshMover.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2015 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -914,7 +914,7 @@ handleFeatureAngleLayerTerminations
         mesh(),
         meshEdges,
         edgeFaceNormals,
-        globalMeshData::ListPlusEqOp<List<point>>(),   // combine operator
+        ListOps::appendEqOp<point>(),
         List<point>()               // null value
     );
 
@@ -923,7 +923,7 @@ handleFeatureAngleLayerTerminations
         mesh(),
         meshEdges,
         edgeFaceExtrude,
-        globalMeshData::ListPlusEqOp<List<bool>>(),    // combine operator
+        ListOps::appendEqOp<bool>(),
         List<bool>()                // null value
     );
 
diff --git a/src/sampling/meshToMesh/meshToMesh.C b/src/sampling/meshToMesh/meshToMesh.C
index 39e2d20a33..591f67fc5e 100644
--- a/src/sampling/meshToMesh/meshToMesh.C
+++ b/src/sampling/meshToMesh/meshToMesh.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -543,7 +543,7 @@ void Foam::meshToMesh::calculate(const word& methodName, const bool normalise)
             globalSrcCells.inplaceToGlobal(addressing);
         }
 
-        // set up as a reverse distribute
+        // Set up as a reverse distribute
         mapDistributeBase::distribute
         (
             Pstream::commsTypes::nonBlocking,
@@ -554,12 +554,12 @@ void Foam::meshToMesh::calculate(const word& methodName, const bool normalise)
             map.subMap(),
             false,
             tgtToSrcCellAddr_,
-            ListPlusEqOp<label>(),
+            ListOps::appendEqOp<label>(),
             flipOp(),
             labelList()
         );
 
-        // set up as a reverse distribute
+        // Set up as a reverse distribute
         mapDistributeBase::distribute
         (
             Pstream::commsTypes::nonBlocking,
@@ -570,7 +570,7 @@ void Foam::meshToMesh::calculate(const word& methodName, const bool normalise)
             map.subMap(),
             false,
             tgtToSrcCellWght_,
-            ListPlusEqOp<scalar>(),
+            ListOps::appendEqOp<scalar>(),
             flipOp(),
             scalarList()
         );
diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C
index 2a2585aa65..f13e0d8362 100644
--- a/src/sampling/meshToMesh/meshToMeshTemplates.C
+++ b/src/sampling/meshToMesh/meshToMeshTemplates.C
@@ -33,38 +33,6 @@ License
 #include "fvcGrad.H"
 #include "distributedWeightedFvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    //- Helper class for list
-    template<class Type>
-    class ListPlusEqOp
-    {
-        public:
-        void operator()(List<Type>& x, const List<Type> y) const
-        {
-            if (y.size())
-            {
-                if (x.size())
-                {
-                    label sz = x.size();
-                    x.setSize(sz + y.size());
-                    forAll(y, i)
-                    {
-                        x[sz++] = y[i];
-                    }
-                }
-                else
-                {
-                    x = y;
-                }
-            }
-        }
-    };
-}
-
-
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 template<class Type>