occ meshing, lock in block-allocator

libsrc/general/optmem.cpp

@@ -34,6 +34,9 @@ namespace netgen
   }
 
   void * BlockAllocator :: Alloc ()
+  {
+    void * p;
+#pragma omp critical (BlockAllocator)
     {
       //  return new char[size];
       if (!freelist)
@@ -49,16 +52,22 @@ namespace netgen
           freelist = hcp;
         }
       
-    void * p = freelist;
+      p = freelist;
       freelist = *(void**)freelist;
+    }
     return p;
   }
 
-  /*
   void BlockAllocator :: Free (void * p)
+  {
+#pragma omp critical (BlockAllocator)
+    {
+      if (bablocks.Size())
         {
           *(void**)p = freelist;
           freelist = p;
         }
-  */
+    }
+  }
+
 }

libsrc/general/optmem.hpp

@@ -46,12 +46,14 @@ public:
 
 
   ///
-  void Free (void * p)
+  void Free (void * p);
+  /*
   {
     if (!bablocks.Size()) return;
     *(void**)p = freelist;
     freelist = p;
   }
+  */
 
 
 private:

libsrc/meshing/meshclass.cpp

@@ -101,7 +101,6 @@ namespace netgen
   {
     NgLock lock(mutex);
     lock.Lock();
-
     points.SetSize(0);
     segments.SetSize(0);
     surfelements.SetSize(0);

libsrc/occ/occgenmesh.cpp

@@ -1281,7 +1281,7 @@ namespace netgen
       if (perfstepsstart <= MESHCONST_ANALYSE)
       {
         // delete mesh;
-         mesh = make_shared<Mesh>();
+        // mesh = make_shared<Mesh>();
          mesh->geomtype = Mesh::GEOM_OCC;
          
          OCCSetLocalMeshSize(geom,*mesh);