[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Getfem-commits] r5097 - in /trunk/getfem/src: getfem/getfem_mesh_region
From: |
logari81 |
Subject: |
[Getfem-commits] r5097 - in /trunk/getfem/src: getfem/getfem_mesh_region.h getfem_mesh_region.cc |
Date: |
Thu, 15 Oct 2015 08:27:56 -0000 |
Author: logari81
Date: Thu Oct 15 10:27:56 2015
New Revision: 5097
URL: http://svn.gna.org/viewcvs/getfem?rev=5097&view=rev
Log:
fix mesh_region::is_only_convexes()
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=5097&r1=5096&r2=5097&view=diff
==============================================================================
--- trunk/getfem/src/getfem/getfem_mesh_region.h (original)
+++ trunk/getfem/src/getfem/getfem_mesh_region.h Thu Oct 15 10:27:56 2015
@@ -228,6 +228,7 @@
bool is_only_convexes() const;
face_bitset faces_of_convex(size_type cv) const;
face_bitset and_mask() const;
+ face_bitset or_mask() const;
void error_if_not_faces() const;
void error_if_not_convexes() const;
void error_if_not_homogeneous() const;
Modified: trunk/getfem/src/getfem_mesh_region.cc
URL:
http://svn.gna.org/viewcvs/getfem/trunk/getfem/src/getfem_mesh_region.cc?rev=5097&r1=5096&r2=5097&view=diff
==============================================================================
--- trunk/getfem/src/getfem_mesh_region.cc (original)
+++ trunk/getfem/src/getfem_mesh_region.cc Thu Oct 15 10:27:56 2015
@@ -318,9 +318,9 @@
}
bool mesh_region::is_only_convexes() const
- {
+ {
return is_empty() ||
- (and_mask()[0] == true && and_mask().count() == 1);
+ (or_mask()[0] == true && or_mask().count() == 1);
}
bool mesh_region::is_only_faces() const
@@ -342,6 +342,15 @@
bs.set();
for (map_t::const_iterator it = rp().m.begin(); it != rp().m.end(); ++it)
if ( (*it).second.any() ) bs &= (*it).second;
+ return bs;
+ }
+
+ face_bitset mesh_region::or_mask() const
+ {
+ face_bitset bs;
+ if (rp().m.empty()) return bs;
+ for (map_t::const_iterator it = rp().m.begin(); it != rp().m.end(); ++it)
+ if ( (*it).second.any() ) bs |= (*it).second;
return bs;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Getfem-commits] r5097 - in /trunk/getfem/src: getfem/getfem_mesh_region.h getfem_mesh_region.cc,
logari81 <=