Merge pull request #339 in SUNDIALS/sunrepo from release/5.2.0 to dev…

…elop Squashed commit of the following: commit 90a11174b26af1ddace057d45f4c798743a38237 Author: Balos, Cody Joe <[email protected]> Date: Mon Mar 30 13:31:25 2020 -0700 fix static linking for cusparse test commit a790e9ef76a824c0e51e94b2d6da92f7cb7aca78 Author: Balos, Cody Joe <[email protected]> Date: Mon Mar 30 11:07:19 2020 -0700 doc fix commit 8c47ef8739329a2eb4388d302dec6f251986e9b0 Author: Balos, Cody Joe <[email protected]> Date: Mon Mar 30 09:27:06 2020 -0700 update version numbers commit 2d8469cb51d561890ee3d05cf483a7b7f67e63aa Author: Balos, Cody Joe <[email protected]> Date: Mon Mar 30 09:25:21 2020 -0700 update recent changes commit c9c1f0c886f4bb38d3725c1e30a6dafee5c8f6da Author: Balos, Cody Joe <[email protected]> Date: Mon Mar 30 09:20:03 2020 -0700 regen Fortran 2003 interfaces
LLNL · Mar 31, 2020 · 8264ba5 · 8264ba5
1 parent 829db1b
commit 8264ba5
Show file tree

Hide file tree

Showing 31 changed files with 426 additions and 325 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -30,13 +30,13 @@ project(sundials C)
 # Set some variables with info on the SUNDIALS project
 set(PACKAGE_BUGREPORT "[email protected]")
 set(PACKAGE_NAME "SUNDIALS")
-set(PACKAGE_STRING "SUNDIALS 5.1.0")
+set(PACKAGE_STRING "SUNDIALS 5.2.0")
 set(PACKAGE_TARNAME "sundials")
 
 # set SUNDIALS version numbers
 # (use "" for the version label if none is needed)
 set(PACKAGE_VERSION_MAJOR "5")
-set(PACKAGE_VERSION_MINOR "1")
+set(PACKAGE_VERSION_MINOR "2")
 set(PACKAGE_VERSION_PATCH "0")
 set(PACKAGE_VERSION_LABEL "")
 
@@ -63,37 +63,37 @@ mark_as_advanced(CLEAR
 
 # Specify the VERSION and SOVERSION for shared libraries
 
-set(arkodelib_VERSION "4.1.0")
+set(arkodelib_VERSION "4.2.0")
 set(arkodelib_SOVERSION "4")
 
-set(cvodelib_VERSION "5.1.0")
+set(cvodelib_VERSION "5.2.0")
 set(cvodelib_SOVERSION "5")
 
-set(cvodeslib_VERSION "5.1.0")
+set(cvodeslib_VERSION "5.2.0")
 set(cvodeslib_SOVERSION "5")
 
-set(idalib_VERSION "5.1.0")
+set(idalib_VERSION "5.2.0")
 set(idalib_SOVERSION "5")
 
-set(idaslib_VERSION "4.1.0")
+set(idaslib_VERSION "4.2.0")
 set(idaslib_SOVERSION "4")
 
-set(kinsollib_VERSION "5.1.0")
+set(kinsollib_VERSION "5.2.0")
 set(kinsollib_SOVERSION "5")
 
 set(cpodeslib_VERSION "0.0.0")
 set(cpodeslib_SOVERSION "0")
 
-set(nveclib_VERSION "5.1.0")
+set(nveclib_VERSION "5.2.0")
 set(nveclib_SOVERSION "5")
 
-set(sunmatrixlib_VERSION "3.1.0")
+set(sunmatrixlib_VERSION "3.2.0")
 set(sunmatrixlib_SOVERSION "3")
 
-set(sunlinsollib_VERSION "3.1.0")
+set(sunlinsollib_VERSION "3.2.0")
 set(sunlinsollib_SOVERSION "3")
 
-set(sunnonlinsollib_VERSION "2.1.0")
+set(sunnonlinsollib_VERSION "2.2.0")
 set(sunnonlinsollib_SOVERSION "2")
 
 # Specify the location of additional CMAKE modules

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # SUNDIALS: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers #
-### Version 5.1.0 (Jan 2020) ###
+### Version 5.2.0 (Mar 2020) ###
 
 **Center for Applied Scientific Computing, Lawrence Livermore National Laboratory**
 

diff --git a/doc/arkode/ARKode.tex b/doc/arkode/ARKode.tex
diff --git a/doc/arkode/ARKode_example.tex b/doc/arkode/ARKode_example.tex
@@ -99,7 +99,7 @@
   {\centerline{\includegraphics[width=0.5\textwidth]{doc_logo_blue.pdf}}}
   \vfill
 }
-\release{4.1.0}
+\release{4.2.0}
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 

diff --git a/doc/arkode/SphinxDocs/examples/source/References.rst b/doc/arkode/SphinxDocs/examples/source/References.rst
@@ -23,8 +23,8 @@
    ==========
 
 .. [HSR2017] A.C. Hindmarsh, R. Serban and D.R. Reynolds. Example
-             Programs for CVODE v5.1.0. Technical Report
+             Programs for CVODE v5.2.0. Technical Report
              UCRL-SM-208110, LLNL, 2020.
 
 .. [R2018] D.R. Reynolds. User Documentation for ARKode
-           v4.1.0. Technical Report LLNL-CODE-667205, LLNL, 2020.
+           v4.2.0. Technical Report LLNL-CODE-667205, LLNL, 2020.
diff --git a/doc/arkode/SphinxDocs/examples/source/conf.py b/doc/arkode/SphinxDocs/examples/source/conf.py
@@ -49,9 +49,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.0'
+version = '4.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.0'
+release = '4.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/arkode/SphinxDocs/guide/source/History.rst b/doc/arkode/SphinxDocs/guide/source/History.rst
@@ -23,6 +23,7 @@ Appendix: SUNDIALS Release History
 ========  ===========  ===========  ===========  ===========  ===========  ===========  ===========
 Date      SUNDIALS     ARKode       CVODE        CVODES       IDA          IDAS         KINSOL
 ========  ===========  ===========  ===========  ===========  ===========  ===========  ===========
+Mar 2020  5.2.0        4.2.0        5.2.0        5.2.0        5.2.0        4.2.0        5.2.0
 Jan 2020  5.1.0        4.1.0        5.1.0        5.1.0        5.1.0        4.1.0        5.1.0
 Oct 2019  5.0.0        4.0.0        5.0.0        5.0.0        5.0.0        4.0.0        5.0.0
 Feb 2019  4.1.0        3.1.0        4.1.0        4.1.0        4.1.0        3.1.0        4.1.0

diff --git a/doc/arkode/SphinxDocs/guide/source/Introduction.rst b/doc/arkode/SphinxDocs/guide/source/Introduction.rst
@@ -107,7 +107,7 @@ preconditioner routines.
 Changes from previous versions
 --------------------------------
 
-Changes in 4.x
+Changes in v4.2.0
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Fixed a build system bug related to the Fortran 2003 interfaces when using the
@@ -162,7 +162,7 @@ these have been deprecated and will be removed in a future release.
 
 
 
-Changes in 4.1.0
+Changes in v4.1.0
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Fixed a build system bug related to finding LAPACK/BLAS.

diff --git a/doc/arkode/SphinxDocs/guide/source/References.rst b/doc/arkode/SphinxDocs/guide/source/References.rst
@@ -143,10 +143,10 @@
            Report UCRL-ID-141558, LLNL, 2000.
 
 .. [HS2017] A.C. Hindmarsh and R. Serban. User Documentation for CVODE
-            v5.1.0. Technical Report UCRL-SM-208108, LLNL, 2020.
+            v5.2.0. Technical Report UCRL-SM-208108, LLNL, 2020.
 
 .. [HSR2017] A.C. Hindmarsh, R. Serban and D.R. Reynolds. Example
-             Programs for CVODE v5.1.0. Technical Report
+             Programs for CVODE v5.2.0. Technical Report
              UCRL-SM-208110, LLNL, 2020.
 
 .. [HT1998] A.C. Hindmarsh and A.G. Taylor.  PVODE and KINSOL:

diff --git a/doc/arkode/SphinxDocs/guide/source/conf.py b/doc/arkode/SphinxDocs/guide/source/conf.py
@@ -50,9 +50,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.0'
+version = '4.2.0'
 # The full version, including alpha/beta/rc tags.
-release = '4.1.0'
+release = '4.2.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/doc/cvode/cv_intro.tex b/doc/cvode/cv_intro.tex
@@ -99,7 +99,7 @@ \section{Historical Background}\label{ss:history}
 
 \section{Changes from previous versions}
 
-\subsection*{Changes in v5.x}
+\subsection*{Changes in v5.2.0}
 
 Fixed a build system bug related to the Fortran 2003 interfaces when using the
 IBM XL compiler. When building the Fortran 2003 interfaces with an XL compiler

diff --git a/doc/cvodes/cvs_intro.tex b/doc/cvodes/cvs_intro.tex
@@ -117,7 +117,7 @@ \section{Historical Background}\label{ss:history}
 
 \section{Changes from previous versions}
 
-\subsection*{Changes in v5.x}
+\subsection*{Changes in v5.2.0}
 
 Fixed a build system bug related to the Fortran 2003 interfaces when using the
 IBM XL compiler. When building the Fortran 2003 interfaces with an XL compiler

diff --git a/doc/ida/ida_intro.tex b/doc/ida/ida_intro.tex
@@ -66,7 +66,7 @@ \chapter{Introduction}\label{s:intro}
 
 \section{Changes from previous versions}
 
-\subsection*{Changes in v5.x}
+\subsection*{Changes in v5.2.0}
 
 Fixed a build system bug related to the Fortran 2003 interfaces when using the
 IBM XL compiler. When building the Fortran 2003 interfaces with an XL compiler

diff --git a/doc/idas/idas_intro.tex b/doc/idas/idas_intro.tex
@@ -87,7 +87,7 @@ \chapter{Introduction}\label{s:intro}
 
 \section{Changes from previous versions}
 
-\subsection*{Changes in v4.x}
+\subsection*{Changes in v4.2.0}
 
 Fixed a build system bug related to the Fortran 2003 interfaces when using the
 IBM XL compiler. When building the Fortran 2003 interfaces with an XL compiler

diff --git a/doc/kinsol/kin_intro.tex b/doc/kinsol/kin_intro.tex
@@ -109,7 +109,7 @@ \section{Historical Background}\label{ss:history}
 
 \section{Changes from previous versions}
 
-\subsection*{Changes in v5.x}
+\subsection*{Changes in v5.2.0}
 
 Fixed a build system bug related to the Fortran 2003 interfaces when using the
 IBM XL compiler. When building the Fortran 2003 interfaces with an XL compiler

diff --git a/doc/sundials/biblio.bib b/doc/sundials/biblio.bib
@@ -16,7 +16,7 @@
 @techreport{arkode_ug,
 author={Daniel R. Reynolds and David J. Gardner and Alan C. Hindmarsh
 and Carol S. Woodward and Jean M. Sexton},
-title={{User Documentation for ARKODE v4.1.0}},
+title={{User Documentation for ARKODE v4.2.0}},
 institution={LLNL},
 number={LLNL-SM-668082},
 year=2020
@@ -26,7 +26,7 @@ @techreport{arkode_ug
 %
 @techreport{arkode_ex,
 author={Daniel R. Reynolds},
-title={{Example Programs for ARKODE v4.1.0}},
+title={{Example Programs for ARKODE v4.2.0}},
 institution={Southern Methodist University},
 year=2020
 }
@@ -35,7 +35,7 @@ @techreport{arkode_ex
 %
 @techreport{cvode_ug,
 author={A. C. Hindmarsh and R. Serban},
-title={{User Documentation for CVODE v5.1.0}},
+title={{User Documentation for CVODE v5.2.0}},
 institution={LLNL},
 number={UCRL-SM-208108},
 year=2020
@@ -45,7 +45,7 @@ @techreport{cvode_ug
 %
 @techreport{cvode_ex,
 author={A. C. Hindmarsh and R. Serban and D. R. Reynolds},
-title={{Example Programs for CVODE v5.1.0}},
+title={{Example Programs for CVODE v5.2.0}},
 institution={LLNL},
 note={UCRL-SM-208110},
 year=2020
@@ -55,7 +55,7 @@ @techreport{cvode_ex
 %
 @techreport{cvodes_ug,
 author={A. C. Hindmarsh and R. Serban},
-title={{User Documentation for CVODES v5.1.0}},
+title={{User Documentation for CVODES v5.2.0}},
 institution={LLNL},
 note={UCRL-SM-208111},
 year=2020
@@ -65,7 +65,7 @@ @techreport{cvodes_ug
 %
 @techreport{cvodes_ex,
 author={R. Serban and A. C. Hindmarsh},
-title={{Example Programs for CVODES v5.1.0}},
+title={{Example Programs for CVODES v5.2.0}},
 institution={LLNL},
 number={UCRL-SM-208115},
 year=2020
@@ -75,7 +75,7 @@ @techreport{cvodes_ex
 %
 @techreport{ida_ug,
 author={A. C. Hindmarsh and R. Serban and A. Collier},
-title={{User Documentation for IDA v5.1.0}},
+title={{User Documentation for IDA v5.2.0}},
 institution={LLNL},
 number={UCRL-SM-208112},
 year=2020
@@ -85,7 +85,7 @@ @techreport{ida_ug
 %
 @techreport{ida_ex,
 author={A. C. Hindmarsh and R. Serban and A. Collier},
-title={{Example Programs for IDA v5.1.0}},
+title={{Example Programs for IDA v5.2.0}},
 institution={LLNL},
 number={UCRL-SM-208113},
 year=2020
@@ -95,7 +95,7 @@ @techreport{ida_ex
 %
 @techreport{idas_ug,
 author={R. Serban and C. Petra and A. C. Hindmarsh},
-title={{User Documentation for IDAS v4.1.0}},
+title={{User Documentation for IDAS v4.2.0}},
 institution={LLNL},
 number={UCRL-SM-234051},
 year=2020
@@ -105,7 +105,7 @@ @techreport{idas_ug
 %
 @techreport{idas_ex,
 author={R. Serban and A. C. Hindmarsh},
-title={{Example Programs for IDAS v4.1.0}},
+title={{Example Programs for IDAS v4.2.0}},
 institution={LLNL},
 number={LLNL-TR-437091},
 year=2020
@@ -115,7 +115,7 @@ @techreport{idas_ex
 %
 @techreport{kinsol_ug,
 author={A. M. Collier and A. C. Hindmarsh and R. Serban and C.S. Woodward},
-title={{User Documentation for KINSOL v5.1.0}},
+title={{User Documentation for KINSOL v5.2.0}},
 institution={LLNL},
 number={UCRL-SM-208116},
 year=2020
@@ -125,7 +125,7 @@ @techreport{kinsol_ug
 %
 @techreport{kinsol_ex,
 author={A. M. Collier and R. Serban},
-title={{Example Programs for KINSOL v5.1.0}},
+title={{Example Programs for KINSOL v5.2.0}},
 institution={LLNL},
 number={UCRL-SM-208114},
 year=2020

diff --git a/doc/sundials/sundials_release_history.tex b/doc/sundials/sundials_release_history.tex
@@ -17,6 +17,7 @@ \chapter{SUNDIALS Release History}
     $^3${\cvode} and {\pvode} combined, $^4${\ida} written, $^5${\kinsol} written}\\ \hline}
 \begin{xtabular}{|ll|c|c|c|c|c|c|c|}
   %% Version Table
+Mar & 2020 & 5.2.0 & 4.2.0 & 5.2.0 & 5.2.0 & 5.2.0 & 4.2.0 & 5.2.0 \\
 Jan & 2020 & 5.1.0 & 4.1.0 & 5.1.0 & 5.1.0 & 5.1.0 & 4.1.0 & 5.1.0 \\
 Oct & 2019 & 5.0.0       & 4.0.0       & 5.0.0         & 5.0.0       & 5.0.0       & 4.0.0       & 5.0.0\\
 Feb & 2019 & 4.1.0       & 3.1.0       & 4.1.0         & 4.1.0       & 4.1.0       & 3.1.0       & 4.1.0\\

diff --git a/doc/sundials/ug.tex b/doc/sundials/ug.tex
@@ -59,29 +59,29 @@
 
 %----- VERSIONS AND UCRL NUMBERS OF SUNDIALS CODES
 
-\newcommand{\sunrelease}{v5.1.0}
+\newcommand{\sunrelease}{v5.2.0}
 
-\newcommand{\cvrelease}{v5.1.0}
+\newcommand{\cvrelease}{v5.2.0}
 \newcommand{\cvucrlug}{UCRL-SM-208108}
 \newcommand{\cvucrlex}{UCRL-SM-208110}
 
-\newcommand{\cvsrelease}{v5.1.0}
+\newcommand{\cvsrelease}{v5.2.0}
 \newcommand{\cvsucrlug}{UCRL-SM-208111}
 \newcommand{\cvsucrlex}{UCRL-SM-208115}
 
-\newcommand{\idarelease}{v5.1.0}
+\newcommand{\idarelease}{v5.2.0}
 \newcommand{\idaucrlug}{UCRL-SM-208112}
 \newcommand{\idaucrlex}{UCRL-SM-208113}
 
-\newcommand{\idasrelease}{v4.1.0}
+\newcommand{\idasrelease}{v4.2.0}
 \newcommand{\idasucrlug}{UCRL-SM-234051}
 \newcommand{\idasucrlex}{LLNL-TR-437091}
 
-\newcommand{\kinrelease}{v5.1.0}
+\newcommand{\kinrelease}{v5.2.0}
 \newcommand{\kinucrlug}{UCRL-SM-208116}
 \newcommand{\kinucrlex}{UCRL-SM-208114}
 
-\newcommand{\arkrelease}{v4.1.0}
+\newcommand{\arkrelease}{v4.2.0}
 \newcommand{\arkucrlug}{LLNL-SM-668082}
 \newcommand{\arkucrlex}{????-??-??????}
 

diff --git a/examples/sunmatrix/cusparse/CMakeLists.txt b/examples/sunmatrix/cusparse/CMakeLists.txt
@@ -37,6 +37,7 @@ if(LINK_LIBRARY_TYPE MATCHES "static")
   set(SUNDIALS_LIBS sundials_nvecserial_static
                     sundials_nveccuda_static
                     sundials_sunmatrixdense_static
+                    sundials_sunmatrixsparse_static
                     sundials_sunmatrixcusparse_static
                     ${EXTRA_LINK_LIBS})
 else()

diff --git a/recent_changes.md b/recent_changes.md
@@ -1,6 +1,6 @@
 # SUNDIALS Changelog
 
-## Changes to SUNDIALS in release 5.x
+## Changes to SUNDIALS in release 5.2.0
 
 Fixed a build system bug related to the Fortran 2003 interfaces when using the
 IBM XL compiler. When building the Fortran 2003 interfaces with an XL compiler

diff --git a/scripts/tarscript b/scripts/tarscript
@@ -43,13 +43,13 @@ function print_usage
 # VERSION NUMBERS
 #---------------------------------------------------------
 
-SUN_VER="5.1.0"
-CV_VER="5.1.0"
-CVS_VER="5.1.0"
-IDA_VER="5.1.0"
-IDAS_VER="4.1.0"
-KIN_VER="5.1.0"
-ARK_VER="4.1.0"
+SUN_VER="5.2.0"
+CV_VER="5.2.0"
+CVS_VER="5.2.0"
+IDA_VER="5.2.0"
+IDAS_VER="4.2.0"
+KIN_VER="5.2.0"
+ARK_VER="4.2.0"
 
 #---------------------------------------------------------
 # Test if the script is executed from within its directory

diff --git a/scripts/updateVersion.sh b/scripts/updateVersion.sh
@@ -19,7 +19,7 @@
 # development releases the label string is of the form "-dev.#" and for full
 # releases the label string is "".
 sun_major=${1:-5}
-sun_minor=${2:-1}
+sun_minor=${2:-2}
 sun_patch=${3:-0}
 sun_label=${4:""}
 month=${5:-$(date +"%b")}