Skip to content

Commit

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

Squashed commit of the following:

commit 54485e0
Author: David J. Gardner <[email protected]>
Date:   Mon Oct 21 09:38:50 2019 -0700

    update README author list to match user guide

commit 670343c
Author: David J. Gardner <[email protected]>
Date:   Mon Oct 21 09:22:16 2019 -0700

    add pointers to mpicuda and mpiraja examples

commit d867668
Author: David J. Gardner <[email protected]>
Date:   Mon Oct 21 09:11:02 2019 -0700

    update sunmatmatvec description in recent changes

commit 6437955
Author: Daniel R. Reynolds <[email protected]>
Date:   Mon Oct 21 10:18:38 2019 -0500

    Fixed typos

commit 4ff7448
Author: Daniel R. Reynolds <[email protected]>
Date:   Mon Oct 21 10:11:49 2019 -0500

    Fixed typo

commit 311a733
Author: Daniel R. Reynolds <[email protected]>
Date:   Mon Oct 21 09:58:41 2019 -0500

    Fixed typo

commit 6dadfa6
Author: David J. Gardner <[email protected]>
Date:   Fri Oct 18 17:17:41 2019 -0700

    update recent changes files

commit ba6b3ce
Author: David J. Gardner <[email protected]>
Date:   Fri Oct 18 15:11:58 2019 -0700

    update cvode changes

commit 4061c88
Author: David J. Gardner <[email protected]>
Date:   Fri Oct 18 14:56:39 2019 -0700

    update top level recent changes file

commit ca67ae3
Author: David J. Gardner <[email protected]>
Date:   Fri Oct 18 14:56:04 2019 -0700

    update version numbers
  • Loading branch information
gardner48 committed Oct 21, 2019
1 parent ba0503f commit 6b6683b
Show file tree
Hide file tree
Showing 27 changed files with 6,502 additions and 5,876 deletions.
20 changes: 10 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,37 +63,37 @@ mark_as_advanced(CLEAR

# Specify the VERSION and SOVERSION for shared libraries

set(arkodelib_VERSION "4.0.0-dev.2")
set(arkodelib_VERSION "4.0.0")
set(arkodelib_SOVERSION "4")

set(cvodelib_VERSION "5.0.0-dev.2")
set(cvodelib_VERSION "5.0.0")
set(cvodelib_SOVERSION "5")

set(cvodeslib_VERSION "5.0.0-dev.2")
set(cvodeslib_VERSION "5.0.0")
set(cvodeslib_SOVERSION "5")

set(idalib_VERSION "5.0.0-dev.2")
set(idalib_VERSION "5.0.0")
set(idalib_SOVERSION "5")

set(idaslib_VERSION "4.0.0-dev.2")
set(idaslib_VERSION "4.0.0")
set(idaslib_SOVERSION "4")

set(kinsollib_VERSION "5.0.0-dev.2")
set(kinsollib_VERSION "5.0.0")
set(kinsollib_SOVERSION "5")

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

set(nveclib_VERSION "5.0.0-dev.2")
set(nveclib_VERSION "5.0.0")
set(nveclib_SOVERSION "5")

set(sunmatrixlib_VERSION "3.0.0-dev.2")
set(sunmatrixlib_VERSION "3.0.0")
set(sunmatrixlib_SOVERSION "3")

set(sunlinsollib_VERSION "3.0.0-dev.2")
set(sunlinsollib_VERSION "3.0.0")
set(sunlinsollib_SOVERSION "3")

set(sunnonlinsollib_VERSION "2.0.0-dev.2")
set(sunnonlinsollib_VERSION "2.0.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-dev.2 (Sep 2019) ###
### Version 5.0.0 (Oct 2019) ###

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

Expand Down
9,528 changes: 4,772 additions & 4,756 deletions doc/arkode/ARKode.tex

Large diffs are not rendered by default.

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{4.0.0-dev.2}
\release{4.0.0}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


Expand Down
4 changes: 2 additions & 2 deletions doc/arkode/SphinxDocs/examples/source/References.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
==========

.. [HSR2017] A.C. Hindmarsh, R. Serban and D.R. Reynolds. Example
Programs for CVODE v5.0.0-dev.2. Technical Report
Programs for CVODE v5.0.0. Technical Report
UCRL-SM-208110, LLNL, 2019.
.. [R2018] D.R. Reynolds. User Documentation for ARKode
v4.0.0-dev.2. Technical Report LLNL-CODE-667205, LLNL, 2019.
v4.0.0. Technical Report LLNL-CODE-667205, LLNL, 2019.
4 changes: 2 additions & 2 deletions doc/arkode/SphinxDocs/examples/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
# built documents.
#
# The short X.Y version.
version = '4.0.0-dev.2'
version = '4.0.0'
# The full version, including alpha/beta/rc tags.
release = '4.0.0-dev.2'
release = '4.0.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 1 addition & 3 deletions doc/arkode/SphinxDocs/guide/source/History.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ Appendix: SUNDIALS Release History
======== =========== =========== =========== =========== =========== =========== ===========
Date SUNDIALS ARKode CVODE CVODES IDA IDAS KINSOL
======== =========== =========== =========== =========== =========== =========== ===========
Sep 2019 5.0.0-dev.2 4.0.0-dev.2 5.0.0-dev.2 5.0.0-dev.2 5.0.0-dev.2 4.0.0-dev.2 5.0.0-dev.2
Jun 2019 5.0.0-dev.1 4.0.0-dev.1 5.0.0-dev.1 5.0.0-dev.1 5.0.0-dev.1 4.0.0-dev.1 5.0.0-dev.1
Mar 2019 5.0.0-dev.0 4.0.0-dev.0 5.0.0-dev.0 5.0.0-dev.0 5.0.0-dev.0 4.0.0-dev.0 5.0.0-dev.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
Jan 2019 4.0.2 3.0.2 4.0.2 4.0.2 4.0.2 3.0.2 4.0.2
Dec 2018 4.0.1 3.0.1 4.0.1 4.0.1 4.0.1 3.0.1 4.0.1
Expand Down
378 changes: 214 additions & 164 deletions doc/arkode/SphinxDocs/guide/source/Introduction.rst

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions doc/arkode/SphinxDocs/guide/source/References.rst
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@
Report UCRL-ID-141558, LLNL, 2000.
.. [HS2017] A.C. Hindmarsh and R. Serban. User Documentation for CVODE
v5.0.0-dev.2. Technical Report UCRL-SM-208108, LLNL, 2019.
v5.0.0. Technical Report UCRL-SM-208108, LLNL, 2019.
.. [HSR2017] A.C. Hindmarsh, R. Serban and D.R. Reynolds. Example
Programs for CVODE v5.0.0-dev.2. Technical Report
Programs for CVODE v5.0.0. Technical Report
UCRL-SM-208110, LLNL, 2019.
.. [HT1998] A.C. Hindmarsh and A.G. Taylor. PVODE and KINSOL:
Expand Down
4 changes: 2 additions & 2 deletions doc/arkode/SphinxDocs/guide/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,9 @@
# built documents.
#
# The short X.Y version.
version = '4.0.0-dev.2'
version = '4.0.0'
# The full version, including alpha/beta/rc tags.
release = '4.0.0-dev.2'
release = '4.0.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
Loading

0 comments on commit 6b6683b

Please sign in to comment.