From 0edd5709906ac0dd1d54d55709631bd3072cd00e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joachim=20Sch=C3=B6berl?= <joachim.schoeberl@tuwien.ac.at>
Date: Sun, 20 Nov 2016 19:55:17 +0100
Subject: [PATCH] parallel clusters

---
 libsrc/meshing/clusters.cpp  | 45 ++++++++++++++++++++++++++++++++----
 libsrc/meshing/clusters.hpp  |  2 +-
 libsrc/meshing/meshclass.cpp |  2 +-
 3 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/libsrc/meshing/clusters.cpp b/libsrc/meshing/clusters.cpp
index 0bee5211..7e656b17 100644
--- a/libsrc/meshing/clusters.cpp
+++ b/libsrc/meshing/clusters.cpp
@@ -16,11 +16,13 @@ namespace netgen
     ;
   }
 
-  void AnisotropicClusters ::  Update()
+  void AnisotropicClusters ::  Update(TaskManager tm)
   {
     static int timer = NgProfiler::CreateTimer ("clusters");
+    static int timer1 = NgProfiler::CreateTimer ("clusters1");
+    static int timer2 = NgProfiler::CreateTimer ("clusters2");
     NgProfiler::RegionTimer reg (timer);
-    
+
     const MeshTopology & top = mesh.GetTopology();
 
     bool hasedges = top.HasEdges();
@@ -46,8 +48,10 @@ namespace netgen
     Array<int> nnums, ednums, fanums;
     int changed;
 
+    NgProfiler::StartTimer(timer1);    
 
   
+    /*
     for (int i = 1; i <= ne; i++)
       {
 	const Element & el = mesh.VolumeElement(i);
@@ -72,8 +76,41 @@ namespace netgen
 	for (int j = 0; j < nnums.Size(); j++)
 	  cluster_reps.Elem(nnums[j]) = nnums[j];
       }
+    */
+    ParallelForRange
+      (tm, ne,
+       [&] (size_t begin, size_t end)
+       {
+         Array<int> nnums, ednums, fanums;
+         for (int i = begin+1; i <= end; i++)
+           {
+             const Element & el = mesh.VolumeElement(i);
+             ELEMENT_TYPE typ = el.GetType();
+             
+             top.GetElementEdges (i, ednums);
+             top.GetElementFaces (i, fanums);
+             
+             int elnv = top.GetNVertices (typ);
+             int elned = ednums.Size();
+             int elnfa = fanums.Size();
+             
+             nnums.SetSize(elnv+elned+elnfa+1);
+             for (int j = 1; j <= elnv; j++)
+               nnums.Elem(j) = el.PNum(j);
+             for (int j = 1; j <= elned; j++)
+               nnums.Elem(elnv+j) = nv+ednums.Elem(j);
+             for (int j = 1; j <= elnfa; j++)
+               nnums.Elem(elnv+elned+j) = nv+ned+fanums.Elem(j);
+             nnums.Elem(elnv+elned+elnfa+1) = nv+ned+nfa+i;
+             
+             for (int j = 0; j < nnums.Size(); j++)
+               cluster_reps.Elem(nnums[j]) = nnums[j];
+           }
+       });
+    
 
-  
+    NgProfiler::StopTimer(timer1);
+    NgProfiler::StartTimer(timer2);      
 
     for (int i = 1; i <= nse; i++)
       {
@@ -264,7 +301,7 @@ namespace netgen
 	  }
       }
     while (changed);
-
+    NgProfiler::StopTimer(timer2);
     /*
       (*testout) << "cluster reps:" << endl;
       for (i = 1; i <= cluster_reps.Size(); i++)
diff --git a/libsrc/meshing/clusters.hpp b/libsrc/meshing/clusters.hpp
index fa0de93a..1a8fce99 100644
--- a/libsrc/meshing/clusters.hpp
+++ b/libsrc/meshing/clusters.hpp
@@ -27,7 +27,7 @@ public:
   AnisotropicClusters (const Mesh & amesh);
   ~AnisotropicClusters();
 
-  void Update();
+  void Update(TaskManager tm = &DummyTaskManager);
 
   int GetVertexRepresentant (int vnr) const
   { return cluster_reps.Get(vnr); }
diff --git a/libsrc/meshing/meshclass.cpp b/libsrc/meshing/meshclass.cpp
index 2423c03e..dd499c69 100644
--- a/libsrc/meshing/meshclass.cpp
+++ b/libsrc/meshing/meshclass.cpp
@@ -5670,7 +5670,7 @@ namespace netgen
   void Mesh :: UpdateTopology (TaskManager tm)
   {
     topology->Update(tm);
-    clusters->Update();
+    clusters->Update(tm);
 #ifdef PARALLEL
     if (paralleltop)
       {