Fix to build Cantera against Sundials 4.0.0 and newer #672
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## master #672 +/- ##
==========================================
- Coverage 70.63% 70.63% -0.01%
==========================================
Files 372 372
Lines 43575 43567 -8
==========================================
- Hits 30778 30772 -6
+ Misses 12797 12795 -2
Continue to review full report at Codecov.
|
speth
requested changes
Aug 1, 2019
| virtual void setIterator(IterType t) { | ||
| warn("setInterator"); | ||
| } | ||
| #endif |
There was a problem hiding this comment.
Given that we never use any method besides Newton iteration, my suggestion would be to:
- deprecate
setIteratorand remove them_itervariable - remove the existing calls to
setIterator, and - directly call
CVodeCreatewith theCV_NEWTONconstant if we're using an older version of Sundials.
|
I checked that Cantera build and pass tests with |
speth
requested changes
Aug 5, 2019
|
@band-a-prend can you remove the "cantera" from the beginning of the commit message? If you want, you can classify the commit with |
|
@bryanwweber |
The Sundials 3.1 and 3.2 are compatible with each other so this patch just allows to pass check for the installed Sundials 3.2
The changelog of Sundials 4.0.0 states: "With the introduction of SUNNonlinSol modules, the input parameter iter to CVodeCreate has been removed along with the function CVodeSetIterType and the constants CV_NEWTON and CV_FUNCTIONAL. Similarly, the ITMETH parameter has been removed from the Fortran interface function FCVMALLOC. Instead of specifying the nonlinear iteration type when creating the CVODE(S) memory structure, CVODE(S) uses the SUNNONLINSOL_NEWTON module implementation of a Newton iteration by default." so the appropreate conditional changes are added to control the code execution via CT_SUNDIALS_VERSION preprocessor variable to omit the parameters of Sundials solver that are no longer required.
Remove m_iter variable and deprecate setIterator function because only Newton (CV_NEWTON) iteration method is used.
speth
approved these changes
Aug 9, 2019
band-a-prend
added a commit
to band-a-prend/gentoo-overlay
that referenced
this pull request
Aug 14, 2019
This patch is backport of upstream patch [1] but with removing of 'setIterator' function instead of it's deprecation. [1] Cantera/cantera#672
band-a-prend
added a commit
to band-a-prend/gentoo
that referenced
this pull request
Aug 14, 2019
This patch is backport of upstream patch [1] but with removing of 'setIterator' function instead of it's deprecation. [1] Cantera/cantera#672 Signed-off-by: Sergey Torokhov <torokhov_s_a@mail.ru>
gentoo-repo-qa-bot
pushed a commit
to gentoo-mirror/gentoo
that referenced
this pull request
Sep 5, 2019
This patch is backport of upstream patch [1] but with removing of 'setIterator' function instead of it's deprecation. [1] Cantera/cantera#672 Signed-off-by: Sergey Torokhov <torokhov_s_a@mail.ru>
gentoo-bot
pushed a commit
to gentoo/gentoo
that referenced
this pull request
Sep 6, 2019
Fix python installation path using 'libdirname' env variable. This patch is backport of upstream patch [1]. [1] Cantera/cantera#674 This patch is backport of upstream patch [1] but with removing of 'setIterator' function instead of it's deprecation. [1] Cantera/cantera#672 Closes: #12701 Signed-off-by: Sergey Torokhov <torokhov_s_a@mail.ru> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
thebitpit
pushed a commit
to thebitpit/gentoo
that referenced
this pull request
Sep 13, 2019
Fix python installation path using 'libdirname' env variable. This patch is backport of upstream patch [1]. [1] Cantera/cantera#674 This patch is backport of upstream patch [1] but with removing of 'setIterator' function instead of it's deprecation. [1] Cantera/cantera#672 Closes: gentoo#12701 Signed-off-by: Sergey Torokhov <torokhov_s_a@mail.ru> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
thebitpit
pushed a commit
to thebitpit/gentoo
that referenced
this pull request
Sep 13, 2019
Fix python installation path using 'libdirname' env variable. This patch is backport of upstream patch [1]. [1] Cantera/cantera#674 This patch is backport of upstream patch [1] but with removing of 'setIterator' function instead of it's deprecation. [1] Cantera/cantera#672 Closes: gentoo#12701 Signed-off-by: Sergey Torokhov <torokhov_s_a@mail.ru> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
thebitpit
pushed a commit
to thebitpit/gentoo
that referenced
this pull request
Sep 14, 2019
Fix python installation path using 'libdirname' env variable. This patch is backport of upstream patch [1]. [1] Cantera/cantera#674 This patch is backport of upstream patch [1] but with removing of 'setIterator' function instead of it's deprecation. [1] Cantera/cantera#672 Closes: gentoo#12701 Signed-off-by: Sergey Torokhov <torokhov_s_a@mail.ru> Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Please fill in the issue number this pull request is fixing:
Fixes #620
Changes proposed in this pull request:
Canteracompatibility withSundials 3.2;Canterabuild against>=Sundials-4.0.