Skip to content

Commit

Permalink
Merge pull request #81 in SUNDIALS/sunrepo from release-3.1.1 to master
Browse files Browse the repository at this point in the history 
* commit 'edd23a1655474c5a4e5e0831e413072227f8195b':
  add README.md to tarscripts
  turn on petsc/hypre in tarscript testing
  correct error message for JacTimesVecFn
  correct function for setting JacVecFn in user guide
  minor fix to idas section references
  minor formatting fixes in idas guide
  Minor documentation fixes
  update missed version numbers, clean up recent changes formatting
  update version numbers in tarscript
  update version numbers in docs
  update CMake version numbers for v3.1.1
  update readme list in release checklist
  update readme version numbers to 3.1.1
  • Loading branch information
@gardner48
gardner48 committed May 8, 2018
2 parents a1c4194 + edd23a1 commit 3107909
Show file tree
Hide file tree
Showing 51 changed files with 490 additions and 392 deletions.
20 changes: 10 additions & 10 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,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.1.0")
SET(PACKAGE_STRING "SUNDIALS 3.1.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 "1")
SET(PACKAGE_VERSION_PATCH "0")
SET(PACKAGE_VERSION_PATCH "1")
SET(PACKAGE_VERSION_LABEL "")

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

# Specify the VERSION and SOVERSION for shared libraries

SET(arkodelib_VERSION "2.1.0")
SET(arkodelib_VERSION "2.1.1")
SET(arkodelib_SOVERSION "2")

SET(cvodelib_VERSION "3.1.0")
SET(cvodelib_VERSION "3.1.1")
SET(cvodelib_SOVERSION "3")

SET(cvodeslib_VERSION "3.1.0")
SET(cvodeslib_VERSION "3.1.1")
SET(cvodeslib_SOVERSION "3")

SET(idalib_VERSION "3.1.0")
SET(idalib_VERSION "3.1.1")
SET(idalib_SOVERSION "3")

SET(idaslib_VERSION "2.1.0")
SET(idaslib_SOVERSION "2")

SET(kinsollib_VERSION "3.1.0")
SET(kinsollib_VERSION "3.1.1")
SET(kinsollib_SOVERSION "3")

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

SET(nveclib_VERSION "3.1.0")
SET(nveclib_VERSION "3.1.1")
SET(nveclib_SOVERSION "3")

SET(sunmatrixlib_VERSION "1.1.0")
SET(sunmatrixlib_VERSION "1.1.1")
SET(sunmatrixlib_SOVERSION "1")

SET(sunlinsollib_VERSION "1.1.0")
SET(sunlinsollib_VERSION "1.1.1")
SET(sunlinsollib_SOVERSION "1")

# Specify the location of additional CMAKE modules
Expand Down
9 changes: 8 additions & 1 deletion README_DEV
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,16 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
1.0.0 2.6.0 2:0:0 2.0.0
2.0.0 3.0.0 3:0:0 3.0.0
2.1.0 3.1.0 3:0:0 3.0.0
2.1.1 3.1.1 3:0:0 3.0.0

CVODE
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
2.4.0 2.2.0 0:0:0 0.0.0
2.5.0 2.3.0 0:1:0 0.0.1
2.6.0 2.4.0 1:0:0 1.0.0
3.0.0 3.0.0 2:0:0 2.0.0
3.1.0 3.1.0
3.1.0 3.1.0 2:0:0 2.0.0
3.1.1 3.1.1 2:0:0 2.0.0

CVODES
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -188,6 +190,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
2.6.0 2.4.0 2:0:0 2.0.0
3.0.0 3.0.0 3:0:0 3.0.0
3.1.0 3.1.0 3:0:0 3.0.0
3.1.1 3.1.1 3:0:0 3.0.0

IDA
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -202,6 +205,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
1.0.0 2.4.0 0:0:0 0.0.0
2.0.0 3.0.0 2:0:0 2:0:0
2.1.0 3.1.0 3:0:0 3.0.0
2.1.1 3.1.1 3:0:0 3.0.0

KINSOL
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -210,6 +214,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
2.6.0 2.4.0 1:0:0 1.0.0
3.0.0 3.0.0 3:0:0 3.0.0
3.1.0 3.1.0 3:0:0 3.0.0
3.1.1 3.1.1 3:0:0 3.0.0

NVEC_SER
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -218,6 +223,7 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
2.4.0 2.4.0 0:2:0 0.0.2
3.0.0 3.0.0 3:0:0 3.0.0
3.1.0 3.1.0 3:0:0 3.0.0
3.1.1 3.1.1 3:0:0 3.0.0

NVEC_PAR
RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
Expand All @@ -226,3 +232,4 @@ RELEASE SUNDIALS RELEASE LIBTOOL VER. LIB FILE (Linux)
2.4.0 2.4.0 0:2:0 0.0.2
3.0.0 3.0.0 3:0:0 3.0.0
3.1.0 3.1.0 3:0:0 3.0.0
3.1.1 3.1.1 3:0:0 3.0.0
16 changes: 16 additions & 0 deletions Release_Checklist.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,22 @@ web pages.
src/nvec_ser/README
src/nvec_parhyp/README
src/nvec_petsc/README
src/nvec_cuda/README
src/nvec_raja/README
src/sunmat_band/README
src/sunmat_dense/README
src/sunmat_sparse/README
src/sunlinsol_band/README
src/sunlinsol_dense/README
src/sunlinsol_klu/README
src/sunlinsol_lapackband/README
src/sunlinsol_lapackdense/README
src/sunlinsol_pcg/README
src/sunlinsol_spbcgs/README
src/sunlinsol_spfgmr/README
src/sunlinsol_spgmr/README
src/sunlinsol_sptfqmr/README
src/sunlinsol_superlumt/README
src/sundials/README

9. Update version numbers of third party libraries in Install Guide
Expand Down
Loading

0 comments on commit 3107909

Please sign in to comment.