Merge branch 'fix_occ_heal' into 'master'

clear geom data in OCCGeometry::BuildFMap() (fixes broken meshing after Heal())

See merge request jschoeberl/netgen!465

libsrc/meshing/basegeom.cpp

@@ -199,6 +199,19 @@ namespace netgen
     }
   };
 
+  void NetgenGeometry :: Clear()
+  {
+      vertex_map.clear();
+      edge_map.clear();
+      face_map.clear();
+      solid_map.clear();
+
+      vertices.SetSize0();
+      edges.SetSize0();
+      faces.SetSize0();
+      solids.SetSize0();
+  }
+
   void NetgenGeometry :: ProcessIdentifications()
   {
       for(auto i : Range(vertices))

libsrc/meshing/basegeom.hpp

@@ -197,6 +197,7 @@ namespace netgen
 
     const GeometryFace & GetFace(int i) const { return *faces[i]; }
 
+    void Clear();
 
     virtual int GenerateMesh (shared_ptr<Mesh> & mesh, MeshingParameters & mparam);
 

libsrc/occ/occgeom.cpp

@@ -1107,6 +1107,12 @@ namespace netgen
 
       fsingular = esingular = vsingular = false;
 
+      NetgenGeometry::Clear();
+      edge_map.clear();
+      vertex_map.clear();
+      face_map.clear();
+      solid_map.clear();
+
       // Add shapes
       for(auto i1 : Range(1, vmap.Extent()+1))
       {