[Getfem-commits] r4562 - in /trunk/getfem/src: getfem/getfem_mesh_region.h getfem_mesh_region.cc

[andriy . andreykiv]

Author: andrico
Date: Thu Mar 27 16:31:41 2014
New Revision: 4562

URL: http://svn.gna.org/viewcvs/getfem?rev=4562&view=rev
Log:
put back index into mesh_region, to comply with the previous mesh_region 
interface

Modified:
    trunk/getfem/src/getfem/getfem_mesh_region.h
    trunk/getfem/src/getfem_mesh_region.cc

Modified: trunk/getfem/src/getfem/getfem_mesh_region.h
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem/getfem_mesh_region.h?rev=4562&r1=4561&r2=4562&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_mesh_region.h        (original)
+++ trunk/getfem/src/getfem/getfem_mesh_region.h        Thu Mar 27 16:31:41 2014
@@ -75,6 +75,7 @@
 
     struct impl {
       mutable map_t m;
+      mutable omp_distribute<dal::bit_vector> index_;
     };
 
 #ifdef GETFEM_HAVE_BOOST
@@ -189,7 +190,7 @@
 
     /**index of the region convexes, or the convexes from the partition on the 
     current thread*/
-    dal::bit_vector index() const;
+    const dal::bit_vector& index() const;
     void add(const dal::bit_vector &bv);
     void add(size_type cv, size_type f = size_type(-1));
     void sup(size_type cv, size_type f = size_type(-1));

Modified: trunk/getfem/src/getfem_mesh_region.cc
URL: 
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_region.cc?rev=4562&r1=4561&r2=4562&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_region.cc      (original)
+++ trunk/getfem/src/getfem_mesh_region.cc      Thu Mar 27 16:31:41 2014
@@ -197,9 +197,10 @@
 
 
   /* may be optimized .. */
-  dal::bit_vector  mesh_region::index() const 
-  {
-    dal::bit_vector convex_index;
+  const dal::bit_vector&  mesh_region::index() const 
+  {
+    dal::bit_vector& convex_index = rp().index_.thrd_cast();
+    convex_index.clear();
     for (const_iterator it = begin(); it != end(); ++it) 
     {
       if (it->second.any()) convex_index.add(it->first);