Skip to content

Commit

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

Squashed commit of the following:

commit 2d5d94f
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Thu Mar 28 08:56:28 2019 -0700

    use status quo sun* library versioning

commit 77d0328
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Wed Mar 27 16:24:28 2019 -0700

    update ug version numbers

commit df7ef38
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Wed Mar 27 15:32:22 2019 -0700

    fix README_DEV

commit 814c437
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Wed Mar 27 15:31:30 2019 -0700

    fix README_DEV

commit 71b5109
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Wed Mar 27 15:25:36 2019 -0700

    fix arkode version numbers and README_DEV

commit 4da6e2c
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Wed Mar 27 13:21:02 2019 -0700

    bump version numbers

commit a3a879a
Author: Balos, Cody Joe <balos1@llnl.gov>
Date:   Wed Mar 27 12:49:34 2019 -0700

    remove extra include of sundials deprecated and fix cvode tarscript
  • Loading branch information
@gardner48
gardner48 committed Mar 28, 2019
1 parent c4b2a20 commit ea76f23
Show file tree
Hide file tree
Showing 24 changed files with 164 additions and 161 deletions.
53 changes: 24 additions & 29 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ 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 4.1.0")
SET(PACKAGE_STRING "SUNDIALS 5.0.0-dev.0")
SET(PACKAGE_TARNAME "sundials")

# set SUNDIALS version numbers
# (use "" for the version label if none is needed)
SET(PACKAGE_VERSION_MAJOR "4")
SET(PACKAGE_VERSION_MINOR "1")
SET(PACKAGE_VERSION_MAJOR "5")
SET(PACKAGE_VERSION_MINOR "0")
SET(PACKAGE_VERSION_PATCH "0")
SET(PACKAGE_VERSION_LABEL "")
SET(PACKAGE_VERSION_LABEL "dev.0")

IF(PACKAGE_VERSION_LABEL)
SET(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}-${PACKAGE_VERSION_LABEL}")
Expand All @@ -78,38 +78,38 @@ MARK_AS_ADVANCED(CLEAR

# Specify the VERSION and SOVERSION for shared libraries

SET(arkodelib_VERSION "3.1.0")
SET(arkodelib_SOVERSION "3")
SET(arkodelib_VERSION "4.0.0-dev.0")
SET(arkodelib_SOVERSION "4")

SET(cvodelib_VERSION "4.1.0")
SET(cvodelib_SOVERSION "4")
SET(cvodelib_VERSION "5.0.0-dev.0")
SET(cvodelib_SOVERSION "5")

SET(cvodeslib_VERSION "4.1.0")
SET(cvodeslib_SOVERSION "4")
SET(cvodeslib_VERSION "5.0.0-dev.0")
SET(cvodeslib_SOVERSION "5")

SET(idalib_VERSION "4.1.0")
SET(idalib_SOVERSION "4")
SET(idalib_VERSION "5.0.0-dev.0")
SET(idalib_SOVERSION "5")

SET(idaslib_VERSION "3.1.0")
SET(idaslib_SOVERSION "3")
SET(idaslib_VERSION "4.0.0-dev.0")
SET(idaslib_SOVERSION "4")

SET(kinsollib_VERSION "4.1.0")
SET(kinsollib_SOVERSION "4")
SET(kinsollib_VERSION "5.0.0-dev.0")
SET(kinsollib_SOVERSION "5")

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

SET(nveclib_VERSION "4.1.0")
SET(nveclib_SOVERSION "4")
SET(nveclib_VERSION "5.0.0-dev.0")
SET(nveclib_SOVERSION "5")

SET(sunmatrixlib_VERSION "2.1.0")
SET(sunmatrixlib_SOVERSION "2")
SET(sunmatrixlib_VERSION "3.0.0-dev.0")
SET(sunmatrixlib_SOVERSION "3")

SET(sunlinsollib_VERSION "2.1.0")
SET(sunlinsollib_SOVERSION "2")
SET(sunlinsollib_VERSION "3.0.0-dev.0")
SET(sunlinsollib_SOVERSION "3")

SET(sunnonlinsollib_VERSION "1.1.0")
SET(sunnonlinsollib_SOVERSION "1")
SET(sunnonlinsollib_VERSION "2.0.0-dev.0")
SET(sunnonlinsollib_SOVERSION "2")

# Specify the location of additional CMAKE modules
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/config)
Expand All @@ -120,11 +120,6 @@ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/config)
INCLUDE(GNUInstallDirs)
MARK_AS_ADVANCED(CLEAR CMAKE_INSTALL_LIBDIR)

# ---------------------------------------------------------------
# Check for deprecated SUNDIALS CMake options/variables
# ---------------------------------------------------------------
INCLUDE(SundialsDeprecated)

# ---------------------------------------------------------------
# Which modules to build?
# ---------------------------------------------------------------
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ information on contributing see the [CONTRIBUTING](./CONTRIBUTING.md) file.
## Release History ##
Date | SUNDIALS | ARKODE | CVODE | CVODES | IDA | IDAS | KINSOL
---------|-------------|-------------|-------------|-------------|-------------|-------------|-------------
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
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
166 changes: 86 additions & 80 deletions README_DEV
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,93 +168,99 @@ Note: there was no library versioning before sundials-2.2.0


ARKODE
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
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
3.0.0 4.0.0 4:0:0 4.0.0
3.0.1 4.0.1 4:0:1 4.0.1
3.0.2 3.0.2 3:0:2 3.0.2
3.1.0 4.1.0 4:1:0 4.1.0
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
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
3.0.0 4.0.0 4:0:0 4.0.0
3.0.1 4.0.1 4:0:1 4.0.1
3.0.2 4.0.2 4:0:2 4.0.2
3.1.0 4.1.0 4:1:0 4.1.0
4.0.0-dev.0 5.0.0-dev.0 5:0:0 5.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 2:0:0 2.0.0
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
4.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
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 2:0:0 2.0.0
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
4.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
5.0.0-dev.0 5.0.0-dev.0 5:0:0 5.0.0

CVODES
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 1:0:0 1.0.0
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
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.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
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 1:0:0 1.0.0
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
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.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
5.0.0-dev.0 5.0.0-dev.0 5:0:0 5.0.0

IDA
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 1:0:0 1.0.0
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
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.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
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 1:0:0 1.0.0
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
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.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
5.0.0-dev.0 5.0.0-dev.0 5:0:0 5.0.0

IDAS
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
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
3.0.0 4.0.0 4:0:0 4.0.0
3.0.1 4.0.1 4:0:1 4.0.1
3.0.2 4.0.2 4:0:2 4.0.2
3.1.0 4.1.0 4:1:0 4.1.0
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
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
3.0.0 4.0.0 4:0:0 4.0.0
3.0.1 4.0.1 4:0:1 4.0.1
3.0.2 4.0.2 4:0:2 4.0.2
3.1.0 4.1.0 4:1:0 4.1.0
4.0.0-dev.0 5.0.0-dev.0 5:0:0 5.0.0

KINSOL
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 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
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.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
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 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
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.0.0 4.0.0 4:0:0 4.0.0
4.0.1 4.0.1 4:0:1 4.0.1
4.0.2 4.0.2 4:0:2 4.0.2
4.1.0 4.1.0 4:1:0 4.1.0
5.0.0-dev.0 5.0.0-dev.0 5:0:0 5.0.0
8 changes: 4 additions & 4 deletions doc/arkode/ARKode.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
\clearpage
}

\title{User Documentation for ARKode v3.1.0\\
(SUNDIALS v4.1.0)}
\title{User Documentation for ARKode v4.0.0-dev.0\\
(SUNDIALS v5.0.0-dev.0)}
\author{
Daniel R. Reynolds$^1$, David J. Gardner$^2$, \\
Alan C. Hindmarsh$^2$, Carol S. Woodward$^2$ \\
Expand Down Expand Up @@ -300,8 +300,8 @@ \chapter{Introduction}
\section{Changes from previous versions}
\label{Introduction:changes-from-previous-versions}

\subsection{Changes in v4.0.0}
\label{Introduction:changes-in-v4-0-0}
\subsection{Changes in v4.0.0-dev.0}
\label{Introduction:changes-in-v4-0-0-dev-0}
An additional NVECTOR implementation, NVECTOR\_MANYVECTOR, was
created to support flexible partitioning of solution data among
different processing elements (e.g., CPU + GPU) or for multi-physics
Expand Down
2 changes: 1 addition & 1 deletion doc/arkode/ARKode_example.tex
View file
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{3.1.0}
\release{4.0.0-dev.0}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%


Expand Down
4 changes: 2 additions & 2 deletions doc/arkode/SphinxDocs/examples/source/conf.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
# built documents.
#
# The short X.Y version.
version = '3.1.0'
version = '4.0.0-dev.0'
# The full version, including alpha/beta/rc tags.
release = '3.1.0'
release = '4.0.0-dev.0'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion doc/arkode/SphinxDocs/guide/source/Introduction.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ preconditioner routines.
Changes from previous versions
--------------------------------

Changes in v4.0.0
Changes in v4.0.0-dev.0
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

An additional NVECTOR implementation, NVECTOR_MANYVECTOR, was
Expand Down
2 changes: 1 addition & 1 deletion doc/cvode/cv_intro.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ \section{Historical Background}\label{ss:history}

\section{Changes from previous versions}

\subsection*{Changes in v5.0.0}
\subsection*{Changes in v5.0.0-dev.0}

An additional {\nvector} implementation, {\nvecmanyvector}, was
created to support flexible partitioning of solution data among
Expand Down
2 changes: 1 addition & 1 deletion doc/cvodes/cvs_intro.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ \section{Historical Background}\label{ss:history}

\section{Changes from previous versions}

\subsection*{Changes in v5.0.0}
\subsection*{Changes in v5.0.0-dev.0}

An additional {\nvector} implementation, {\nvecmanyvector}, was
created to support flexible partitioning of solution data among
Expand Down
2 changes: 1 addition & 1 deletion doc/ida/ida_intro.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ \chapter{Introduction}\label{s:intro}

\section{Changes from previous versions}

\subsection*{Changes in v5.0.0}
\subsection*{Changes in v5.0.0-dev.0}

An additional {\nvector} implementation, {\nvecmanyvector}, was
created to support flexible partitioning of solution data among
Expand Down
2 changes: 1 addition & 1 deletion doc/idas/idas_intro.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ \chapter{Introduction}\label{s:intro}

\section{Changes from previous versions}

\subsection*{Changes in v4.0.0}
\subsection*{Changes in v4.0.0-dev.0}

An additional {\nvector} implementation, {\nvecmanyvector}, was
created to support flexible partitioning of solution data among
Expand Down
2 changes: 1 addition & 1 deletion doc/kinsol/kin_intro.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ \section{Historical Background}\label{ss:history}

\section{Changes from previous versions}

\subsection*{Changes in v5.0.0}
\subsection*{Changes in v5.0.0-dev.0}

An additional {\nvector} implementation, {\nvecmanyvector}, was
created to support flexible partitioning of solution data among
Expand Down
Loading

0 comments on commit ea76f23

Please sign in to comment.