Merge remote-tracking branch 'origin/develop' into feature/oo-adaptivity

LLNL · Sep 14, 2023 · 1988cbd · 1988cbd
2 parents 19ccd28 + 235a506
commit 1988cbd
Show file tree

Hide file tree

Showing 9 changed files with 177 additions and 163 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # SUNDIALS Changelog
 
+## Changes to SUNDIALS in release X.X.X
+
+Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+
 ## Changes to SUNDIALS in release 6.6.1
 
 Updated the Tpetra NVector interface to support Trilinos 14.

diff --git a/doc/cvodes/guide/source/Introduction.rst b/doc/cvodes/guide/source/Introduction.rst
@@ -111,6 +111,11 @@ Fortran.
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+
 Changes in v6.6.1
 -----------------
 

diff --git a/doc/idas/guide/source/Introduction.rst b/doc/idas/guide/source/Introduction.rst
@@ -86,6 +86,11 @@ integrate any final-condition ODE dependent on the solution of the original IVP
 Changes from previous versions
 ==============================
 
+Changes in vX.X.X
+-----------------
+
+Renamed some internal types in CVODES and IDAS to allow both packages to be built together in the same binary.
+
 Changes in v5.6.1
 -----------------