Add support for SUNDIALS 6 #2517
Merged
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
older version not tested, but should still work
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
|
|
||
| #if SUNDIALS_VERSION_MAJOR >= 6 | ||
| #else | ||
| #define SUN_MODIFIED_GS MODIFIED_GS |
There was a problem hiding this comment.
warning: macro SUN_MODIFIED_GS used to declare a constant; consider using a constexpr constant [cppcoreguidelines-macro-usage]
#define SUN_MODIFIED_GS MODIFIED_GS
^
ZedThree
reviewed
Mar 1, 2022
ZedThree
reviewed
Mar 1, 2022
Adds a header for common backports shared between the different SUNDIALS solvers such that the main code only needs to differentiate between SUNDIALS pre/post 3.0.0
Add backports and shims for SUNDIALS 6
|
Bah, Fedora still failing -- some issue with their mirrors? Also, I forgot |
* next: (27 commits) Also avoid warning from CMP0127 ensure zoidberg is installed for documentation Using python based on version is a pain. Add comments Update filename for cmake Ensure all files get formatted Add bout++Config.cmake check to CI Fix NLS detection use git submodule for cloning on RTD CI: Cancel previous workflows on same branch CI: Apply clang-format changes immediately CI: Only run clang-tidy on changes to C++ files CI: Turn off Python for clang-tidy CI: Better fix for clang-format? CI: Fix clang-tidy-review version CI: Fix for actions/checkout not fetching other branches CI: Tweak some build names CI: Make CMake build use release flags CI: Remove unneeded HDF5 flag from build CI: Remove OpenMP build ...
ZedThree
approved these changes
Mar 4, 2022
Comment on lines
+140
to
141
| if ((uvec = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) | ||
| throw BoutException("SUNDIALS memory allocation failed\n"); |
There was a problem hiding this comment.
warning: statement should be inside braces [readability-braces-around-statements]
Suggested change
| if ((uvec = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) | |
| throw BoutException("SUNDIALS memory allocation failed\n"); | |
| if ((uvec = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) { | |
| throw BoutException("SUNDIALS memory allocation failed\n"); | |
| } |
Comment on lines
+142
to
143
| if ((duvec = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) | ||
| throw BoutException("SUNDIALS memory allocation failed\n"); |
There was a problem hiding this comment.
warning: statement should be inside braces [readability-braces-around-statements]
Suggested change
| if ((duvec = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) | |
| throw BoutException("SUNDIALS memory allocation failed\n"); | |
| if ((duvec = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) { | |
| throw BoutException("SUNDIALS memory allocation failed\n"); | |
| } |
Comment on lines
+144
to
145
| if ((id = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) | ||
| throw BoutException("SUNDIALS memory allocation failed\n"); |
There was a problem hiding this comment.
warning: statement should be inside braces [readability-braces-around-statements]
Suggested change
| if ((id = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) | |
| throw BoutException("SUNDIALS memory allocation failed\n"); | |
| if ((id = N_VNew_Parallel(BoutComm::get(), local_N, neq, suncontext)) == nullptr) { | |
| throw BoutException("SUNDIALS memory allocation failed\n"); | |
| } |
Comment on lines
+160
to
161
| if ((idamem = IDACreate(suncontext)) == nullptr) | ||
| throw BoutException("IDACreate failed\n"); |
There was a problem hiding this comment.
warning: statement should be inside braces [readability-braces-around-statements]
Suggested change
| if ((idamem = IDACreate(suncontext)) == nullptr) | |
| throw BoutException("IDACreate failed\n"); | |
| if ((idamem = IDACreate(suncontext)) == nullptr) { | |
| throw BoutException("IDACreate failed\n"); | |
| } |
Comment on lines
+185
to
186
| if ((sun_solver = SUNLinSol_SPGMR(uvec, SUN_PREC_NONE, maxl, suncontext)) == nullptr) | ||
| throw BoutException("Creating SUNDIALS linear solver failed\n"); |
There was a problem hiding this comment.
warning: statement should be inside braces [readability-braces-around-statements]
Suggested change
| if ((sun_solver = SUNLinSol_SPGMR(uvec, SUN_PREC_NONE, maxl, suncontext)) == nullptr) | |
| throw BoutException("Creating SUNDIALS linear solver failed\n"); | |
| if ((sun_solver = SUNLinSol_SPGMR(uvec, SUN_PREC_NONE, maxl, suncontext)) == nullptr) { | |
| throw BoutException("Creating SUNDIALS linear solver failed\n"); | |
| } |
| @@ -68,6 +68,11 @@ PvodeSolver::~PvodeSolver() { | |||
| } | |||
| } | |||
|
|
|||
| #if SUNDIALS_VERSION_MAJOR >= 6 | |||
| #else | |||
| #define SUN_MODIFIED_GS MODIFIED_GS | |||
There was a problem hiding this comment.
warning: macro 'SUN_MODIFIED_GS' used to declare a constant; consider using a 'constexpr' constant [cppcoreguidelines-macro-usage]
#define SUN_MODIFIED_GS MODIFIED_GS
^
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.
Enable support for sundials 6
Does not address #2501 as this is cmake-only