Clang tidy cleanups (#722)

* Committing clang-format changes

* IOSS: Use enum class for Property Origin

* Committing clang-format changes

* IOSS: Eliminate ostringstream use in most IOSS_ERROR calls

* IOSS: Verify assumption with assert

* IOSS: Add clarifying comment about unreachable code

* Committing clang-format changes

* IOSS: Fix bad use of fmt

* Committing clang-format changes

* IOSS: More IOSS_ERROR refactors

* IOSS: Clean up includes

* Committing clang-format changes

* IOSS: Clean up includes

* IOSS: improve const correctness

* IOSS: modernize-return-braced-init-list fixes

* IOSS: Clang-tidy use contains

* IOSS: Add back include

* IOSS: Remove old code

* Committing clang-format changes

* IOSS: Clean up bad edit

* IOSS: Replace missing include file

* Committing clang-format changes

* SLICE: Fix missed email help change

* IOSS: Fix bad IOSS_ERROR conversion

* Committing clang-format changes

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Author: gsjaardema

packages/seacas/applications/slice/SL_SystemInterface.C

@@ -250,7 +250,8 @@ bool SystemInterface::parse_options(int argc, char **argv)
     fmt::print(stderr, "\n\t   Can also set options via SLICE_OPTIONS environment variable.\n");
     fmt::print(stderr, "\n\tDocumentation: "
                        "https://sandialabs.github.io/seacas-docs/sphinx/html/index.html#slice\n");
-    fmt::print(stderr, "\n\t->->-> Send email to gsjaardema@gmail.com for slice support.<-<-<-\n");
+    fmt::print(stderr,
+               "\n\t->->-> Send email to sierra-help@sandia.gov for slice support.<-<-<-\n");
     exit(EXIT_SUCCESS);
   }
 

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

@@ -1,4 +1,4 @@
-// Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions
+// Copyright(C) 1999-2021, 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.
 //
@@ -27,40 +27,33 @@ namespace {
 
     // Don't add an assembly to itself...
     if (assem == member) {
-      std::ostringstream errmsg;
-      fmt::print(errmsg,
-                 "\nERROR: Attempting to add assembly '{}' to itself.  This is not allowed.", name);
-      IOSS_ERROR(errmsg);
+      IOSS_ERROR(fmt::format(
+          "\nERROR: Attempting to add assembly '{}' to itself.  This is not allowed.", name));
     }
 
     // See if there is a member with this name...
     const Ioss::GroupingEntity *old_ge = assem->get_member(name);
 
     if (old_ge != nullptr) {
-      std::string        filename = assem->get_database()->get_filename();
-      int64_t            id1      = member->get_optional_property(id_str(), 0);
-      int64_t            id2      = old_ge->get_optional_property(id_str(), 0);
-      std::ostringstream errmsg;
-      fmt::print(errmsg,
-                 "\nERROR: There are multiple assembly members named '{}' "
-                 "defined in assembly '{}' in the database file '{}'.\n"
-                 "\tBoth {} {} and {} {} are named '{}'.  All names must be unique.",
-                 name, assem->name(), filename, member->type_string(), id1, old_ge->type_string(),
-                 id2, name);
-      IOSS_ERROR(errmsg);
+      std::string filename = assem->get_database()->get_filename();
+      int64_t     id1      = member->get_optional_property(id_str(), 0);
+      int64_t     id2      = old_ge->get_optional_property(id_str(), 0);
+      IOSS_ERROR(fmt::format("\nERROR: There are multiple assembly members named '{}' "
+                             "defined in assembly '{}' in the database file '{}'.\n"
+                             "\tBoth {} {} and {} {} are named '{}'.  All names must be unique.",
+                             name, assem->name(), filename, member->type_string(), id1,
+                             old_ge->type_string(), id2, name));
     }
 
     if (assem->member_count() > 0) {
       if (member->type() != assem->get_member_type()) {
-        std::ostringstream errmsg;
-        std::string        filename = assem->get_database()->get_filename();
-        fmt::print(errmsg,
-                   "\nERROR: The entity type of '{}' ({}) does not match the entity type of "
-                   "assembly '{}' ({}).\n\tAn assembly's member entities must be "
-                   "homogeneous. In the database file '{}'.\n",
-                   member->name(), member->type_string(), assem->name(), assem->contains_string(),
-                   filename);
-        IOSS_ERROR(errmsg);
+        std::string filename = assem->get_database()->get_filename();
+        IOSS_ERROR(
+            fmt::format("\nERROR: The entity type of '{}' ({}) does not match the entity type of "
+                        "assembly '{}' ({}).\n\tAn assembly's member entities must be "
+                        "homogeneous. In the database file '{}'.\n",
+                        member->name(), member->type_string(), assem->name(),
+                        assem->contains_string(), filename));
       }
     }
   }

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

@@ -149,8 +149,9 @@ namespace {
   {
     for (const auto &face : faces) {
       for (int i = 0; i < face.element_count(); i++) {
-        auto element                     = face.element[i] / 10 - offset;
-        auto side                        = face.element[i] % 10; // 0-based side
+        auto element = face.element[i] / 10 - offset;
+        auto side    = face.element[i] % 10; // 0-based side
+        assert(side < 6);
         face_connectivity[element][side] = &face;
       }
     }

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

@@ -6,19 +6,13 @@
 
 #include "Ioss_ChangeSet.h"
 
-#include "Ioss_CodeTypes.h"
 #include "Ioss_DBUsage.h"
 
-#include "Ioss_DynamicTopology.h"
 #include "Ioss_EntityBlock.h"
-#include "Ioss_EntityType.h"
-#include "Ioss_Field.h"
 #include "Ioss_FileInfo.h"
-#include "Ioss_GroupingEntity.h"
 #include "Ioss_IOFactory.h"
 
 #include <fmt/format.h>
-#include <fmt/ostream.h>
 
 #include <assert.h>
 #include <iomanip>

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

@@ -7,18 +7,11 @@
 #include "Ioss_ChangeSet.h"
 #include "Ioss_ChangeSetFactory.h"
 #include "Ioss_Utils.h" // for IOSS_ERROR
-#include "Ioss_Version.h"
-#include <fmt/format.h>
 #include <fmt/ostream.h>
-#include <fmt/ranges.h>
-#include <map>     // for _Rb_tree_iterator, etc
-#include <ostream> // for basic_ostream, etc
-#include <set>
+#include <map>    // for _Rb_tree_iterator, etc
 #include <string> // for char_traits, string, etc
 
 #include "Ioss_CodeTypes.h"
-#include "Ioss_DBUsage.h" // for DatabaseUsage
-#include "Ioss_PropertyManager.h"
 #include "Ioss_Region.h"
 
 namespace {

packages/seacas/libraries/ioss/src/Ioss_Compare.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.
 //
@@ -7,7 +7,6 @@
 #include <assert.h>
 #include <cmath>
 #include <fmt/ostream.h>
-#include <fmt/ranges.h>
 #include <iosfwd>
 #include <stdint.h>
 #include <stdlib.h>

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

@@ -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.
 //
@@ -457,48 +457,48 @@ std::string Ioss::TestOnly::label(int which, const char /*suffix_sep*/) const
 }
 
 // Define all factories here:
-void Ioss::Invalid_Storage::factory() { static Ioss::Invalid_Storage registerThis; }
+void Ioss::Invalid_Storage::factory() { static Ioss::Invalid_Storage const registerThis; }
 
-void Ioss::Scalar::factory() { static Ioss::Scalar registerThis; }
+void Ioss::Scalar::factory() { static Ioss::Scalar const registerThis; }
 
-void Ioss::Vector_2D::factory() { static Ioss::Vector_2D registerThis; }
+void Ioss::Vector_2D::factory() { static Ioss::Vector_2D const registerThis; }
 
-void Ioss::Vector_3D::factory() { static Ioss::Vector_3D registerThis; }
+void Ioss::Vector_3D::factory() { static Ioss::Vector_3D const registerThis; }
 
-void Ioss::Quaternion_2D::factory() { static Ioss::Quaternion_2D registerThis; }
+void Ioss::Quaternion_2D::factory() { static Ioss::Quaternion_2D const registerThis; }
 
-void Ioss::Quaternion_3D::factory() { static Ioss::Quaternion_3D registerThis; }
+void Ioss::Quaternion_3D::factory() { static Ioss::Quaternion_3D const registerThis; }
 
-void Ioss::Full_Tensor_36::factory() { static Ioss::Full_Tensor_36 registerThis; }
+void Ioss::Full_Tensor_36::factory() { static Ioss::Full_Tensor_36 const registerThis; }
 
-void Ioss::Full_Tensor_32::factory() { static Ioss::Full_Tensor_32 registerThis; }
+void Ioss::Full_Tensor_32::factory() { static Ioss::Full_Tensor_32 const registerThis; }
 
-void Ioss::Full_Tensor_22::factory() { static Ioss::Full_Tensor_22 registerThis; }
+void Ioss::Full_Tensor_22::factory() { static Ioss::Full_Tensor_22 const registerThis; }
 
-void Ioss::Full_Tensor_16::factory() { static Ioss::Full_Tensor_16 registerThis; }
+void Ioss::Full_Tensor_16::factory() { static Ioss::Full_Tensor_16 const registerThis; }
 
-void Ioss::Full_Tensor_12::factory() { static Ioss::Full_Tensor_12 registerThis; }
+void Ioss::Full_Tensor_12::factory() { static Ioss::Full_Tensor_12 const registerThis; }
 
-void Ioss::Sym_Tensor_33::factory() { static Ioss::Sym_Tensor_33 registerThis; }
+void Ioss::Sym_Tensor_33::factory() { static Ioss::Sym_Tensor_33 const registerThis; }
 
-void Ioss::Sym_Tensor_31::factory() { static Ioss::Sym_Tensor_31 registerThis; }
+void Ioss::Sym_Tensor_31::factory() { static Ioss::Sym_Tensor_31 const registerThis; }
 
-void Ioss::Sym_Tensor_21::factory() { static Ioss::Sym_Tensor_21 registerThis; }
+void Ioss::Sym_Tensor_21::factory() { static Ioss::Sym_Tensor_21 const registerThis; }
 
-void Ioss::Sym_Tensor_13::factory() { static Ioss::Sym_Tensor_13 registerThis; }
+void Ioss::Sym_Tensor_13::factory() { static Ioss::Sym_Tensor_13 const registerThis; }
 
-void Ioss::Sym_Tensor_11::factory() { static Ioss::Sym_Tensor_11 registerThis; }
+void Ioss::Sym_Tensor_11::factory() { static Ioss::Sym_Tensor_11 const registerThis; }
 
-void Ioss::Sym_Tensor_10::factory() { static Ioss::Sym_Tensor_10 registerThis; }
+void Ioss::Sym_Tensor_10::factory() { static Ioss::Sym_Tensor_10 const registerThis; }
 
-void Ioss::Asym_Tensor_03::factory() { static Ioss::Asym_Tensor_03 registerThis; }
+void Ioss::Asym_Tensor_03::factory() { static Ioss::Asym_Tensor_03 const registerThis; }
 
-void Ioss::Asym_Tensor_02::factory() { static Ioss::Asym_Tensor_02 registerThis; }
+void Ioss::Asym_Tensor_02::factory() { static Ioss::Asym_Tensor_02 const registerThis; }
 
-void Ioss::Asym_Tensor_01::factory() { static Ioss::Asym_Tensor_01 registerThis; }
+void Ioss::Asym_Tensor_01::factory() { static Ioss::Asym_Tensor_01 const registerThis; }
 
-void Ioss::Matrix_22::factory() { static Ioss::Matrix_22 registerThis; }
+void Ioss::Matrix_22::factory() { static Ioss::Matrix_22 const registerThis; }
 
-void Ioss::Matrix_33::factory() { static Ioss::Matrix_33 registerThis; }
+void Ioss::Matrix_33::factory() { static Ioss::Matrix_33 const registerThis; }
 
-void Ioss::TestOnly::factory() { static Ioss::TestOnly registerThis; }
+void Ioss::TestOnly::factory() { static Ioss::TestOnly const registerThis; }

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

@@ -317,11 +317,9 @@ void Ioss::copy_database(Ioss::Region &region, Ioss::Region &output_region,
   int min_step_count = dbi->util().global_minmax(step_count, Ioss::ParallelUtils::DO_MIN);
   int max_step_count = dbi->util().global_minmax(step_count, Ioss::ParallelUtils::DO_MAX);
   if (min_step_count != max_step_count) {
-    std::ostringstream errmsg;
-    fmt::print(errmsg,
-               "ERROR: Number of timesteps does not match on all ranks.  Range from {} to {}.\n",
-               min_step_count, max_step_count);
-    IOSS_ERROR(errmsg);
+    IOSS_ERROR(fmt::format(
+        "ERROR: Number of timesteps does not match on all ranks.  Range from {} to {}.\n",
+        min_step_count, max_step_count));
   }
 #endif
   for (int istep = 1; istep <= step_count; istep++) {
@@ -475,9 +473,7 @@ namespace {
     dbi->progress("DEFINING MODEL");
     if (!output_region.begin_mode(Ioss::STATE_DEFINE_MODEL)) {
       if (options.verbose) {
-        std::ostringstream errmsg;
-        fmt::print(errmsg, "ERROR: Could not put output region into define model state\n");
-        IOSS_ERROR(errmsg);
+        IOSS_ERROR("ERROR: Could not put output region into define model state\n");
       }
       else {
         std::exit(EXIT_FAILURE);

packages/seacas/libraries/ioss/src/Ioss_DatabaseIO.h

@@ -846,15 +846,15 @@ namespace Ioss {
     virtual int  num_internal_change_set_nl() { return 0; }
     virtual Ioss::NameList internal_change_set_describe_nl(bool /* return_full_names */)
     {
-      return Ioss::NameList();
+      return {};
     }
 
     virtual bool begin_nl(Ioss::State state) = 0;
     virtual bool end_nl(Ioss::State state)   = 0;
 
     virtual void                read_meta_data_nl() = 0;
     virtual void                get_step_times_nl() {}
-    virtual std::vector<double> get_db_step_times_nl() { return std::vector<double>(); }
+    virtual std::vector<double> get_db_step_times_nl() { return {}; }
 
     virtual bool begin_state_nl(int state, double time);
     virtual bool end_state_nl(int state, double time);

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

@@ -1,4 +1,4 @@
-// Copyright(C) 2024 National Technology & Engineering Solutions
+// Copyright(C) 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.
 //
@@ -8,9 +8,7 @@
 
 #include <algorithm>
 #include <assert.h>
-#include <climits>
 #include <cstddef>
-#include <functional>
 
 namespace Ioss {