Use omp critical to simplify parallel triangulation. NFC.

solvespace · May 11, 2020 · e84fd46 · e84fd46
1 parent c355a47
commit e84fd46
Showing 1 changed file with 3 additions and 7 deletions.
diff --git a/src/srf/surface.cpp b/src/srf/surface.cpp
@@ -1050,16 +1050,12 @@ void SShell::MakeSectionEdgesInto(Vector n, double d, SEdgeList *sel, SBezierLis
 }
 
 void SShell::TriangulateInto(SMesh *sm) {
-    std::vector<SMesh> tm(surface.n);
-
 #pragma omp parallel for
     for(int i=0; i<surface.n; i++) {
         SSurface *s = &surface[i];
-        s->TriangulateInto(this, &tm[i]);
-    }
-
-    // merge the per-surface meshes
-    for (auto& m : tm) {
+        SMesh m;
+        s->TriangulateInto(this, &m);
+        #pragma omp critical
         sm->MakeFromCopyOf(&m);
         m.Clear();
     }