IOSS: Better diagnostics on io shell compare

Author: gsjaardema

packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.C

@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-2025 National Technology & Engineering Solutions
 // of Sandia, LLC (NTESS).  Under the terms of Contract DE-NA0003525 with
 // NTESS, the U.S. Government retains certain rights in this software.
 //
@@ -454,72 +454,78 @@ namespace Ioss {
       if (quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: N mismatch ({} vs. {})\n",
-                 fmt::join(this->m_ijk, ":"), fmt::join(rhs.m_ijk, ":"));
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: IJK mismatch ({} vs. {})\n",
+                 this->name(), fmt::join(this->m_ijk, ":"), fmt::join(rhs.m_ijk, ":"));
       same = false;
     }
 
     if (this->m_offset != rhs.m_offset) {
       if (quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: OFFSET mismatch ({} vs. {})\n",
-                 fmt::join(this->m_offset, ":"), fmt::join(rhs.m_offset, ":"));
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: OFFSET mismatch ({} vs. {})\n",
+                 this->name(), fmt::join(this->m_offset, ":"), fmt::join(rhs.m_offset, ":"));
       same = false;
     }
 
     if (this->m_ijkGlobal != rhs.m_ijkGlobal) {
       if (quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: Global N mismatch ({} vs. {})\n",
-                 fmt::join(this->m_ijkGlobal, ":"), fmt::join(rhs.m_ijkGlobal, ":"));
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Global N mismatch ({} vs. {})\n",
+                 this->name(), fmt::join(this->m_ijkGlobal, ":"), fmt::join(rhs.m_ijkGlobal, ":"));
       same = false;
     }
 
     if (this->m_nodeOffset != rhs.m_nodeOffset) {
       if (quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: Node Offset mismatch ({} vs. {})\n",
-                 this->m_nodeOffset, rhs.m_nodeOffset);
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Node Offset mismatch ({} vs. {})\n",
+                 this->name(), this->m_nodeOffset, rhs.m_nodeOffset);
       same = false;
     }
 
     if (this->m_cellOffset != rhs.m_cellOffset) {
       if (quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: Cell Offset mismatch ({} vs. {})\n",
-                 this->m_cellOffset, rhs.m_cellOffset);
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Cell Offset mismatch ({} vs. {})\n",
+                 this->name(), this->m_cellOffset, rhs.m_cellOffset);
       same = false;
     }
 
     if (this->m_nodeGlobalOffset != rhs.m_nodeGlobalOffset) {
       if (!quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: Node Global Offset mismatch ({} vs. {})\n",
-                 this->m_nodeGlobalOffset, rhs.m_nodeGlobalOffset);
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Node Global Offset mismatch ({} vs. {})\n",
+                 this->name(), this->m_nodeGlobalOffset, rhs.m_nodeGlobalOffset);
       same = false;
     }
 
     if (this->m_cellGlobalOffset != rhs.m_cellGlobalOffset) {
       if (quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: Cell Global Offset mismatch ({} vs. {})\n",
-                 this->m_cellGlobalOffset, rhs.m_cellGlobalOffset);
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Cell Global Offset mismatch ({} vs. {})\n",
+                 this->name(), this->m_cellGlobalOffset, rhs.m_cellGlobalOffset);
       same = false;
     }
 
     if (this->m_blockLocalNodeIndex != rhs.m_blockLocalNodeIndex) {
       if (quiet) {
         return false;
       }
+      if (this->m_blockLocalNodeIndex.size() != rhs.m_blockLocalNodeIndex.size()) {
       fmt::print(Ioss::OUTPUT(),
-                 "StructuredBlock: Block Local Node Index mismatch ({} entries vs. {} entries)\n",
-                 this->m_blockLocalNodeIndex.size(), rhs.m_blockLocalNodeIndex.size());
+                 "StructuredBlock {}: Block Local Node Index mismatch ({} entries vs. {} entries)\n",
+                 this->name(), this->m_blockLocalNodeIndex.size(), rhs.m_blockLocalNodeIndex.size());
+      }
+      else {
+	fmt::print(Ioss::OUTPUT(),
+		   "StructuredBlock {}: Block Local Node Index contents mismatch.\n", this->name());
+      }
       same = false;
     }
 
@@ -529,7 +535,7 @@ namespace Ioss {
       if (quiet) {
         return false;
       }
-      fmt::print(Ioss::OUTPUT(), "StructuredBlock: Global ID Map mismatch\n");
+      fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Global ID Map mismatch\n", this->name());
 
       same = false;
     }
@@ -549,8 +555,8 @@ namespace Ioss {
                    return l.m_connectionName < r.m_connectionName;
                  });
       if (!vec_equal(lhzc, rhzc)) {
-        fmt::print(Ioss::OUTPUT(), "StructuredBlock: Zone Connectivity mismatch (size {} vs {})\n",
-                   this->m_zoneConnectivity.size(), rhs.m_zoneConnectivity.size());
+        fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Zone Connectivity mismatch (size {} vs {})\n",
+                   this->name(), this->m_zoneConnectivity.size(), rhs.m_zoneConnectivity.size());
         same = false;
       }
     }
@@ -571,14 +577,14 @@ namespace Ioss {
                    return l.m_bcName < r.m_bcName;
                  });
       if (!vec_equal(lhbc, rhbc)) {
-        fmt::print(Ioss::OUTPUT(), "StructuredBlock: Boundary Conditions mismatch\n");
+        fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: Boundary Conditions mismatch\n", this->name());
         same = false;
       }
     }
 
     if (!quiet) {
       if (!Ioss::EntityBlock::equal(rhs)) {
-        fmt::print(Ioss::OUTPUT(), "StructuredBlock: EntityBlock mismatch\n");
+        fmt::print(Ioss::OUTPUT(), "StructuredBlock {}: EntityBlock mismatch\n", this->name());
         same = false;
       }
     }