From a70803eecb9b6f534c6cc74748556328524cd50c Mon Sep 17 00:00:00 2001
From: Matthias Hochsteger <mhochsteger@cerbsim.com>
Date: Tue, 10 Sep 2019 16:59:31 +0200
Subject: [PATCH] Fix BuildEdgeList() - create sorted list

---
 libsrc/meshing/improve3.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/libsrc/meshing/improve3.cpp b/libsrc/meshing/improve3.cpp
index c841081d..0c48b38f 100644
--- a/libsrc/meshing/improve3.cpp
+++ b/libsrc/meshing/improve3.cpp
@@ -419,10 +419,12 @@ void MeshOptimize3d :: BuildEdgeList( const Mesh & mesh, const TABLE<ElementInde
     { { 0, 1 }, { 0, 2 }, { 0, 3 },
       { 1, 2 }, { 1, 3 }, { 2, 3 } };
 
-  Array<Array<std::tuple<PointIndex,PointIndex>>> thread_edges(ngcore::TaskManager::GetMaxThreads());
+  int ntasks = 2*ngcore::TaskManager::GetMaxThreads();
+  Array<Array<std::tuple<PointIndex,PointIndex>>> task_edges(ntasks);
 
-  ParallelForRange(mesh.Points().Range(), [&] (auto myrange)
+  ParallelFor(IntRange(ntasks), [&] (int ti)
   {
+    auto myrange = mesh.Points().Range().Split(ti, ntasks);
     ArrayMem<std::tuple<int,int>, 100> local_edges;
     for (auto pi : myrange)
     {
@@ -449,17 +451,17 @@ void MeshOptimize3d :: BuildEdgeList( const Mesh & mesh, const TABLE<ElementInde
       for(auto edge : local_edges)
           if(edge != edge_prev)
           {
-              thread_edges[ngcore::TaskManager::GetThreadId()].Append(edge);
+              task_edges[ti].Append(edge);
               edge_prev = edge;
           }
     }
-  }, 4*ngcore::TaskManager::GetNumThreads());
+  }, ntasks);
 
   int num_edges = 0;
-  for (auto & edg : thread_edges)
+  for (auto & edg : task_edges)
       num_edges += edg.Size();
   edges.SetAllocSize(num_edges);
-  for (auto & edg : thread_edges)
+  for (auto & edg : task_edges)
       edges.Append(edg);
 }