Skip to content

Commit

Permalink
Merge pull request #136 in SUNDIALS/sunrepo from release-3.2.1 to master
Browse files Browse the repository at this point in the history
Squashed commit of the following:

commit c158a16
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Thu Oct 11 09:39:39 2018 -0700

    update version numbers for 3.2.1 release
  • Loading branch information
gardner48 committed Oct 16, 2018
1 parent 42ebf36 commit 8112342
Show file tree
Hide file tree
Showing 14 changed files with 61 additions and 46 deletions.
22 changes: 11 additions & 11 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ PROJECT(sundials C)
# Set some variables with info on the SUNDIALS project
SET(PACKAGE_BUGREPORT "woodward6@llnl.gov")
SET(PACKAGE_NAME "SUNDIALS")
SET(PACKAGE_STRING "SUNDIALS 3.2.0")
SET(PACKAGE_STRING "SUNDIALS 3.2.1")
SET(PACKAGE_TARNAME "sundials")

# set SUNDIALS version numbers
# (use "" for the version label if none is needed)
SET(PACKAGE_VERSION_MAJOR "3")
SET(PACKAGE_VERSION_MINOR "2")
SET(PACKAGE_VERSION_PATCH "0")
SET(PACKAGE_VERSION_PATCH "1")
SET(PACKAGE_VERSION_LABEL "")

IF(PACKAGE_VERSION_LABEL)
Expand All @@ -79,34 +79,34 @@ MARK_AS_ADVANCED(CLEAR

# Specify the VERSION and SOVERSION for shared libraries

SET(arkodelib_VERSION "2.2.0")
SET(arkodelib_VERSION "2.2.1")
SET(arkodelib_SOVERSION "2")

SET(cvodelib_VERSION "3.2.0")
SET(cvodelib_VERSION "3.2.1")
SET(cvodelib_SOVERSION "3")

SET(cvodeslib_VERSION "3.2.0")
SET(cvodeslib_VERSION "3.2.1")
SET(cvodeslib_SOVERSION "3")

SET(idalib_VERSION "3.2.0")
SET(idalib_VERSION "3.2.1")
SET(idalib_SOVERSION "3")

SET(idaslib_VERSION "2.2.0")
SET(idaslib_VERSION "2.2.1")
SET(idaslib_SOVERSION "2")

SET(kinsollib_VERSION "3.2.0")
SET(kinsollib_VERSION "3.2.1")
SET(kinsollib_SOVERSION "3")

SET(cpodeslib_VERSION "0.0.0")
SET(cpodeslib_SOVERSION "0")

SET(nveclib_VERSION "3.2.0")
SET(nveclib_VERSION "3.2.1")
SET(nveclib_SOVERSION "3")

SET(sunmatrixlib_VERSION "1.2.0")
SET(sunmatrixlib_VERSION "1.2.1")
SET(sunmatrixlib_SOVERSION "1")

SET(sunlinsollib_VERSION "1.2.0")
SET(sunlinsollib_VERSION "1.2.1")
SET(sunlinsollib_SOVERSION "1")

# Specify the location of additional CMAKE modules
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ your question to the SUNDIALS [mailing list](https://computation.llnl.gov/projec
## Release History ##
Date | SUNDIALS | ARKODE | CVODE | CVODES | IDA | IDAS | KINSOL
---------|----------|--------|-------|--------|-------|-------|--------
Oct 2018 | 3.2.1 | 2.2.1 | 3.2.1 | 3.2.1 | 3.2.1 | 2.2.1 | 3.2.1
Sep 2018 | 3.2.0 | 2.2.0 | 3.2.0 | 3.2.0 | 3.2.0 | 2.2.0 | 3.2.0
Jul 2018 | 3.1.2 | 2.1.2 | 3.1.2 | 3.1.2 | 3.1.2 | 2.1.2 | 3.1.2
May 2018 | 3.1.1 | 2.1.1 | 3.1.1 | 3.1.1 | 3.1.1 | 2.1.1 | 3.1.1
Expand Down
8 changes: 8 additions & 0 deletions README_DEV
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
2.1.1 3.1.1 3:0:0 3.0.0
2.1.2 3.1.2 3:0:0 3.0.0
2.2.0 3.2.0 3:0:0 3.0.0
2.2.1 3.2.1 3:0:0 3.0.0

CVODE
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -186,6 +187,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
3.1.1 3.1.1 2:0:0 2.0.0
3.1.2 3.1.2 3:0:0 3.0.0
3.2.0 3.2.0 3:0:0 3.0.0
3.2.1 3.2.1 3:0:0 3.0.0

CVODES
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -197,6 +199,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
3.1.1 3.1.1 3:0:0 3.0.0
3.1.2 3.1.2 3:0:0 3.0.0
3.2.0 3.2.0 3:0:0 3.0.0
3.2.1 3.2.1 3:0:0 3.0.0

IDA
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -208,6 +211,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
3.1.1 3.1.1 3:0:0 3.0.0
3.1.2 3.1.2 3:0:0 3.0.0
3.2.0 3.2.0 3:0:0 3.0.0
3.2.1 3.2.1 3:0:0 3.0.0

IDAS
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -217,6 +221,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
2.1.1 3.1.1 3:0:0 3.0.0
2.1.2 3.1.2 3:0:0 3.0.0
2.2.0 3.2.0 3:0:0 3.0.0
2.2.1 3.2.1 3:0:0 3.0.0

KINSOL
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -228,6 +233,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
3.1.1 3.1.1 3:0:0 3.0.0
3.1.2 3.1.2 3:0:0 3.0.0
3.2.0 3.2.0 3:0:0 3.0.0
3.2.1 3.2.1 3:0:0 3.0.0

NVEC_SER
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -239,6 +245,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
3.1.1 3.1.1 3:0:0 3.0.0
3.1.2 3.1.2 3:0:0 3.0.0
3.2.0 3.2.0 3:0:0 3.0.0
3.2.1 3.2.1 3:0:0 3.0.0

NVEC_PAR
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -250,3 +257,4 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
3.1.1 3.1.1 3:0:0 3.0.0
3.1.2 3.1.2 3:0:0 3.0.0
3.2.0 3.2.0 3:0:0 3.0.0
3.2.1 3.2.1 3:0:0 3.0.0
4 changes: 2 additions & 2 deletions doc/arkode/ARKode.tex
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
\clearpage
}

\title{User Documentation for ARKode v2.2.0\\
(SUNDIALS v3.2.0)}
\title{User Documentation for ARKode v2.2.1\\
(SUNDIALS v3.2.1)}
\author{
Daniel R. Reynolds$^1$, David J. Gardner$^2$, \\
Alan C. Hindmarsh$^2$, Carol S. Woodward$^2$ \\
Expand Down
2 changes: 1 addition & 1 deletion doc/arkode/ARKode_example.tex
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
{\centerline{\includegraphics[width=0.5\textwidth]{doc_logo_blue.pdf}}}
\vfill
}
\release{2.2.0}
\release{2.2.1}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


Expand Down
24 changes: 12 additions & 12 deletions doc/sundials/biblio.bib
Original file line number Diff line number Diff line change
Expand Up @@ -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 v2.2.0}},
title={{User Documentation for ARKODE v2.2.1}},
institution={LLNL},
number={LLNL-SM-668082},
year=2018
Expand All @@ -26,7 +26,7 @@ @techreport{arkode_ug
%
@techreport{arkode_ex,
author={Daniel R. Reynolds},
title={{Example Programs for ARKODE v2.2.0}},
title={{Example Programs for ARKODE v2.2.1}},
institution={Southern Methodist University},
year=2018
}
Expand All @@ -35,7 +35,7 @@ @techreport{arkode_ex
%
@techreport{cvode_ug,
author={A. C. Hindmarsh and R. Serban},
title={{User Documentation for CVODE v3.2.0}},
title={{User Documentation for CVODE v3.2.1}},
institution={LLNL},
number={UCRL-SM-208108},
year=2018
Expand All @@ -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 v3.2.0}},
title={{Example Programs for CVODE v3.2.1}},
institution={LLNL},
note={UCRL-SM-208110},
year=2018
Expand All @@ -55,7 +55,7 @@ @techreport{cvode_ex
%
@techreport{cvodes_ug,
author={A. C. Hindmarsh and R. Serban},
title={{User Documentation for CVODES v3.2.0}},
title={{User Documentation for CVODES v3.2.1}},
institution={LLNL},
note={UCRL-SM-208111},
year=2018
Expand All @@ -65,7 +65,7 @@ @techreport{cvodes_ug
%
@techreport{cvodes_ex,
author={R. Serban and A. C. Hindmarsh},
title={{Example Programs for CVODES v3.2.0}},
title={{Example Programs for CVODES v3.2.1}},
institution={LLNL},
number={UCRL-SM-208115},
year=2017
Expand All @@ -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 v3.2.0}},
title={{User Documentation for IDA v3.2.1}},
institution={LLNL},
number={UCRL-SM-208112},
year=2018
Expand All @@ -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 v3.2.0}},
title={{Example Programs for IDA v3.2.1}},
institution={LLNL},
number={UCRL-SM-208113},
year=2018
Expand All @@ -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 v2.2.0}},
title={{User Documentation for IDAS v2.2.1}},
institution={LLNL},
number={UCRL-SM-234051},
year=2018
Expand All @@ -105,7 +105,7 @@ @techreport{idas_ug
%
@techreport{idas_ex,
author={R. Serban and A. C. Hindmarsh},
title={{Example Programs for IDAS v2.2.0}},
title={{Example Programs for IDAS v2.2.1}},
institution={LLNL},
number={LLNL-TR-437091},
year=2018
Expand All @@ -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 v3.2.0}},
title={{User Documentation for KINSOL v3.2.1}},
institution={LLNL},
number={UCRL-SM-208116},
year=2018
Expand All @@ -125,7 +125,7 @@ @techreport{kinsol_ug
%
@techreport{kinsol_ex,
author={A. M. Collier and R. Serban},
title={{Example Programs for KINSOL v3.2.0}},
title={{Example Programs for KINSOL v3.2.1}},
institution={LLNL},
number={UCRL-SM-208114},
year=2018
Expand Down
14 changes: 7 additions & 7 deletions doc/sundials/ug.tex
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@

%----- VERSIONS AND UCRL NUMBERS OF SUNDIALS CODES

\newcommand{\sunrelease}{v3.2.0}
\newcommand{\sunrelease}{v3.2.1}

\newcommand{\cvrelease}{v3.2.0}
\newcommand{\cvrelease}{v3.2.1}
\newcommand{\cvucrlug}{UCRL-SM-208108}
\newcommand{\cvucrlex}{UCRL-SM-208110}

\newcommand{\cvsrelease}{v3.2.0}
\newcommand{\cvsrelease}{v3.2.1}
\newcommand{\cvsucrlug}{UCRL-SM-208111}
\newcommand{\cvsucrlex}{UCRL-SM-208115}

\newcommand{\idarelease}{v3.2.0}
\newcommand{\idarelease}{v3.2.1}
\newcommand{\idaucrlug}{UCRL-SM-208112}
\newcommand{\idaucrlex}{UCRL-SM-208113}

\newcommand{\idasrelease}{v2.2.0}
\newcommand{\idasrelease}{v2.2.1}
\newcommand{\idasucrlug}{UCRL-SM-234051}
\newcommand{\idasucrlex}{LLNL-TR-437091}

\newcommand{\kinrelease}{v3.2.0}
\newcommand{\kinrelease}{v3.2.1}
\newcommand{\kinucrlug}{UCRL-SM-208116}
\newcommand{\kinucrlex}{UCRL-SM-208114}

\newcommand{\arkrelease}{v2.2.0}
\newcommand{\arkrelease}{v2.2.1}
\newcommand{\arkucrlug}{LLNL-SM-668082}
\newcommand{\arkucrlex}{????-??-??????}

Expand Down
14 changes: 7 additions & 7 deletions scripts/tarscript
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ function print_usage
# VERSION NUMBERS
#---------------------------------------------------------

SUN_VER="3.2.0"
CV_VER="3.2.0"
CVS_VER="3.2.0"
IDA_VER="3.2.0"
IDAS_VER="2.2.0"
KIN_VER="3.2.0"
ARK_VER="2.2.0"
SUN_VER="3.2.1"
CV_VER="3.2.1"
CVS_VER="3.2.1"
IDA_VER="3.2.1"
IDAS_VER="2.2.1"
KIN_VER="3.2.1"
ARK_VER="2.2.1"

#---------------------------------------------------------
# Test if the script is executed from within its directory
Expand Down
3 changes: 2 additions & 1 deletion src/arkode/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARKODE
Release 2.2.0, Sept 2018
Release 2.2.1, Oct. 2018
Daniel R. Reynolds
Department of Mathematics, SMU

Expand Down Expand Up @@ -64,6 +64,7 @@ C. References
D. Releases
-----------

v. 2.2.1 - Oct. 2018
v. 2.2.0 - Sep. 2018
v. 2.1.2 - Jul. 2018
v. 2.1.1 - May 2018
Expand Down
3 changes: 2 additions & 1 deletion src/cvode/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CVODE
Release 3.2.0, Sept 2018
Release 3.2.1, Oct 2018
Alan C. Hindmarsh and Radu Serban
Center for Applied Scientific Computing, LLNL

Expand Down Expand Up @@ -74,6 +74,7 @@ C. References
D. Releases
-----------

v. 3.2.1 - Oct. 2018
v. 3.2.0 - Sep. 2018
v. 3.1.2 - Jul. 2018
v. 3.1.1 - May 2018
Expand Down
3 changes: 2 additions & 1 deletion src/cvodes/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CVODES
Release 3.2.0, Sept 2018
Release 3.2.1, Oct 2018
Alan C. Hindmarsh and Radu Serban
Center for Applied Scientific Computing, LLNL

Expand Down Expand Up @@ -72,6 +72,7 @@ C. References
D. Releases
-----------

v. 3.2.1 - Oct. 2018
v. 3.2.0 - Sep. 2018
v. 3.1.2 - Jul. 2018
v. 3.1.1 - May 2018
Expand Down
3 changes: 2 additions & 1 deletion src/ida/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IDA
Release 3.2.0, Sept 2018
Release 3.2.1, Oct 2018
Alan C. Hindmarsh and Radu Serban
Center for Applied Scientific Computing, LLNL

Expand Down Expand Up @@ -84,6 +84,7 @@ C. References
D. Releases
-----------

v. 3.2.1 - Oct. 2018
v. 3.2.0 - Sep. 2018
v. 3.1.2 - Jul. 2018
v. 3.1.1 - May 2018
Expand Down
3 changes: 2 additions & 1 deletion src/idas/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IDAS
Release 2.2.0, Sept 2018
Release 2.2.1, Oct 2018
Radu Serban
Center for Applied Scientific Computing, LLNL

Expand Down Expand Up @@ -72,6 +72,7 @@ C. References
D. Releases
-----------

v. 2.2.1 - Oct. 2018
v. 2.2.0 - Sep. 2018
v. 2.1.2 - Jul. 2018
v. 2.1.1 - May 2018
Expand Down
Loading

0 comments on commit 8112342

Please sign in to comment.