8000 Change typedefs names to allow simulateous use of idas and cvodes by mottelet · Pull Request #337 · LLNL/sundials · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Change typedefs names to allow simulateous use of idas and cvodes #337

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
Sep 14, 2023
Merged

Change typedefs names to allow simulateous use of idas and cvodes #337

merged 4 commits into from
Sep 14, 2023

Conversation

mottelet
Copy link
Contributor

Fixes #333. Some other typedefs already had specialized (towards idas or cvodes) prefixed names, it won't harm to generalize this.

balos1
balos1 previously approved these changes Sep 12, 2023
View reviewed changes
@balos1 balos1 self-requested a review September 12, 2023 17:16
@balos1 balos1 changed the base branch from main to develop September 12, 2023 17:16
@balos1 balos1 dismissed their stale review September 12, 2023 17:16

The base branch was changed.

@balos1 balos1 added this to the SUNDIALS Next milestone Sep 12, 2023
@balos1
Copy link
Member
balos1 commented Sep 12, 2023 •
edited
Loading

@mottelet Based on the CI results, it looks like there are some more places that the type needs to be updated. If you are able to fix those, that would be excellent. Thanks for the contribution!

@mottelet
Copy link
Contributor Author

@mottelet Based on the CI results, it looks like there are some more places that the type needs to be updated. If you are able to fix those, that would be excellent. Thanks for the contribution!

Sorry, I forgot all replacements of DtpntMem to CVdtpntMem in the PR (although I already did it in the Scilab tree).

@balos1
Copy link
Member
balos1 commented Sep 13, 2023

Thanks @mottelet. Two more things:

  1. Can you sign your last commit?
  2. Please apply the patch below to your fork (I would push it up myself, but since the branch is in your fork I cannot). It simply adds some notes into the changelog.
From d0fde09f538f53f07a9b5de55af2aef9929643d1 Mon Sep 17 00:00:00 2001
From: "Balos, Cody, J" <balos1@llnl.gov>
Date: Wed, 13 Sep 2023 10:23:34 -0700
Subject: [PATCH] add comments to changelog


---
 CHANGELOG.md                             | 4 ++++
 doc/cvodes/guide/source/Introduction.rst | 5 +++++
 doc/idas/guide/source/Introduction.rst   | 5 +++++
 3 files changed, 14 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f246a840d..dd786dde0 100644
--- 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
index 1fde2952f..6ad961ebd 100644
--- 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
index ba7149803..676dd8877 100644
--- 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
 -----------------
 
-- 
2.37.1 (Apple Git-137.1)

@balos1 balos1 merged commit 235a506 into LLNL:develop Sep 14, 2023
@balos1 balos1 mentioned this pull request Sep 14, 2023
Closed
gardner48 pushed a commit that referenced this pull request Dec 18, 2023
@mottelet @balos1 @gardner48
Change typedefs names to allow simulateous use of idas and cvodes (#337)
aef26f3 
Fixes #333. Some other typedefs already had specialized (towards idas or
cvodes) prefixed names, it won't harm to generalize this.

---------

Co-authored-by: Cody Balos <balos1@llnl.gov>
balos1 added a commit that referenced this pull request Dec 18, 2023
@mottelet @balos1
Change typedefs names to allow simulateous use of idas and cvodes (#337)
6563745 
Fixes #333. Some other typedefs already had specialized (towards idas or
cvodes) prefixed names, it won't harm to generalize this.

---------

Co-authored-by: Cody Balos <balos1@llnl.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@balos1 balos1 balos1 approved these changes

@gardner48 gardner48 Awaiting requested review from gardner48 gardner48 is a code owner

@cswoodward cswoodward Awaiting requested review from cswoodward cswoodward is a code owner

@drreynolds drreynolds Awaiting requested review from drreynolds drreynolds is a code owner

Assignees
No one assigned
Labels
enhancement pkg-CVODE pkg-IDAS
Projects
None yet
Milestone
SUNDIALS v6.7.0
Development

Successfully merging this pull request may close these issues.

ida -> idas, cvode -> cvodes
2 participants
@mottelet @balos1
0