[Getfem-commits] r4577 - /trunk/getfem/src/getfem_mesh_region.cc

[andriy . andreykiv]

Author: andrico
Date: Tue Apr  1 11:32:17 2014
New Revision: 4577

URL: http://svn.gna.org/viewcvs/getfem?rev=4577&view=rev
Log:
correcting mesh_region::merge operation 

Modified:
    trunk/getfem/src/getfem_mesh_region.cc

Modified: trunk/getfem/src/getfem_mesh_region.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_region.cc?rev=4577&r1=4576&r2=4577&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_region.cc      (original)
+++ trunk/getfem/src/getfem_mesh_region.cc      Tue Apr  1 11:32:17 2014
@@ -397,8 +397,14 @@
     GMM_ASSERT1(a.id() != all_convexes().id() &&
       b.id() != all_convexes().id(), "the 'all_convexes' regions "
       "are not supported for set operations");
-    for (const_iterator it = a.begin();it != a.end(); ++it) 
r.wp().m.insert(*it);
-    for (const_iterator it = b.begin();it != b.end(); ++it) 
r.wp().m.insert(*it);
+    for (const_iterator it = a.begin();it != a.end(); ++it)
+    { 
+      r.wp().m.insert(*it);
+    }
+    for (const_iterator it = b.begin();it != b.end(); ++it)
+    {
+      r.wp().m[it->first] |= it->second;
+    }
     return r;
   }