Skip to content

Commit

Permalink
Merge pull request #317 in SUNDIALS/sunrepo from release-5.1.0 to dev…
Browse files Browse the repository at this point in the history
…elop

Squashed commit of the following:

commit c6d8d61
Merge: 14d32ce 91b0738
Author: David J. Gardner <[email protected]>
Date:   Tue Jan 7 13:22:00 2020 -0800

    Merge branch 'develop' into release-5.1.0

    Conflicts:
      doc/arkode/ARKode.tex

commit 14d32ce
Author: David J. Gardner <[email protected]>
Date:   Mon Jan 6 14:36:56 2020 -0800

    remove isnan, non-standard extension not supported by pgi

commit aa0ed8c
Author: David J. Gardner <[email protected]>
Date:   Mon Jan 6 14:37:41 2020 -0800

    fix pgi compile error

commit f90a71e
Author: Balos, Cody Joe <[email protected]>
Date:   Mon Jan 6 11:33:53 2020 -0800

    post-merge fix

commit a73e9fb
Merge: ddf53ca 520a88c
Author: Balos, Cody Joe <[email protected]>
Date:   Mon Jan 6 10:06:21 2020 -0800

    Merge branch 'develop' of ssh://mybitbucket.llnl.gov:7999/sundials/sunrepo into release-5.1.0

commit ddf53ca
Author: Balos, Cody Joe <[email protected]>
Date:   Fri Jan 3 09:13:30 2020 -0800

    update version numbers with updateVersion.sh script

commit 19ed28d
Author: Balos, Cody Joe <[email protected]>
Date:   Fri Jan 3 09:12:01 2020 -0800

    Revert "update version numbers with updateVersion script"

    This reverts commit d2b9402.

commit 9052a8e
Author: Balos, Cody Joe <[email protected]>
Date:   Fri Jan 3 09:09:47 2020 -0800

    update version numbers for recent changes

commit a41b3f4
Author: Balos, Cody Joe <[email protected]>
Date:   Thu Jan 2 17:19:04 2020 -0800

    regex ARKode.tex

commit d2b9402
Author: Balos, Cody Joe <[email protected]>
Date:   Thu Jan 2 17:12:50 2020 -0800

    update version numbers with updateVersion script

commit 680c739
Author: Balos, Cody Joe <[email protected]>
Date:   Thu Jan 2 17:11:24 2020 -0800

    regen F2003 interfaces
  • Loading branch information
gardner48 committed Jan 8, 2020
1 parent 91b0738 commit 391268f
Show file tree
Hide file tree
Showing 29 changed files with 4,696 additions and 4,677 deletions.
24 changes: 12 additions & 12 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.0.0")
set(PACKAGE_STRING "SUNDIALS 5.1.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 "0")
set(PACKAGE_VERSION_MINOR "1")
set(PACKAGE_VERSION_PATCH "0")
set(PACKAGE_VERSION_LABEL "")

Expand All @@ -63,37 +63,37 @@ mark_as_advanced(CLEAR

# Specify the VERSION and SOVERSION for shared libraries

set(arkodelib_VERSION "4.0.0")
set(arkodelib_VERSION "4.1.0")
set(arkodelib_SOVERSION "4")

set(cvodelib_VERSION "5.0.0")
set(cvodelib_VERSION "5.1.0")
set(cvodelib_SOVERSION "5")

set(cvodeslib_VERSION "5.0.0")
set(cvodeslib_VERSION "5.1.0")
set(cvodeslib_SOVERSION "5")

set(idalib_VERSION "5.0.0")
set(idalib_VERSION "5.1.0")
set(idalib_SOVERSION "5")

set(idaslib_VERSION "4.0.0")
set(idaslib_VERSION "4.1.0")
set(idaslib_SOVERSION "4")

set(kinsollib_VERSION "5.0.0")
set(kinsollib_VERSION "5.1.0")
set(kinsollib_SOVERSION "5")

set(cpodeslib_VERSION "0.0.0")
set(cpodeslib_SOVERSION "0")

set(nveclib_VERSION "5.0.0")
set(nveclib_VERSION "5.1.0")
set(nveclib_SOVERSION "5")

set(sunmatrixlib_VERSION "3.0.0")
set(sunmatrixlib_VERSION "3.1.0")
set(sunmatrixlib_SOVERSION "3")

set(sunlinsollib_VERSION "3.0.0")
set(sunlinsollib_VERSION "3.1.0")
set(sunlinsollib_SOVERSION "3")

set(sunnonlinsollib_VERSION "2.0.0")
set(sunnonlinsollib_VERSION "2.1.0")
set(sunnonlinsollib_SOVERSION "2")

# Specify the location of additional CMAKE modules
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# SUNDIALS: SUite of Nonlinear and DIfferential/ALgebraic equation Solvers #
### Version 5.0.0 (Oct 2019) ###
### Version 5.1.0 (Jan 2020) ###

**Center for Applied Scientific Computing, Lawrence Livermore National Laboratory**

Expand Down
Loading

0 comments on commit 391268f

Please sign in to comment.