From 17314265fc83d2b4a2f21d779cd9cf3d12d25a04 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 13 Jun 2011 15:45:27 +0100
Subject: [PATCH] ENH:  Create points in a batch before insertion to allow
 distribution.

---
 .../conformalVoronoiMesh.C                    | 72 +++++++++++++++----
 .../conformalVoronoiMesh.H                    | 11 +--
 .../conformalVoronoiMeshConformToSurface.C    |  2 +-
 .../conformalVoronoiMeshI.H                   | 21 +++---
 .../conformalVoronoiMesh/indexedVertex.H      |  6 ++
 5 files changed, 86 insertions(+), 26 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 73433b7ecb..36ac69b238 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -244,7 +244,10 @@ void Foam::conformalVoronoiMesh::insertPoints
 
         // Send the points that are not on this processor to the appropriate
         // place
-        decomposition_().distributePoints(transferPoints);
+        Foam::autoPtr<Foam::mapDistribute> map
+        (
+            decomposition_().distributePoints(transferPoints)
+        );
 
         forAll(transferPoints, tPI)
         {
@@ -269,7 +272,7 @@ void Foam::conformalVoronoiMesh::insertPoints
 
     label nVert = number_of_vertices();
 
-    Info<< "TEMPORARILY USING INDIVIDUAL INSERTION" << endl;
+    Info<< "TEMPORARILY USING INDIVIDUAL INSERTION TO DETECT FAILURE" << endl;
     // using the range insert (faster than inserting points one by one)
     // insert(points.begin(), points.end());
     for
@@ -322,6 +325,10 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
             << exit(FatalError);
     }
 
+    DynamicList<Foam::point> pts;
+    DynamicList<label> indices;
+    DynamicList<label> types;
+
     forAll(surfaceHits, i)
     {
         vectorField norm(1);
@@ -336,24 +343,58 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
 
         const Foam::point& surfacePt(surfaceHits[i].hitPoint());
 
-        insertPointPair
+        createPointPair
         (
             pointPairDistance(surfacePt),
             surfacePt,
-            normal
+            normal,
+            pts,
+            indices,
+            types
+        );
+    }
+
+    if (Pstream::parRun())
+    {
+        // The link between vertices that form the boundary via pairs cannot be
+        // strict because both points may end up on different processors.  The
+        // only important thing is that each vertex knows its own role.
+        // Therefore, index and type are set to 0 or 1, then on the destination
+        // processor add back the new index to both.
+
+        // Each of points generated in this process are pair points, so there
+        // is no risk of underflowing type.
+
+        Pout<< "Suface point pair points before " << pts.size() << endl;
+
+        // Distribute points to their appropriate processor
+        autoPtr<mapDistribute> map
+        (
+            decomposition_().distributePoints(pts)
+        );
+
+        Pout<< "Suface point pair points after " << pts.size() << endl;
+
+        map().distribute(indices);
+        map().distribute(types);
+    }
+
+    forAll(pts, pI)
+    {
+        // creation of points and indices is done assuming that it will be
+        // relative to the instantaneous number_of_vertices() at insertion.
+
+        insertPoint
+        (
+            pts[pI],
+            indices[pI] + number_of_vertices(),
+            types[pI] + number_of_vertices()
         );
     }
 
     if(cvMeshControls().objOutput() && fName != fileName::null)
     {
-        List<Foam::point> surfacePts(surfaceHits.size());
-
-        forAll(surfacePts, i)
-        {
-            surfacePts[i] = surfaceHits[i].hitPoint();
-        }
-
-        writePoints(fName, surfacePts);
+        writePoints(fName, pts);
     }
 }
 
@@ -965,6 +1006,8 @@ void Foam::conformalVoronoiMesh::insertInitialPoints()
 
     Info<< "NEED TO CHANGE storeSizesAndAlignments AFTER DISTRIBUTE" << endl;
     Info<< "NEED TO MAP FEATURE POINTS AFTER DISTRIBUTE" << endl;
+    Info<< "NEED TO ENSURE THAT FEATURE POINTS ARE INSERTED ON THE "
+        << "CORRECT PRCOESSOR" << endl;
 
     storeSizesAndAlignments(initPts);
 }
@@ -1065,10 +1108,13 @@ void Foam::conformalVoronoiMesh::distribute()
 
         forAll(cellVertices, cI)
         {
+            // Give a small but finite weight for empty cells.  Some
+            // decomposition methods have difficulty with integer overflows in
+            // the sum of the normalised weight field.
             cellWeights.internalField()[cI] = max
             (
                 cellVertices[cI].size(),
-                1e-2       // Small but finite weight for empty cells
+                1e-2
             );
         }
 
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 90467dd0b8..9aba1ef477 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -267,13 +267,16 @@ private:
             bool distribute = true
         );
 
-        //- Insert a point-pair at a ppDist distance either side of
+        //- Create a point-pair at a ppDist distance either side of
         //  surface point surfPt, in the direction n
-        inline void insertPointPair
+        inline void createPointPair
         (
             const scalar ppDist,
             const Foam::point& surfPt,
-            const vector& n
+            const vector& n,
+            DynamicList<Foam::point>& pts,
+            DynamicList<label>& indices,
+            DynamicList<label>& types
         );
 
         //- Insert a Vb (a typedef of CGAL::indexedVertex<K>) with the
@@ -823,7 +826,7 @@ public:
             const scalarField& radiusSqrs
         ) const;
 
-        //- Conversion functions between point (OpenFOAM) and Point (CGAL)
+        //- Conversion functions between point (FOAM::) and Point (CGAL)
 
 #       ifdef CGAL_INEXACT
             typedef const Foam::point& pointFromPoint;
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 283ba501c9..b54bf8d027 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -1120,7 +1120,7 @@ void Foam::conformalVoronoiMesh::referVertices
                 {
                     // For the initial referred vertices, the original
                     // processor is the one that is sending it.
-                    label encodedProcI = -(procI + 1);
+                    label encodedProcI = Vb::encodeProcIndex(procI);
 
                     // Pout<< "Insert "
                     //     << parallelPoints[constructMap[i]]
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index fa67b7ab63..db39ea68dd 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -257,22 +257,27 @@ inline void Foam::conformalVoronoiMesh::insertPoint
 }
 
 
-inline void Foam::conformalVoronoiMesh::insertPointPair
+inline void Foam::conformalVoronoiMesh::createPointPair
 (
     const scalar ppDist,
     const Foam::point& surfPt,
-    const vector& n
+    const vector& n,
+    DynamicList<Foam::point>& pts,
+    DynamicList<label>& indices,
+    DynamicList<label>& types
 )
 {
     vector ppDistn = ppDist*n;
 
-    label master = insertPoint
-    (
-        surfPt - ppDistn,
-        number_of_vertices() + 1
-    );
+    // Master
+    pts.append(surfPt - ppDistn);
+    indices.append(0);
+    types.append(1);
 
-    insertPoint(surfPt + ppDistn, master);
+    // Slave
+    pts.append(surfPt + ppDistn);
+    types.append(1);
+    types.append(0);
 }
 
 
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
index a1fd6f3359..4250a317e2 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
@@ -252,6 +252,12 @@ public:
     }
 
 
+    inline static int encodeProcIndex(int procI)
+    {
+        return -(procI + 1);
+    }
+
+
     //- Set the point to be internal
     inline void setInternal()
     {