Merge branch 'develop' into feature/real-format3

LLNL · Jan 14, 2025 · e5380c4 · e5380c4
2 parents 9d06461 + 87fef53
commit e5380c4
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 14 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.10.0
+      uses: docker/build-push-action@v6.11.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.10.0
+      uses: docker/build-push-action@v6.11.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.10.0
+      uses: docker/build-push-action@v6.11.0
       with:
           context: "./docker/sundials-ci/spack-nightly"
           build-args: spack_yaml=./int${{ matrix.indexsize }}-${{ matrix.precision }}/spack.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@
 
 ### Bug Fixes
 
+Fixed the behavior of `SUNDIALS_ENABLE_ERROR_CHECKS` so additional runtime error
+checks are disabled by default with all release build types. Previously,
+`MinSizeRel` builds enabled additional error checking by default.
+
 Fixed bug in the ARKODE SPRKStep `SPRKStepReInit` function and `ARKodeReset` function
 with SPRKStep that could cause a segmentation fault when compensated summation is not
 used.

diff --git a/README.md b/README.md
@@ -95,7 +95,7 @@ David J. Gardner, Alan C. Hindmarsh, Daniel R. Reynolds, Steven B. Roberts, and
 Carol S. Woodward. We thank Radu Serban for significant and critical past
 contributions.
 
-Other contributors to SUNDIALS include: James Almgren-Bell, Lawrence E. Banks,
+Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell, Lawrence E. Banks,
 Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier,
 Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer,
 Yu Pan, Slaven Peles, Cosmin Petra, H. Hunter Schwartz, Jean M. Sexton,

diff --git a/cmake/SundialsBuildOptionsPre.cmake b/cmake/SundialsBuildOptionsPre.cmake
@@ -76,10 +76,10 @@ endif()
 # Option to enable/disable error checking
 # ---------------------------------------------------------------
 
-if(CMAKE_BUILD_TYPE MATCHES "Release|RelWithDebInfo")
-  set(_default_err_checks OFF)
-else()
+if(CMAKE_BUILD_TYPE MATCHES "Debug")
   set(_default_err_checks ON)
+else()
+  set(_default_err_checks OFF)
 endif()
 
 set(DOCSTR

diff --git a/doc/arkode/guide/source/Landing.rst b/doc/arkode/guide/source/Landing.rst
@@ -20,7 +20,7 @@
    Woodward. We thank Radu Serban for significant and critical past
    contributions.
 
-   Other contributors to SUNDIALS include: James Almgren-Bell,
+   Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell,
    Lawrence E. Banks, Peter N. Brown, George Byrne, Rujeko Chinomona,
    Scott D. Cohen, Aaron Collier, Keith E. Grant, Steven L. Lee,
    Shelby L. Lockhart, John Loffeld, Daniel McGreer, Yu Pan, Slaven Peles,

diff --git a/doc/arkode/guide/source/conf.py b/doc/arkode/guide/source/conf.py
@@ -51,7 +51,7 @@
 
 # General information about the project.
 project = u'User Documentation for ARKODE'
-copyright = u"""2012-{year}, Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos""".format(year = year)
+copyright = u"""2012-{year}, Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Cody J. Balos, Rujeko Chinomona, and Mustafa Aggul""".format(year = year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -217,8 +217,9 @@
     Daniel R. Reynolds$^1$,
     David J. Gardner$^2$,
     Carol S. Woodward$^2$,
+    Cody J. Balos$^2$
     Rujeko Chinomona$^3$, and
-    Cody J. Balos$^2$ \\
+    Mustafa Aggul$^1$ \\
     \\
     {\em $^1$Department of Mathematics, Southern Methodist University} \\
     {\em $^2$Center for Applied Scientific Computing, Lawrence Livermore National Laboratory} \\
@@ -275,7 +276,7 @@
 # (source start file, name, description, authors, manual section).
 man_pages = [
     ('index', 'ARKODE', u'ARKODE Documentation',
-     [u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos'], 1)
+     [u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Cody J. Balos, Rujeko Chinomona, and Mustafa Aggul'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -289,7 +290,7 @@
 #  dir menu entry, description, category)
 texinfo_documents = [
   ('index', 'ARKODE', u'ARKODE Documentation',
-   u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Rujeko Chinomona, and Cody J. Balos', 'ARKODE',
+   u'Daniel R. Reynolds, David J. Gardner, Carol S. Woodward, Cody J. Balos, Rujeko Chinomona, and Mustafa Aggul', 'ARKODE',
    'Time integration package for multi-rate systems of ordinary differential equations.',
    'Miscellaneous'),
 ]

diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst
@@ -4,6 +4,10 @@
 
 **Bug Fixes**
 
+Fixed the behavior of :cmakeop:`SUNDIALS_ENABLE_ERROR_CHECKS` so additional
+runtime error checks are disabled by default with all release build types.
+Previously, ``MinSizeRel`` builds enabled additional error checking by default.
+
 Fixed bug in the ARKODE SPRKStep :c:func:`SPRKStepReInit` function and
 :c:func:`ARKodeReset` function with SPRKStep that could cause a segmentation
 fault when compensated summation is not used.

diff --git a/doc/shared/latex/cover_pages.tex.txt b/doc/shared/latex/cover_pages.tex.txt
@@ -80,7 +80,7 @@ Carol S. Woodward. We thank Radu Serban for significant and critical past
 contributions.\\
 \vskip 2em%
 \noindent
-Other contributors to SUNDIALS include: James Almgren-Bell, Lawrence E. Banks,
+Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell, Lawrence E. Banks,
 Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier,
 Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer,
 Yu Pan, Slaven Peles, Cosmin Petra, Steven B. Roberts, H. Hunter Schwartz,

diff --git a/doc/superbuild/source/index.rst b/doc/superbuild/source/index.rst
@@ -143,7 +143,7 @@ contributors. The current SUNDIALS team consists of Cody J.  Balos,
 David J. Gardner, Alan C. Hindmarsh, Daniel R. Reynolds, and Carol S.
 Woodward. We thank Radu Serban for significant and critical past contributions.
 
-Other contributors to SUNDIALS include: James Almgren-Bell, Lawrence E. Banks,
+Other contributors to SUNDIALS include: Mustafa Aggul, James Almgren-Bell, Lawrence E. Banks,
 Peter N. Brown, George Byrne, Rujeko Chinomona, Scott D. Cohen, Aaron Collier,
 Keith E. Grant, Steven L. Lee, Shelby L. Lockhart, John Loffeld, Daniel McGreer,
 Yu Pan, Slaven Peles, Cosmin Petra, Steven B. Roberts, H. Hunter Schwartz,