IOSS: Catalyst

Fixed Catalyst tests for element blocks when writing
connectivity_raw. Original code was scrambling the
connectivity in this case and causing test failures
with recent changes to io_shell --compare.

Author: tjotaha

packages/seacas/libraries/ioss/src/catalyst_tests/Iocatalyst_BlockMesh.C

@@ -236,30 +236,6 @@ namespace Iocatalyst {
     return conn;
   }
 
-  BlockMesh::BlockConn BlockMesh::getPartitionBlockConnectivityPointIDs(ID blockID) const
-  {
-    BlockConn conn;
-    Extent bounds = {extents.i + BLOCK_OFFSET, extents.j + BLOCK_OFFSET, extents.k + BLOCK_OFFSET};
-    Extent e      = getCoordsForID(blockID, bounds);
-    e.i -= partitionStart.i;
-    e.j -= partitionStart.j;
-    e.k -= partitionStart.k;
-
-    bounds = {partitionExtents.i + BLOCK_OFFSET, partitionExtents.j + BLOCK_OFFSET,
-              partitionExtents.k + BLOCK_OFFSET};
-
-    conn[0] = getIDfromCoords({e.i, e.j, e.k}, bounds);
-    conn[1] = getIDfromCoords({e.i + 1, e.j, e.k}, bounds);
-    conn[2] = getIDfromCoords({e.i + 1, e.j + 1, e.k}, bounds);
-    conn[3] = getIDfromCoords({e.i, e.j + 1, e.k}, bounds);
-    conn[4] = getIDfromCoords({e.i, e.j, e.k + 1}, bounds);
-    conn[5] = getIDfromCoords({e.i + 1, e.j, e.k + 1}, bounds);
-    conn[6] = getIDfromCoords({e.i + 1, e.j + 1, e.k + 1}, bounds);
-    conn[7] = getIDfromCoords({e.i, e.j + 1, e.k + 1}, bounds);
-
-    return conn;
-  }
-
   BlockMesh::ID BlockMesh::getGlobalIDForBlockID(ID blockID)
   {
     auto coords = getCoordsForID(blockID, getExtents());

packages/seacas/libraries/ioss/src/catalyst_tests/Iocatalyst_BlockMesh.h

@@ -68,7 +68,6 @@ namespace Iocatalyst {
     int           getNumPartitionBlocks() const;
     IDList        getPartitionBlockIDs() const;
     BlockConn     getBlockConnectivityPointIDs(ID blockID) const;
-    BlockConn     getPartitionBlockConnectivityPointIDs(ID blockID) const;
     static Extent getGlobalBlockExtents() { return {I_GLOBAL, J_GLOBAL, K_GLOBAL}; };
     ID            getGlobalIDForBlockID(ID blockID);
 

packages/seacas/libraries/ioss/src/catalyst_tests/Iocatalyst_BlockMeshSet.C

@@ -16,6 +16,7 @@
 #include <catalyst/Iocatalyst_DatabaseIO.h>
 #include <catalyst_tests/Iocatalyst_BlockMeshSet.h>
 #include <unordered_set>
+#include <algorithm>
 
 namespace Iocatalyst {
 
@@ -337,27 +338,26 @@ namespace Iocatalyst {
       BlockMesh::IDList globalElemIds;
       BlockMesh::IDList ids = bm.getPartitionBlockIDs();
 
-      if (iop.writeConnectivityRaw) {
-        for (int i = 0; i < ids.size(); i++) {
-          BlockMesh::BlockConn conn = bm.getPartitionBlockConnectivityPointIDs(ids[i]);
-          globalElemIds.push_back(bm.getGlobalIDForBlockID(ids[i]));
-          for (int j = 0; j < conn.size(); j++) {
-            connectivity[(i * 8) + j] = conn[j];
-          }
+      for (int i = 0; i < ids.size(); i++) {
+        BlockMesh::BlockConn conn = bm.getBlockConnectivityPointIDs(ids[i]);
+        globalElemIds.push_back(bm.getGlobalIDForBlockID(ids[i]));
+        for (int j = 0; j < conn.size(); j++) {
+          connectivity[(i * 8) + j] = bm.getGlobalIDForPointID(conn[j]);
         }
-        elemBlock->put_field_data("connectivity_raw", connectivity);
-      }
-      else {
-        for (int i = 0; i < ids.size(); i++) {
-          BlockMesh::BlockConn conn = bm.getBlockConnectivityPointIDs(ids[i]);
-          globalElemIds.push_back(bm.getGlobalIDForBlockID(ids[i]));
-          for (int j = 0; j < conn.size(); j++) {
-            connectivity[(i * 8) + j] = bm.getGlobalIDForPointID(conn[j]);
-          }
-        }
-        elemBlock->put_field_data("connectivity", connectivity);
       }
 
+      std::string conn_name = "connectivity";
+      if (iop.writeConnectivityRaw) {
+        conn_name = "connectivity_raw";
+	for (int i = 0; i < connectivity.size(); i++) {
+	  auto it = std::find(globalPointIds.begin(), globalPointIds.end(), connectivity[i]);
+	  if (it != globalPointIds.end()) {
+            int index = std::distance(globalPointIds.begin(), it);
+	    connectivity[i] = index + 1;
+	  }
+	}
+      }
+      elemBlock->put_field_data(conn_name, connectivity);
       elemBlock->put_field_data("ids", globalElemIds);
     }
   }