IOSS: Clean up fmt incldues

gsjaardema · gsjaardema · commit 4804cce518a1 · 2025-09-14T16:03:29.000-06:00
diff --git a/packages/seacas/applications/conjoin/CJ_ExodusEntity.h b/packages/seacas/applications/conjoin/CJ_ExodusEntity.h
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2020, 2022, 2023, 2024 National Technology & Engineering Solutions
+// Copyright(C) 1999-2020, 2022, 2023, 2024, 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.
 //
@@ -11,6 +11,7 @@
 #include <copy_string_cpp.h>
 #include <cstring>
 #include <exodusII.h>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <iostream>
 #include <string>
diff --git a/packages/seacas/applications/conjoin/Conjoin.C b/packages/seacas/applications/conjoin/Conjoin.C
@@ -5,6 +5,7 @@
 // See packages/seacas/LICENSE for details
 #include <algorithm>
 #include <exception>
+#include <fmt/format.h>
 #include <fmt/chrono.h>
 #include <fmt/ostream.h>
 #include <iomanip>
diff --git a/packages/seacas/applications/cpup/cpup.C b/packages/seacas/applications/cpup/cpup.C
@@ -12,6 +12,7 @@
 
 #include "add_to_log.h"
 
+#include "fmt/format.h"
 #include "fmt/ostream.h"
 #include "fmt/ranges.h"
 #include "format_time.h"
diff --git a/packages/seacas/applications/ejoin/EJ_mapping.C b/packages/seacas/applications/ejoin/EJ_mapping.C
@@ -15,6 +15,7 @@
 #include "Ioss_Sort.h"
 #include <algorithm>
 #include <cstddef>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <numeric>
 #include <utility>
diff --git a/packages/seacas/applications/ejoin/EJoin.C b/packages/seacas/applications/ejoin/EJoin.C
@@ -21,6 +21,7 @@
 #include <unistd.h>
 #include <vector>
 
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
 
diff --git a/packages/seacas/applications/epu/EP_SystemInterface.C b/packages/seacas/applications/epu/EP_SystemInterface.C
@@ -16,6 +16,7 @@
 #include <cstddef> // for size_t
 #include <cstdlib> // for strtol, abs, exit, strtoul, etc
 #include <cstring> // for strchr, strlen
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <glob.h>
 #include <sstream>
diff --git a/packages/seacas/applications/epu/epu.C b/packages/seacas/applications/epu/epu.C
@@ -18,6 +18,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <exception>
+#include <fmt/format.h>
 #include <fmt/chrono.h>
 #include <fmt/ostream.h>
 #include <limits>
diff --git a/packages/seacas/applications/exodiff/edge_block.C b/packages/seacas/applications/exodiff/edge_block.C
@@ -57,7 +57,7 @@ template <typename INT> void Edge_Block<INT>::entity_load_params()
             "\tnum edges per elmt = {}\n"
             "\tnum attributes     = {}\n"
             " ... Aborting...\n"),
-        fmt::group_digits(numEntity), num_edges_per_elmt, num_attr));
+        block.id, fmt::group_digits(numEntity), num_edges_per_elmt, num_attr));
   }
 }
 
diff --git a/packages/seacas/applications/exodiff/exo_block.C b/packages/seacas/applications/exodiff/exo_block.C
@@ -9,6 +9,7 @@
 #include "exodusII.h" // for ex_block, etc
 
 #include <cstdlib> // for exit, nullptr
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <smart_assert.h> // for SMART_ASSERT
 #include <string>         // for string, char_traits
@@ -60,7 +61,7 @@ template <typename INT> void Exo_Block<INT>::entity_load_params()
                      "\tnum nodes per elmt = {}\n"
                      "\tnum attributes     = {}\n"
                      " ... Aborting...\n"),
-        fmt::group_digits(numEntity), num_nodes_per_elmt, num_attr));
+        block.id, fmt::group_digits(numEntity), num_nodes_per_elmt, num_attr));
   }
 }
 
diff --git a/packages/seacas/applications/exodiff/exo_read.C b/packages/seacas/applications/exodiff/exo_read.C
@@ -22,6 +22,7 @@
 #include <cstdio>    // for fclose, FILE, fopen
 #include <cstdlib>   // for exit
 #include <cstring>   // for strlen
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
 #include <iostream>
diff --git a/packages/seacas/applications/exodiff/face_block.C b/packages/seacas/applications/exodiff/face_block.C
@@ -1,4 +1,4 @@
-// Copyright(C) 1999-, 20212021, , ,  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.
 //
@@ -57,7 +57,7 @@ template <typename INT> void Face_Block<INT>::entity_load_params()
             "\tnum faces per elmt = {}\n"
             "\tnum attributes     = {}\n"
             " ... Aborting...\n"),
-        fmt::group_digits(numEntity), num_faces_per_elmt, num_attr));
+        block.id, fmt::group_digits(numEntity), num_faces_per_elmt, num_attr));
   }
 }
 
diff --git a/packages/seacas/applications/exodiff/map.C b/packages/seacas/applications/exodiff/map.C
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <cfloat>
 #include <cstdlib>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <iomanip>
 #include <numeric>
diff --git a/packages/seacas/applications/nem_slice/elb_allo.C b/packages/seacas/applications/nem_slice/elb_allo.C
@@ -1,5 +1,5 @@
 /*
- * Copyright(C) 1999-2023 National Technology & Engineering Solutions
+ * Copyright(C) 1999-2023, 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.
  *
@@ -11,6 +11,7 @@
 #include <cstddef> // for size_t
 #include <cstdio>  // for stderr
 #include <cstdlib> // for exit, malloc
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 namespace {
diff --git a/packages/seacas/applications/nem_slice/elb_exo_util.C b/packages/seacas/applications/nem_slice/elb_exo_util.C
@@ -15,6 +15,7 @@
 #include <cstdio>  // for nullptr
 #include <cstdlib> // for malloc, free, calloc
 #include <cstring> // for strlen
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <string>
 #include <vector>
diff --git a/packages/seacas/applications/nem_spread/el_exoII_io.C b/packages/seacas/applications/nem_spread/el_exoII_io.C
@@ -9,6 +9,7 @@
 #include "el_check_monot.h" // for check_monot
 #include "el_elm.h"         // for HEXSHELL, NN_SIDE, etc
 #include "exodusII.h"       // for ex_inquire_int, etc
+#include "fmt/format.h"
 #include "fmt/ostream.h"
 #include "nem_spread.h"        // for NemSpread, second, etc
 #include "netcdf.h"            // for nc_set_fill, NC_NOFILL
@@ -848,7 +849,7 @@ void NemSpread<T, INT>::read_side_set_ids(int mesh_exoid, std::vector<INT> &num_
 
     if (globals.Num_Side_Set > 0) {
       for (int i = 0; i < globals.Num_Side_Set; i++) {
-        fmt::print("{:6d}{:11d}  {:12}\n", i, Side_Set_Ids[i],
+        fmt::print("{}\t{}\t\t{}\n", i, Side_Set_Ids[i],
                    fmt::group_digits(num_elem_in_ssets[i]));
       }
     }
diff --git a/packages/seacas/applications/nem_spread/pe_check_inp.C b/packages/seacas/applications/nem_spread/pe_check_inp.C
@@ -1,10 +1,11 @@
 /*
- * Copyright(C) 1999-2021 National Technology & Engineering Solutions
+ * Copyright(C) 1999-2021, 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.
  *
  * See packages/seacas/LICENSE for details
  */
+#include <fmt/format.h>
 #include "fmt/ostream.h"
 #include "nem_spread.h"     // for NemSpread
 #include "ps_pario_const.h" // for PIO_Info, Parallel_IO
diff --git a/packages/seacas/applications/nem_spread/pe_load_lb_info.C b/packages/seacas/applications/nem_spread/pe_load_lb_info.C
@@ -1,12 +1,13 @@
 /*
- * 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.
  *
  * See packages/seacas/LICENSE for details
  */
 #include "el_check_monot.h" // for check_monot
 #include "exodusII.h"       // for ex_inquire, ex_opts, etc
+#include <fmt/format.h>
 #include "fmt/ostream.h"
 #include "globals.h"     // for ELEM_COMM_MAP, etc
 #include "nem_spread.h"  // for NemSpread, etc
diff --git a/packages/seacas/applications/nem_spread/rf_allo.C b/packages/seacas/applications/nem_spread/rf_allo.C
@@ -1,11 +1,12 @@
 /*
- * Copyright(C) 1999-2020, 2022, 2023 National Technology & Engineering Solutions
+ * Copyright(C) 1999-2020, 2022, 2023, 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.
  *
  * See packages/seacas/LICENSE for details
  */
-#include "fmt/ostream.h"
+#include <fmt/format.h>
+#include <fmt/ostream.h>
 #include <cstdarg> // for va_arg, va_end, va_list, etc
 #include <cstddef> // for size_t
 #include <cstdio>  // for nullptr, stderr
diff --git a/packages/seacas/applications/nem_spread/rf_mesh_param.C b/packages/seacas/applications/nem_spread/rf_mesh_param.C
@@ -8,6 +8,7 @@
 
 #include "copy_string_cpp.h"
 #include "exodusII.h" // for MAX_LINE_LENGTH, ex_close, etc
+#include "fmt/format.h"
 #include "fmt/ostream.h"
 #include "globals.h"
 #include "nem_spread.h"
diff --git a/packages/seacas/applications/nem_spread/sort_utils.C b/packages/seacas/applications/nem_spread/sort_utils.C
@@ -10,6 +10,7 @@
 #if DEBUG_SORT
 #include <cassert>
 #include <cstdio>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #endif
 
diff --git a/packages/seacas/applications/zellij/Grid.C b/packages/seacas/applications/zellij/Grid.C
@@ -25,6 +25,7 @@
 #include <exodusII.h>
 #include <fmt/chrono.h>
 #include <fmt/color.h>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
 #include <open_file_limit.h>
diff --git a/packages/seacas/applications/zellij/Zellij.C b/packages/seacas/applications/zellij/Zellij.C
@@ -1,4 +1,4 @@
-// Copyright(C) 2021, 2022, 2023 National Technology & Engineering Solutions
+// Copyright(C) 2021, 2022, 2023, 2025, 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.
 //
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "add_to_log.h"
+#include "fmt/format.h"
 #include "fmt/chrono.h"
 #include "fmt/color.h"
 #include "fmt/ostream.h"
diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.C
@@ -15,6 +15,7 @@
 #include "tokenize.h"
 #include <algorithm>
 #include <cassert>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
 #include <numeric>
diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C b/packages/seacas/libraries/ioss/src/Ioss_FaceGenerator.C
@@ -17,6 +17,7 @@
 #include <array>
 #include <cassert>
 #include <cstdint>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <numeric>
 #include <vector>
diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C
@@ -26,6 +26,7 @@
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <iostream>
 #include <iterator>
diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C
@@ -22,6 +22,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <functional>
 #include <iostream>
diff --git a/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exonull/Ioexnl_ParallelDatabaseIO.C
@@ -22,6 +22,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 #include <functional>
 #include <iostream>
diff --git a/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C b/packages/seacas/libraries/ioss/src/utest/Utst_structured_decomp.C
@@ -104,18 +104,6 @@ void check_split_assign(std::vector<Iocgns::StructuredZoneData *> &zones,
       std::vector<size_t> work_vector(proc_count);
       Iocgns::Utils::assign_zones_to_procs(zones, work_vector, verbose);
 
-#if 0
-        fmt::print(stderr, "\nDecomposition for {} processors; Total work = {}, Average = {}\n",
-                   proc_count, fmt::group_digits((size_t)total_work), fmt::group_digits((size_t)avg_work));
-
-          for (const auto zone : zones) {
-            if (zone->is_active()) {
-              fmt::print(stderr, "Zone {}\tProc: {}\tOrdinal: {}x{}x{}\tWork: {}\n",
-                         zone->m_name, zone->m_proc, zone->m_ordinal[0], zone->m_ordinal[1],
-                         zone->m_ordinal[2], fmt::group_digits(zone->work()));
-            }
-          }
-#endif
       // Each active zone must be on a processor
       for (const auto zone : zones) {
         if (zone->is_active()) {
diff --git a/packages/seacas/libraries/suplib_cpp/iqsort.C b/packages/seacas/libraries/suplib_cpp/iqsort.C
@@ -6,6 +6,7 @@
 #include "iqsort.h"
 #include <assert.h>
 #include <cstdint>
+#include <fmt/format.h>
 #include <fmt/ostream.h>
 
 namespace {
diff --git a/packages/seacas/libraries/suplib_cpp/time_stamp.C b/packages/seacas/libraries/suplib_cpp/time_stamp.C
@@ -5,6 +5,7 @@
 // See packages/seacas/LICENSE for details
 
 #include <ctime>
+#include <fmt/format.h>
 #include <fmt/chrono.h>
 #include <time_stamp.h>
 

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ template <typename INT> void Edge_Block<INT>::entity_load_params()`
`57`	`57`	`"\tnum edges per elmt = {}\n"`
`58`	`58`	`"\tnum attributes = {}\n"`
`59`	`59`	`" ... Aborting...\n"),`
`60`		`- fmt::group_digits(numEntity), num_edges_per_elmt, num_attr));`
	`60`	`+ block.id, fmt::group_digits(numEntity), num_edges_per_elmt, num_attr));`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`#include "exodusII.h" // for ex_block, etc`
`10`	`10`
`11`	`11`	`#include <cstdlib> // for exit, nullptr`
	`12`	`+#include <fmt/format.h>`
`12`	`13`	`#include <fmt/ostream.h>`
`13`	`14`	`#include <smart_assert.h> // for SMART_ASSERT`
`14`	`15`	`#include <string> // for string, char_traits`
`@@ -60,7 +61,7 @@ template <typename INT> void Exo_Block<INT>::entity_load_params()`
`60`	`61`	`"\tnum nodes per elmt = {}\n"`
`61`	`62`	`"\tnum attributes = {}\n"`
`62`	`63`	`" ... Aborting...\n"),`
`63`		`- fmt::group_digits(numEntity), num_nodes_per_elmt, num_attr));`
	`64`	`+ block.id, fmt::group_digits(numEntity), num_nodes_per_elmt, num_attr));`
`64`	`65`	`}`
`65`	`66`	`}`
`66`	`67`