Merge branch 'master' into lossy-compression

Signed-off-by: Greg Sjaardema <[email protected]>
sandialabs · Aug 28, 2024 · 45e6e96 · 45e6e96
2 parents b1798bc + 98ef6fd
commit 45e6e96
Show file tree

Hide file tree

Showing 69 changed files with 1,105 additions and 1,144 deletions.
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -88,7 +88,7 @@ jobs:
 # Configure and build
 ###
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.11'
 

diff --git a/.github/workflows/build_variant.yml b/.github/workflows/build_variant.yml
@@ -78,6 +78,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -94,6 +95,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -110,6 +112,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "thread" # address, integer, thread, memory, undefined
           }
         - {
@@ -126,6 +129,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "thread" # address, integer, thread, memory, undefined
           }
         - {
@@ -142,6 +146,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "address" # address, integer, thread, memory, undefined
           }
         - {
@@ -158,6 +163,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "undefined" # address, integer, thread, memory, undefined
           }
         - {
@@ -174,6 +180,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "integer" # address, integer, thread, memory, undefined
           }
         - {
@@ -190,6 +197,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "YES",
             extra: "",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -206,6 +214,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "APPLICATIONS=NO LEGACY=NO",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -222,6 +231,7 @@ jobs:
             use_catalyst2: "YES",
             gtest: "YES",
             extra: "",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -238,6 +248,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -254,6 +265,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "NO",
             extra: "OMIT_DEPRECATED=YES",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -270,6 +282,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "YES",
             extra: "MODERN=YES",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -286,6 +299,7 @@ jobs:
             use_catalyst2: "NO",
             gtest: "YES",
             extra: "",
+            extra_args: "",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
         - {
@@ -302,6 +316,58 @@ jobs:
             use_catalyst2: "NO",
             gtest: "YES",
             extra: "",
+            extra_args: "",
+            sanitizer: "NO" # address, integer, thread, memory, undefined
+          }
+        - {
+            name: "C++20 build serial clang",
+            os: ubuntu-latest,
+            compiler: "clang",
+            debug: "NO",
+            threadsafe: "NO",
+            fortran: "YES",
+            use_kokkos: "NO",
+            use_adios2: "NO",
+            use_faodel: "NO",
+            use_metis: "NO",
+            use_catalyst2: "NO",
+            gtest: "NO",
+            extra: "",
+            extra_args: "-DCMAKE_CXX_STANDARD:STRING=20",
+            sanitizer: "NO" # address, integer, thread, memory, undefined
+          }
+        - {
+            name: "C++20 build serial gnu",
+            os: ubuntu-latest,
+            compiler: "gnu",
+            debug: "NO",
+            threadsafe: "NO",
+            fortran: "YES",
+            use_kokkos: "NO",
+            use_adios2: "NO",
+            use_faodel: "NO",
+            use_metis: "NO",
+            use_catalyst2: "NO",
+            gtest: "NO",
+            extra: "",
+            extra_args: "-DCMAKE_CXX_STANDARD:STRING=20",
+            sanitizer: "NO" # address, integer, thread, memory, undefined
+          }
+        - {
+            name: "C++20 build parallel",
+            os: ubuntu-latest,
+            compiler: "mpi",
+            debug: "NO",
+            threadsafe: "NO",
+            fortran: "YES",
+            use_kokkos: "NO",
+            use_adios2: "NO",
+            use_faodel: "NO",
+            use_metis: "NO",
+            use_catalyst2: "NO",
+            gtest: "NO",
+            extra: "",
+            extra_args: "-DCMAKE_CXX_STANDARD:STRING=20",
             sanitizer: "NO" # address, integer, thread, memory, undefined
           }
     steps:
@@ -339,7 +405,7 @@ jobs:
           echo $HOME
           mkdir build
           cd build
-          NUMPROCS=2 ${{ matrix.config.extra }} THREADSAFE=${{ matrix.config.threadsafe }} DEBUG=${{ matrix.config.debug }} FORTRAN=${{ matrix.config.fortran }} SANITIZER=${{ matrix.config.sanitizer }} COMPILER=${{ matrix.config.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config
+          NUMPROCS=2 ${{ matrix.config.extra }} THREADSAFE=${{ matrix.config.threadsafe }} DEBUG=${{ matrix.config.debug }} FORTRAN=${{ matrix.config.fortran }} SANITIZER=${{ matrix.config.sanitizer }} COMPILER=${{ matrix.config.compiler }} INSTALL_PATH=${HOME}/environments/${{ matrix.config.compiler }}-${{ matrix.hdf5 }}-${{ matrix.netcdf }}-${{ matrix.cgns }} bash ../cmake-config ${{ matrix.config.extra_args }}
 
       - name: Build
         shell: bash -l {0}

diff --git a/.github/workflows/docker-exodus.yml b/.github/workflows/docker-exodus.yml
@@ -13,12 +13,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Docker login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Docker build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: docker/exodus
           push: true

diff --git a/.github/workflows/docker-seacas.yml b/.github/workflows/docker-seacas.yml
@@ -13,12 +13,12 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Docker login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Docker build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: docker/seacas
           push: true

diff --git a/.github/workflows/python-linting.yml b/.github/workflows/python-linting.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Install dependencies

diff --git a/packages/seacas/applications/cpup/cpup.C b/packages/seacas/applications/cpup/cpup.C
@@ -23,6 +23,7 @@
 #include <Ioss_SmartAssert.h>
 #include <Ioss_SubSystem.h>
 #include <Ioss_Utils.h>
+#include <Ioss_use_fmt.h>
 
 #include <cgns/Iocgns_Utils.h>
 
@@ -374,7 +375,7 @@ template <typename INT> void cpup(Cpup::SystemInterface &interFace, INT /*dummy*
             }
 
             // Now transfer the fields on the embedded node block...
-            auto pnb = pblock->get_node_block();
+            const auto &pnb = pblock->get_node_block();
             fields.clear();
             pnb.field_describe(Ioss::Field::TRANSIENT, &fields);
             for (const auto &field_name : fields) {

diff --git a/packages/seacas/applications/epu/epu.C b/packages/seacas/applications/epu/epu.C
@@ -1453,8 +1453,8 @@ int epu(SystemInterface &interFace, int start_part, int part_count, int cycle, T
             for (int ig = 0; ig < global_vars.count(InOut::IN); ig++) {
               if (proc_global_values[ig] != global_values[ig]) {
                 fmt::print(stderr,
-                           "At step {:{}}, Global Variable {:{}}, P{:0{}} = {:15.8g}, P{:0{}} = "
-                           "{:15.8g}\n",
+                           fmt::runtime("At step {:{}}, Global Variable {:{}}, P{:0{}} = {:15.8g}, P{:0{}} = "
+					"{:15.8g}\n"),
                            time_step + 1, ts_max + 1, ig + 1,
                            get_width(global_vars.count(InOut::IN)), start_part,
                            get_width(interFace.processor_count()), start_part + p,

diff --git a/packages/seacas/applications/exodiff/edge_block.C b/packages/seacas/applications/exodiff/edge_block.C
@@ -50,12 +50,12 @@ template <typename INT> void Edge_Block<INT>::entity_load_params()
 
   if (num_edges_per_elmt < 0 || num_attr < 0) {
     Error(fmt::format(
-        "Edge_Block<INT>::entity_load_params(): Data appears corrupt for edge block {}!\n"
-        "\tnum elmts          = {}\n"
-        "\tnum edges per elmt = {}\n"
-        "\tnum attributes     = {}\n"
-        " ... Aborting...\n",
-        fmt::group_digits(numEntity), num_edges_per_elmt, num_attr));
+		      fmt::runtime("Edge_Block<INT>::entity_load_params(): Data appears corrupt for edge block {}!\n"
+				   "\tnum elmts          = {}\n"
+				   "\tnum edges per elmt = {}\n"
+				   "\tnum attributes     = {}\n"
+				   " ... Aborting...\n"),
+		      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
@@ -53,11 +53,11 @@ template <typename INT> void Exo_Block<INT>::entity_load_params()
   elmt_type          = block.topology;
 
   if (num_nodes_per_elmt < 0 || num_attr < 0) {
-    Error(fmt::format("Exo_Block<INT>::entity_load_params(): Data appears corrupt for block {}!\n"
+    Error(fmt::format(fmt::runtime("Exo_Block<INT>::entity_load_params(): Data appears corrupt for block {}!\n"
                       "\tnum elmts          = {}\n"
                       "\tnum nodes per elmt = {}\n"
                       "\tnum attributes     = {}\n"
-                      " ... Aborting...\n",
+				   " ... Aborting...\n"),
                       fmt::group_digits(numEntity), num_nodes_per_elmt, num_attr));
   }
 }

diff --git a/packages/seacas/applications/exodiff/face_block.C b/packages/seacas/applications/exodiff/face_block.C
@@ -50,11 +50,11 @@ template <typename INT> void Face_Block<INT>::entity_load_params()
 
   if (num_faces_per_elmt < 0 || num_attr < 0) {
     Error(fmt::format(
-        "Face_Block<INT>::entity_load_params(): Data appears corrupt for face block {}!\n"
-        "\tnum elmts          = {}\n"
-        "\tnum faces per elmt = {}\n"
-        "\tnum attributes     = {}\n"
-        " ... Aborting...\n",
+		      fmt::runtime("Face_Block<INT>::entity_load_params(): Data appears corrupt for face block {}!\n"
+				   "\tnum elmts          = {}\n"
+				   "\tnum faces per elmt = {}\n"
+				   "\tnum attributes     = {}\n"
+				   " ... Aborting...\n"),
         fmt::group_digits(numEntity), num_faces_per_elmt, num_attr));
   }
 }

diff --git a/packages/seacas/applications/nem_slice/elb.h b/packages/seacas/applications/nem_slice/elb.h
@@ -14,7 +14,7 @@
 #include <string>
 #include <vector>
 
-#define ELB_VERSION "5.04 (2024/08/19)"
+#define ELB_VERSION "5.02 (2024-08-22)"
 #define UTIL_NAME   "nem_slice"
 #define ELB_FALSE   0
 #define ELB_TRUE    1