[MOAB-dev] r4607 - MOAB/branches/Version4.0/itaps/imesh

[jvporter at wisc.edu]

Author: jvporter
Date: 2011-03-17 16:45:16 -0500 (Thu, 17 Mar 2011)
New Revision: 4607

Modified:
   MOAB/branches/Version4.0/itaps/imesh/iMesh_MOAB.cpp
Log:
Backport r4606


Modified: MOAB/branches/Version4.0/itaps/imesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/branches/Version4.0/itaps/imesh/iMesh_MOAB.cpp	2011-03-17 21:43:49 UTC (rev 4606)
+++ MOAB/branches/Version4.0/itaps/imesh/iMesh_MOAB.cpp	2011-03-17 21:45:16 UTC (rev 4607)
@@ -258,12 +258,19 @@
 // modify the adjacency table to match the ITAPS spec's expectations
 static void munge_adj_table(int *adjTable, int geom_dim)
 {
+    // If geom_dim is 2, 3D adjacencies are unavailable. This may change!
   if (geom_dim == 2) {
     for (size_t i = 0; i < 16; ++i) {
       if (i % 4 == 3 || i >= 12)
         adjTable[i] = iBase_UNAVAILABLE;
     }
   }
+
+    // Ensure that diagonal entries are only available/unavailable.
+  for (size_t i = 0; i < 16; i+=5) {
+    if (adjTable[i] != iBase_UNAVAILABLE)
+      adjTable[i] = iBase_AVAILABLE;
+  }
 }
 
 #ifdef __cplusplus