EXODIFF: Fix c++20 compilation

Author: gsjaardema

packages/seacas/applications/exodiff/check.C

@@ -326,54 +326,50 @@ namespace {
 
       if (interFace.map_flag != MapType::FILE_ORDER && !node_map.empty()) {
         for (size_t e = 0; is_same && e < num_element; ++e) {
-          for (size_t n = 0; is_same && n < nnpe; ++n) {
-            if (node_map[conn1[e * nnpe + n] - 1] + 1 != conn2[e * nnpe + n]) {
-              bool permuted = false;
-              if (interFace.allowPermutation) {
-                // Mismatch in ordered connectivity for this element... See if a permutation
-                // matches...
-                std::vector<INT> e1_conn(nnpe);
-                for (size_t i = 0; i < nnpe; i++) {
-                  e1_conn[i] = node_map[conn1[e * nnpe + i] - 1] + 1;
-                }
-                permuted = std::is_permutation(e1_conn.begin(), e1_conn.end(), &conn2[e],
-                                               &conn2[e + nnpe]);
-              }
-              if (!permuted) {
-                std::string permit_permute = interFace.allowPermutation ? " (or permuted)" : "";
-                Warning(fmt::format(
-                    ".. Connectivities in block id {} are not the same{}.\n"
-                    "                     First difference is node {} of local element {}\n",
-                    block1->Id(), permit_permute, n + 1, e + 1));
-                is_same = false;
-                break;
-              }
-            }
-          }
+	  for (size_t n = 0; is_same && n < nnpe; ++n) {
+	    if (node_map[conn1[e*nnpe+n] - 1] + 1 != conn2[e*nnpe+n]) {
+	      bool permuted = false;
+	      if (interFace.allowPermutation) {
+		// Mismatch in ordered connectivity for this element... See if a permutation matches...
+		std::vector<INT> e1_conn(nnpe);
+		for (size_t i = 0; i < nnpe; i++) {
+		  e1_conn[i] = node_map[conn1[e*nnpe+i] - 1] + 1;
+		}
+		permuted = std::is_permutation(e1_conn.begin(), e1_conn.end(), &conn2[e], &conn2[e+nnpe]);
+	      }
+	      if (!permuted) {
+		const std::string permit_permute = interFace.allowPermutation ? " (or permuted)" : "";
+		Warning(
+			fmt::format(fmt::runtime(".. Connectivities in block id {} are not the same{}.\n"
+						 "                     First difference is node {} of local element {}\n"),
+				    block1->Id(), permit_permute, n + 1, e + 1));
+		is_same = false;
+		break;
+	      }
+	    }
+	  }
         }
       }
       else {
         for (size_t e = 0; is_same && e < num_element; ++e) {
-          for (size_t n = 0; is_same && n < nnpe; ++n) {
-            if (conn1[e * nnpe + n] != conn2[e * nnpe + n]) {
-              bool permuted = false;
-              if (interFace.allowPermutation) {
-                // Mismatch in ordered connectivity for this element... See if a permutation
-                // matches...
-                permuted = std::is_permutation(&conn1[e * nnpe], &conn1[e * nnpe + nnpe],
-                                               &conn2[e * nnpe], &conn2[e * nnpe + nnpe]);
-              }
-              if (!permuted) {
-                std::string permit_permute = interFace.allowPermutation ? " (or permuted)" : "";
-                Warning(fmt::format(
-                    ".. Connectivities in block id {} are not the same{}.\n"
-                    "                     First difference is node {} of local element {}\n",
-                    block1->Id(), permit_permute, n + 1, e + 1));
-                is_same = false;
-                break;
-              }
-            }
-          }
+	  for (size_t n = 0; is_same && n < nnpe; ++n) {
+	    if (conn1[e*nnpe+n] != conn2[e*nnpe+n]) {
+	      bool permuted = false;
+	      if (interFace.allowPermutation) {
+		// Mismatch in ordered connectivity for this element... See if a permutation matches...
+		permuted = std::is_permutation(&conn1[e*nnpe], &conn1[e*nnpe+nnpe], &conn2[e*nnpe], &conn2[e*nnpe+nnpe]);
+	      }
+	      if (!permuted) {
+		const std::string permit_permute = interFace.allowPermutation ? " (or permuted)" : "";
+		Warning(
+			fmt::format(fmt::runtime(".. Connectivities in block id {} are not the same{}.\n"
+						 "                     First difference is node {} of local element {}\n"),
+				    block1->Id(), permit_permute, n + 1, e + 1));
+		is_same = false;
+		break;
+	      }
+	    }
+	  }
         }
       }
     }
@@ -392,30 +388,28 @@ namespace {
             auto   n1     = conn1[off1];
             auto   map_n1 = node_map.empty() ? n1 : node_map[n1 - 1] + 1;
             if (map_n1 != conn2[off2]) {
-              bool permuted = false;
-              if (interFace.allowPermutation) {
-                // Mismatch in ordered connectivity for this element... See if a permutation
-                // matches...
-                std::vector<INT> e1_conn(nnpe);
-                for (size_t i = 0; i < nnpe; i++) {
-                  n1         = conn1[off1];
-                  map_n1     = node_map.empty() ? n1 : node_map[n1 - 1] + 1;
-                  e1_conn[i] = map_n1;
-                }
-                permuted = std::is_permutation(e1_conn.begin(), e1_conn.end(), &conn2[e2 * nnpe],
-                                               &conn2[e2 * nnpe + nnpe]);
-              }
-              if (!permuted) {
-                std::string permit_permute = interFace.allowPermutation ? " (or permuted)" : "";
-                Warning(fmt::format(
-                    ".. Connectivities in block id {} are not the same{}.\n"
-                    "                     First difference is node {} of local element {} "
-                    "(file1) {} (file2)\n",
-                    block1->Id(), n + 1, e1 + 1, e2 + 1));
-                is_same = false;
-                break;
-              }
-            }
+	      bool permuted = false;
+	      if (interFace.allowPermutation) {
+		// Mismatch in ordered connectivity for this element... See if a permutation matches...
+		std::vector<INT> e1_conn(nnpe);
+		for (size_t i = 0; i < nnpe; i++) {
+		  n1     = conn1[off1];
+		  map_n1 = node_map.empty() ? n1 : node_map[n1 - 1] + 1;
+		  e1_conn[i] = map_n1;
+		}
+		permuted = std::is_permutation(e1_conn.begin(), e1_conn.end(), &conn2[e2 * nnpe], &conn2[e2 * nnpe + nnpe]);
+	      }
+	      if (!permuted) {
+		const std::string permit_permute = interFace.allowPermutation ? " (or permuted)" : "";
+		Warning(
+			fmt::format(fmt::runtime(".. Connectivities in block id {} are not the same{}.\n"
+				    "                     First difference is node {} of local element {} "
+						 "(file1) {} (file2)\n"),
+				    block1->Id(), n + 1, e1 + 1, e2 + 1));
+		is_same = false;
+		break;
+	      }
+	    }
           }
         }
       }