Merge branch 'develop' into ci/gitlab-dev-tests

LLNL · Jan 29, 2025 · 5cb6344 · 5cb6344
2 parents 4042b0b + f33b6d7
commit 5cb6344
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 16 deletions.
diff --git a/.github/workflows/build-ci-containers-e4s.yml b/.github/workflows/build-ci-containers-e4s.yml
@@ -26,7 +26,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push Docker images
-      uses: docker/build-push-action@v6.12.0
+      uses: docker/build-push-action@v6.13.0
       with:
           context: "./docker/sundials-ci/e4s-base"
           build-args: e4s_version=22.05
@@ -56,7 +56,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push Docker images
-      uses: docker/build-push-action@v6.12.0
+      uses: docker/build-push-action@v6.13.0
       with:
           context: "./docker/sundials-ci/e4s-quarterly"
           build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

diff --git a/.github/workflows/build-ci-containers-nightly.yml b/.github/workflows/build-ci-containers-nightly.yml
@@ -32,7 +32,7 @@ jobs:
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
     - name: Build and push Docker images
-      uses: docker/build-push-action@v6.12.0
+      uses: docker/build-push-action@v6.13.0
       with:
           context: "./docker/sundials-ci/spack-nightly"
           build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

diff --git a/.github/workflows/check-format.yml b/.github/workflows/check-format.yml
@@ -64,7 +64,7 @@ jobs:
           ./scripts/format.sh CMakeLists.txt benchmarks cmake examples include src test
 
       - name: Run git diff to see if anything changed
-        run: /usr/bin/git diff --name-only --exit-code
+        run: /usr/bin/git diff --exit-code
 
       - name: Run git diff if we failed
         if: failure()

diff --git a/.github/workflows/check-spelling.yml b/.github/workflows/check-spelling.yml
@@ -44,7 +44,7 @@ jobs:
           ./scripts/spelling.sh
 
       - name: Run git diff to see if anything changed
-        run: /usr/bin/git diff --name-only --exit-code
+        run: /usr/bin/git diff --exit-code
 
       - name: Run git diff if we failed
         if: failure()

diff --git a/.github/workflows/check-swig.yml b/.github/workflows/check-swig.yml
@@ -52,7 +52,7 @@ jobs:
           make all64
 
       - name: Run git diff to see if anything changed
-        run: /usr/bin/git diff --name-only --exit-code
+        run: /usr/bin/git diff --exit-code
 
       - name: Run git diff if we failed
         if: failure()

diff --git a/.github/workflows/test-address-sanitizer.yml b/.github/workflows/test-address-sanitizer.yml
@@ -21,6 +21,7 @@ jobs:
       image: ghcr.io/llnl/sundials-ci-int${{ matrix.indexsize }}-${{ matrix.precision }}:latest
       options: --user root
     strategy:
+      fail-fast: false
       max-parallel: 2
       matrix:
         indexsize: [32, 64]
@@ -46,14 +47,14 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: build_files
+          name: build_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
           path: |
             ${{ github.workspace }}/test/build_*
             !${{ github.workspace }}/test/build_*/Testing/output
       - name: Archive output files from failed build
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: output_files
+          name: output_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
           path: |
             ${{ github.workspace }}/test/build_*/Testing/
diff --git a/.github/workflows/ubuntu-clang-latest.yml b/.github/workflows/ubuntu-clang-latest.yml
@@ -61,7 +61,7 @@ jobs:
       uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: build_files
+        name: build_files_logging_level_${{ matrix.logging_level }}
         path: |
           ${{ github.workspace }}/build
           !${{ github.workspace }}/build/Testing/output
@@ -70,7 +70,7 @@ jobs:
       uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: output_files
+        name: output_files_logging_level_${{ matrix.logging_level }}
         path: |
           ${{ github.workspace }}/build/Testing/
 
@@ -104,7 +104,7 @@ jobs:
       uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: build_files
+        name: build_files_profiling_${{ matrix.profiling }}
         path: |
           ${{ github.workspace }}/build
           !${{ github.workspace }}/build/Testing/output
@@ -113,6 +113,6 @@ jobs:
       uses: actions/upload-artifact@v4
       if: failure()
       with:
-        name: output_files
+        name: output_files_profiling_${{ matrix.profiling }}
         path: |
           ${{ github.workspace }}/build/Testing/
diff --git a/.github/workflows/ubuntu-latest.yml b/.github/workflows/ubuntu-latest.yml
@@ -21,6 +21,7 @@ jobs:
       image: ghcr.io/llnl/sundials-ci-int${{ matrix.indexsize }}-${{ matrix.precision }}:latest
       options: --user root
     strategy:
+      fail-fast: false
       max-parallel: 2
       matrix:
         indexsize: [32, 64]
@@ -57,14 +58,14 @@ jobs:
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: build_files
+          name: build_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
           path: |
             ${{ github.workspace }}/test/build_*
             !${{ github.workspace }}/test/build_*/Testing/output
       - name: Archive output files from failed build
         uses: actions/upload-artifact@v4
         if: failure()
         with:
-          name: output_files
+          name: output_files_${{ matrix.indexsize }}_${{ matrix.precision }}_${{ matrix.buildtype }}_${{ matrix.tpls }}
           path: |
             ${{ github.workspace }}/test/build_*/Testing/
diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst
@@ -414,7 +414,7 @@ Accessible via the string ``"ARKODE_SHU_OSHER_3_2_3"`` to
    \renewcommand{\arraystretch}{1.5}
    \begin{array}{r|ccc}
      0 & 0 & 0 & 0 \\
-     1 & 0 & 0 & 0 \\
+     1 & 1 & 0 & 0 \\
      \frac{1}{2} & \frac{1}{4} & \frac{1}{4} & 0 \\
      \hline
      3 & \frac{1}{6} & \frac{1}{6} & \frac{2}{3} \\

diff --git a/tools/suntools/logs.py b/tools/suntools/logs.py
@@ -383,7 +383,7 @@ def get_history(log, key, step_status=None, time_range=None, step_range=None):
     for entry in log:
 
         step = np.longlong(entry["step"])
-        time = np.double(entry["t_n"])
+        time = np.double(entry["tn"])
 
         if time_range is not None:
             if time < time_range[0] or time > time_range[1]: