[MOAB-dev] r4287 - MOAB/trunk/itaps/imesh

[jvporter at wisc.edu]

Author: jvporter
Date: 2010-11-18 18:01:53 -0600 (Thu, 18 Nov 2010)
New Revision: 4287

Modified:
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
Log:
Fix getEntities type/topo consistency check for septahedra


Modified: MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2010-11-18 23:51:41 UTC (rev 4286)
+++ MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2010-11-19 00:01:53 UTC (rev 4287)
@@ -2401,9 +2401,13 @@
         && entity_topology < iMesh_ALL_TOPOLOGIES) {
       type = mb_topology_table[entity_topology];
       use_top = true;
+      
+      // Special-case handling for septahedra since we don't support them
       if (entity_type != iBase_ALL_TYPES && 
-          entity_topology != iMesh_SEPTAHEDRON &&
-          entity_type != CN::Dimension(type)) {
+          ((entity_topology != iMesh_SEPTAHEDRON &&
+            entity_type != CN::Dimension(type)) ||
+           (entity_topology == iMesh_SEPTAHEDRON &&
+            entity_type != iBase_REGION))) {
         ERROR(iBase_BAD_TYPE_AND_TOPO,
               "type and topology are inconsistant");
       }