Skip to content

Commit

Permalink
Merge branch 'develop' into feature/rk_defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
@Steven-Roberts
Steven-Roberts committed Jan 28, 2025
2 parents 5d14239 + e9e8f5c commit daf6a11
Show file tree
Hide file tree
Showing 2,033 changed files with 2,551 additions and 2,604 deletions.
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/release.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ This is a list of tasks that need to be done before a SUNDIALS release.
* `doc/shared/History.rst`
* `doc/shared/sundials.bib`
* `doc/sundials/biblio.bib`
* `scripts/tarscript`
* `scripts/tarscript.sh`

The following files are no longer maintaianed:

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-ci-containers-e4s.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ci-containers-nightly.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Modifications to this file have been made under the folllowing copyright.
# -----------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/custom-jobs-and-variables.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Modifications to this file have been made under the folllowing copyright.
# -----------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/jobs/dane.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
##############################################################################
# ------------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/jobs/tioga.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
##############################################################################
# ------------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion .gitlab/subscribed-pipelines.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# Modifications to this file have been made under the folllowing copyright.
# -----------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# and Slaven Peles @ LLNL
# ---------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2002-2024, Lawrence Livermore National Security and Southern Methodist University.
Copyright (c) 2002-2025, Lawrence Livermore National Security and Southern Methodist University.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Programmer(s): Cody J. Balos @ LLNL
# ---------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Programmer(s): Daniel R. Reynolds @ SMU
# ---------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
4 changes: 2 additions & 2 deletions benchmarks/advection_reaction_3D/kokkos/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Programmer(s): Daniel R. Reynolds @ SMU
# ---------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand All @@ -22,7 +22,7 @@ if(BUILD_ARKODE
set(benchmark_target "advection_reaction_3D_kokkos.${backend}")

# benchmark source files
add_executable(
sundials_add_executable(
${benchmark_target}
advection_reaction_3D.cpp
arkode_driver.cpp
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/ParallelGrid.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* David J. Gardner, Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/advection_reaction_3D.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* David J. Gardner, Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/arkode_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): David J. Gardner, Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/check_retval.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/cvode_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/ida_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/kokkos/rhs3D.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* David J. Gardner, Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/advection_reaction_3D/raja/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Daniel R. Reynolds @ SMU
# ---------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down Expand Up @@ -33,7 +33,7 @@ if(BUILD_ARKODE
# MPI only
# ----------------------------------------------------------------------------

add_executable(
sundials_add_executable(
advection_reaction_3D_raja
advection_reaction_3D.cpp
arkode_driver.cpp
Expand Down Expand Up @@ -94,7 +94,7 @@ if(BUILD_ARKODE
set_source_files_properties(cvode_driver.cpp PROPERTIES LANGUAGE CUDA)
set_source_files_properties(ida_driver.cpp PROPERTIES LANGUAGE CUDA)

add_executable(
sundials_add_executable(
advection_reaction_3D_raja_mpicuda
advection_reaction_3D.cpp
arkode_driver.cpp
Expand Down Expand Up @@ -149,7 +149,7 @@ if(BUILD_ARKODE

if(BUILD_NVECTOR_HIP)

add_executable(
sundials_add_executable(
advection_reaction_3D_raja_mpihip
advection_reaction_3D.cpp
advection_reaction_3D.hpp
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/ParallelGrid.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Daniel R. Reynolds @ SMU
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/advection_reaction_3D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Daniel R. Reynolds @ SMU
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/advection_reaction_3D.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Daniel R. Reynolds @ SMU
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/arkode_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): David J. Gardner, Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/backends.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/check_retval.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/cvode_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/ida_driver.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): Cody J. Balos @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/raja/rhs3D.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Daniel R. Reynolds @ SMU
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/scripts/compare_error.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -----------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/scripts/compute_error.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -----------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/scripts/make_plots.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Programmer(s): Daniel R. Reynolds @ SMU
# ------------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/advection_reaction_3D/scripts/pickle_solution_output.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# -----------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/diffusion_2D/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Programmer(s): David J. Gardner @ LLNL
# ------------------------------------------------------------------------------
# SUNDIALS Copyright Start
# Copyright (c) 2002-2024, Lawrence Livermore National Security
# Copyright (c) 2002-2025, Lawrence Livermore National Security
# and Southern Methodist University.
# All rights reserved.
#
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/diffusion_2D/diffusion_2D.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): David J. Gardner @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/diffusion_2D/diffusion_2D.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): David J. Gardner @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/diffusion_2D/main_arkode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Programmer(s): David J. Gardner @ LLNL
* -----------------------------------------------------------------------------
* SUNDIALS Copyright Start
* Copyright (c) 2002-2024, Lawrence Livermore National Security
* Copyright (c) 2002-2025, Lawrence Livermore National Security
* and Southern Methodist University.
* All rights reserved.
*
Expand Down
Loading

0 comments on commit daf6a11

Please sign in to comment.