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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-10-20 08:57:15 -0500 (Wed, 20 Oct 2010)
New Revision: 4228

Modified:
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
Log:
Conform to upcomming ITAPS requirement that we fail if type and topo arguments are inconsistant.

As long as I was looking at that code anyway...



Modified: MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2010-10-20 01:07:26 UTC (rev 4227)
+++ MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2010-10-20 13:57:15 UTC (rev 4228)
@@ -2326,6 +2326,11 @@
         && entity_topology < iMesh_ALL_TOPOLOGIES) {
       type = mb_topology_table[entity_topology];
       use_top = true;
+      if (entity_type != iBase_ALL_TYPES && 
+          entity_type != CN::Dimension(type)) {
+        ERROR(iBase_BAD_TYPE_AND_TOPO,
+              "type and topology are inconsistant");
+      }
     }
     else if (entity_type >= iBase_VERTEX
              && entity_type <= iBase_ALL_TYPES)