[MOAB-dev] r4605 - in MOAB/branches/Version4.0/itaps: . igeom imesh

[jvporter at wisc.edu]

Author: jvporter
Date: 2011-03-17 16:18:50 -0500 (Thu, 17 Mar 2011)
New Revision: 4605

Modified:
   MOAB/branches/Version4.0/itaps/iBase.h
   MOAB/branches/Version4.0/itaps/igeom/iGeom.h
   MOAB/branches/Version4.0/itaps/igeom/iGeom_MOAB.cpp
   MOAB/branches/Version4.0/itaps/igeom/iGeom_MOAB.hpp
   MOAB/branches/Version4.0/itaps/igeom/testSmooth.cc
   MOAB/branches/Version4.0/itaps/igeom/testgeom.cc
   MOAB/branches/Version4.0/itaps/imesh/Makefile.am
   MOAB/branches/Version4.0/itaps/imesh/iMesh.h
   MOAB/branches/Version4.0/itaps/imesh/iMesh_MOAB.cpp
   MOAB/branches/Version4.0/itaps/imesh/iMesh_MOAB.hpp
   MOAB/branches/Version4.0/itaps/imesh/testc_cbind.c
Log:
Update to ITAPS 1.2 specification


Modified: MOAB/branches/Version4.0/itaps/iBase.h
===================================================================
--- MOAB/branches/Version4.0/itaps/iBase.h	2011-03-17 14:07:52 UTC (rev 4604)
+++ MOAB/branches/Version4.0/itaps/iBase.h	2011-03-17 21:18:50 UTC (rev 4605)
@@ -7,6 +7,11 @@
 {
 #endif
 
+#define IBASE_MINENUM(enumName) enumName ## _MIN
+#define IBASE_MAXENUM(enumName) enumName ## _MAX
+#define IBASE_NUMENUM(enumName) ((int)IBASE_MAXENUM(enumName) - (int)IBASE_MINENUM(enumName) + 1)
+#define IBASE_INCENUM(enumName,I) (I = (enum enumName)((int)I+1))
+
     /*==========================================================
      * TYPEDEF'S
      *==========================================================
@@ -15,19 +20,22 @@
   typedef struct iBase_EntityHandle_Private* iBase_EntityHandle;
   typedef struct iBase_EntitySetHandle_Private* iBase_EntitySetHandle;
   typedef struct iBase_TagHandle_Private* iBase_TagHandle;
-  typedef void* iBase_EntityIterator;
-  typedef void* iBase_EntityArrIterator;
+  typedef struct iBase_EntityIterator_Private* iBase_EntityIterator;
+  typedef struct iBase_EntityArrIterator_Private* iBase_EntityArrIterator;
 
+
     /*==========================================================
      * ENTITYTYPE ENUMERATION
      *==========================================================
      */
   enum iBase_EntityType {
-    iBase_VERTEX = 0,
+    iBase_EntityType_MIN = 0,
+    iBase_VERTEX = iBase_EntityType_MIN,
     iBase_EDGE,
     iBase_FACE,
     iBase_REGION,
-    iBase_ALL_TYPES
+    iBase_ALL_TYPES,
+    iBase_EntityType_MAX = iBase_ALL_TYPES
   };
 
     /*==========================================================
@@ -35,13 +43,16 @@
      *==========================================================
      */
   enum iBase_AdjacencyCost {
-    iBase_UNAVAILABLE = 0,          /**< Adjacency information not supported */
-    iBase_ALL_ORDER_1,              /**< No more than local mesh traversal required */
-    iBase_ALL_ORDER_LOGN,           /**< Global tree search */
-    iBase_ALL_ORDER_N,              /**< Global exhaustive search */