Skip to content
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.

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

Make MRI step fail when inner stepper has a recoverable error #456

Merged
merged 3 commits into from
Apr 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ Fixed a bug in some Fortran examples where `c_null_ptr` was passed as an argumen
to a function pointer instead of `c_null_funptr`. This caused compilation issues
with the Cray Fortran compiler.

Fixed a bug where `MRIStepEvolve` would not handle a recoverable error produced
from evolving the inner stepper.

Added CMake infrastructure that enables externally maintained addons/plugins
to be *optionally* built with SUNDIALS. See the [Contributing Guide](./CONTRIBUTING.md)
for more details.
Expand Down
3 changes: 3 additions & 0 deletions doc/shared/RecentChanges.rst
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ instead of ``SameMajorVersion``. This fixes the issue seen
Fixed a bug in some Fortran examples where ``c_null_ptr`` was passed as an argument
to a function pointer instead of ``c_null_funptr``. This caused compilation issues
with the Cray Fortran compiler.

Fixed a bug where :c:func:`MRIStepEvolve` would not handle a recoverable error
produced from evolving the inner stepper.
2 changes: 1 addition & 1 deletion src/arkode/arkode_mristep.c
Original file line number Diff line number Diff line change
Expand Up @@ -2139,7 +2139,7 @@ int mriStep_StageERKFast(ARKodeMem ark_mem, ARKodeMRIStepMem step_mem, int is)
/* advance inner method in time */
retval = mriStepInnerStepper_Evolve(step_mem->stepper, t0, ark_mem->tcur,
ark_mem->ycur);
if (retval < 0) { return (ARK_INNERSTEP_FAIL); }
if (retval != 0) { return (ARK_INNERSTEP_FAIL); }

/* post inner evolve function (if supplied) */
if (step_mem->post_inner_evolve)
Expand Down
Loading