EXODUS,IOSS,CI: Remove the BUILT_IN_SIERRA ifdef to help unify cmake/…

packages/seacas/Jamfile

@@ -1,5 +1,5 @@
 #---------------------------------------------------------------
-# Copyright(C) 1999-2020, 2024 National Technology & Engineering Solutions
+# Copyright(C) 1999-2020, 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.
 #
@@ -520,14 +520,12 @@ lib Ioss
     /tpl/parmetis//parmetis
     /tpl/fmt//fmt
     /mpi//mpi
-  : <define>BUILT_IN_SIERRA
+  :
     [ ifuserbuild
     # Any parameters within this 'ifuserbuild' block apply to user
     # builds only and will not be present for developer builds.
         <file>$(seacas-root)/lib/libIoss.a
     ]
-  :
-  : <define>BUILT_IN_SIERRA
   ;
 
 lib Iotr
@@ -615,7 +613,7 @@ lib exodus
         [ glob $(seacas-root)/libraries/exodus/src/deprecated/*.c ]
     ]
     /tpl/netcdf-c//netcdf
-  : <define>BUILT_IN_SIERRA
+  : <define>EXODUS_RELAXED_MULTIPLE_OPEN_CHECK
     [ ifdevbuild
     # Any parameters within this 'ifdevbuild' block apply to development
     # builds only and will not be present for user builds.
@@ -628,7 +626,7 @@ lib exodus
         <file>$(sierra-root)/seacas/lib/libexodus.a
     ]
   :
-  : <define>BUILT_IN_SIERRA
+  : <define>EXODUS_RELAXED_MULTIPLE_OPEN_CHECK
     [ ifdevbuild
     # Any parameters within this 'ifdevbuild' block apply to development
     # builds only and will not be present for user builds.

packages/seacas/libraries/aprepro_lib/strings.cc

@@ -62,10 +62,8 @@ std::vector<std::string> build_strings()
   strings.emplace_back(R"({cd = tand(180/4)}	{180-4*atand(cd)}	$ tan(180/4))");
   strings.emplace_back(R"()");
   strings.emplace_back(R"(Test max, min, sign, dim, abs)");
-  strings.emplace_back(
-      R"({pmin = min(0.5, 1.0)}	{nmin = min(-0.5, -1.0)} $ Should be 0.5, -1)");
-  strings.emplace_back(
-      R"({pmax = max(0.5, 1.0)}	{nmax = max(-0.5, -1.0)} $ Should be 1.0, -0.5)");
+  strings.emplace_back(R"({pmin = min(0.5, 1.0)}	{nmin = min(-0.5, -1.0)} $ Should be 0.5, -1)");
+  strings.emplace_back(R"({pmax = max(0.5, 1.0)}	{nmax = max(-0.5, -1.0)} $ Should be 1.0, -0.5)");
   strings.emplace_back(R"({zero = 0} {sign(0.5, zero) + sign(0.5, -zero)}	$ Should be 0 1)");
   strings.emplace_back(
       R"({nonzero = 1} {sign(0.5, nonzero) + sign(0.5, -nonzero)} $ Should be 1 0)");

packages/seacas/libraries/exodus/src/ex_conv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright(C) 1999-2021, 2024 National Technology & Engineering Solutions
+ * Copyright(C) 1999-2021, 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.
  *
@@ -60,7 +60,7 @@ int exi_check_multiple_open(const char *path, int mode, const char *func)
                  " File corruption or incorrect behavior can occur.\n",
                  path);
         ex_err(func, errmsg, EX_BADFILEID);
-#if defined BUILT_IN_SIERRA
+#if defined(EXODUS_RELAXED_MULTIPLE_OPEN_CHECK)
         EX_FUNC_LEAVE(EX_NOERR);
 #else
         EX_FUNC_LEAVE(EX_FATAL);
@@ -78,7 +78,6 @@ int exi_check_valid_file_id(int exoid, const char *func)
   if (exoid <= 0) {
     error = true;
   }
-#if !defined BUILT_IN_SIERRA
   else {
     int                   rootid = exoid & EX_FILE_ID_MASK;
     struct exi_file_item *file   = exi_find_file_item(rootid);
@@ -87,7 +86,6 @@ int exi_check_valid_file_id(int exoid, const char *func)
       error = true;
     }
   }
-#endif
 
   if (error) {
     int old_opt = ex_opts(EX_VERBOSE);

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

@@ -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.
 //
@@ -29,8 +29,11 @@ inline std::string IOSS_VECTOR_2D() { return {"vector_2d"}; }
 inline std::string IOSS_VECTOR_3D() { return {"vector_3d"}; }
 inline std::string IOSS_SYM_TENSOR() { return {"sym_tensor_33"}; }
 
-#if defined(BUILT_IN_SIERRA)
-#define MAP_USE_SORTED_VECTOR
+#if __has_include("SEACASIoss_config.h")
+// This is a CMake build
+#include "SEACASIoss_config.h"
+#else
+// This is not a CMake build
 #define SEACAS_HAVE_MPI
 /* #undef IOSS_THREADSAFE */
 /* #undef SEACAS_HAVE_KOKKOS */
@@ -39,8 +42,6 @@ inline std::string IOSS_SYM_TENSOR() { return {"sym_tensor_33"}; }
 #define SEACAS_HAVE_CGNS
 /* #undef SEACAS_HAVE_FAODEL */
 #define SEACAS_HAVE_PAMGEN
-#else
-#include "SEACASIoss_config.h"
 #endif
 
 #if defined(IOSS_THREADSAFE)

packages/seacas/libraries/ioss/src/Ioss_Map.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.
 //
@@ -15,7 +15,7 @@
 
 #include "ioss_export.h"
 
-#define MAP_USE_STD
+#define MAP_USE_SORTED_VECTOR
 #if defined MAP_USE_STD
 #include <unordered_map>
 #elif defined MAP_USE_HOPSCOTCH