Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
97315ca
Updated ARKStep, ERKStep, and MRIStep so that they only call RHS func…
drreynolds Jan 16, 2026
199c239
Ran formatter
drreynolds Jan 16, 2026
50a21ac
Merge ../fespr3-lsrk-cleanup into feature/fes-ycur-rhs
drreynolds Jan 16, 2026
205ead8
Merge ../fespr3-lsrk-cleanup into feature/fes-ycur-rhs
drreynolds Jan 16, 2026
7db4a8d
Merge ../fespr3-lsrk-cleanup into feature/fes-ycur-rhs
drreynolds Jan 16, 2026
fb0da0a
Merged upstream changes, and revised the CHANGELOG.md and RecentChang…
drreynolds Jan 16, 2026
33c9c9d
Merge ../fespr3-lsrk-cleanup into feature/fes-ycur-rhs
drreynolds Jan 16, 2026
327f849
Merge ../fespr3-lsrk-cleanup into feature/fes-ycur-rhs
drreynolds Jan 16, 2026
7e03e4e
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Jan 26, 2026
080935f
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Jan 27, 2026
ec3ccab
Removed takestep-specific (tcur,ycur) initialization since it's now i…
drreynolds Jan 27, 2026
bd66ee2
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Jan 28, 2026
66697d6
Formatting
drreynolds Jan 28, 2026
9913579
Merged with feature/fes-lsrk-cleanup
drreynolds Jan 28, 2026
11128c8
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Jan 29, 2026
cae5f60
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Jan 29, 2026
4307fe1
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Jan 30, 2026
744cdda
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 3, 2026
ab63b42
Merged with feature/fes-lsrk-cleanup
drreynolds Feb 3, 2026
2d53691
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 3, 2026
dd17a78
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 3, 2026
c357f0d
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 4, 2026
3524c30
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 4, 2026
d9c155f
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 4, 2026
6995f07
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 4, 2026
29dd989
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 4, 2026
f17ed04
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 4, 2026
72ccb55
Merged with feature/fes-lsrk-cleanup
drreynolds Feb 10, 2026
8d3002a
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 10, 2026
67c5447
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 11, 2026
6b90f9f
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 11, 2026
cdf725c
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 11, 2026
c77e525
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 12, 2026
15d3be2
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 12, 2026
3cd860b
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 12, 2026
17eeab1
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 12, 2026
1a8900c
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 16, 2026
f698adc
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 19, 2026
c59405f
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 26, 2026
eeaec63
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 26, 2026
b79e2e3
Merged with feature/fes-lsrk-cleanup
drreynolds Feb 27, 2026
3d88530
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 27, 2026
1b44ba0
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 27, 2026
4244e0e
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Feb 27, 2026
93be86d
Updated PR to remove the 'promise' that we call user routines with yc…
drreynolds Mar 4, 2026
770b95e
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Mar 4, 2026
2aacc71
Formatting
drreynolds Mar 4, 2026
563ced0
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Mar 7, 2026
9a3343f
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Mar 11, 2026
0322df6
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Mar 11, 2026
9e1243a
Merged with feature/fes-lsrk-cleanup
drreynolds Mar 20, 2026
dbd0e6f
Reverting most of the changes in this PR
drreynolds Mar 20, 2026
a8e4e68
Unraveled more yn -> ycur changes
drreynolds Mar 20, 2026
fbb74ff
Merged with feature/fes-lsrk-cleanup
drreynolds Mar 21, 2026
4ebd73f
Merge branch 'feature/fes-lsrk-cleanup' into feature/fes-ycur-rhs
drreynolds Mar 21, 2026
1e445eb
Merged with feature/fes-lsrk-cleanup
drreynolds Mar 21, 2026
28b938e
Fixed merge error
drreynolds Mar 22, 2026
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
2 changes: 1 addition & 1 deletion src/arkode/arkode_erkstep.c
Original file line number Diff line number Diff line change
Expand Up @@ -781,7 +781,7 @@ int erkStep_TakeStep(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr)
SUNLogExtraDebugVec(ARK_LOGGER, "stage", ark_mem->yn, "z_0(:) =");

/* Call the full RHS if needed. If this is the first step then we may need to
evaluate or copy the RHS values from an earlier evaluation (e.g., to
evaluate or copy the RHS values from an earlier evaluation (e.g., to
compute h0). For subsequent steps treat this RHS evaluation as an
evaluation at the end of the just completed step to potentially reuse
(FSAL methods) RHS evaluations from the end of the last step. */
Expand Down
9 changes: 5 additions & 4 deletions src/arkode/arkode_mristep.c
Original file line number Diff line number Diff line change
Expand Up @@ -1324,14 +1324,14 @@ int mriStep_Init(ARKodeMem ark_mem, sunrealtype tout, int init_type)
if (ark_mem->hin == ZERO)
{
/* tempv1 = fslow(t0, y0) */
if (mriStep_SlowRHS(ark_mem, ark_mem->tcur, ark_mem->yn, ark_mem->tempv1,
if (mriStep_SlowRHS(ark_mem, ark_mem->tn, ark_mem->yn, ark_mem->tempv1,
ARK_FULLRHS_START) != ARK_SUCCESS)
{
arkProcessError(ark_mem, ARK_RHSFUNC_FAIL, __LINE__, __func__, __FILE__,
"error calling slow RHS function(s)");
return (ARK_RHSFUNC_FAIL);
}
retval = mriStep_Hin(ark_mem, ark_mem->tcur, tout, ark_mem->tempv1,
retval = mriStep_Hin(ark_mem, ark_mem->tn, tout, ark_mem->tempv1,
&(ark_mem->hin));
if (retval != ARK_SUCCESS)
{
Expand Down Expand Up @@ -1870,7 +1870,7 @@ int mriStep_TakeStepMRIGARK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPt
SUNLogInfo(ARK_LOGGER, "begin-stages-list",
"stage = 0, stage type = %d, tcur = " SUN_FORMAT_G, MRISTAGE_FIRST,
ark_mem->tcur);
SUNLogExtraDebugVec(ARK_LOGGER, "slow stage", ark_mem->ycur, "z_0(:) =");
SUNLogExtraDebugVec(ARK_LOGGER, "slow stage", ark_mem->yn, "z_0(:) =");

/* Evaluate the slow RHS functions if needed. NOTE: we decide between calling the
full RHS function (if ark_mem->fn is non-NULL and MRIStep is not an inner
Expand Down Expand Up @@ -2917,7 +2917,8 @@ int mriStep_TakeStepMERK(ARKodeMem ark_mem, sunrealtype* dsmPtr, int* nflagPtr)
/* for adaptive computations, reset the inner integrator to the beginning of this step */
if (!ark_mem->fixedstep)
{
retval = mriStepInnerStepper_Reset(step_mem->stepper, t0, ark_mem->ycur);
retval = mriStepInnerStepper_Reset(step_mem->stepper, ark_mem->tn,
ark_mem->ycur);
if (retval != ARK_SUCCESS)
{
arkProcessError(ark_mem, ARK_INNERSTEP_FAIL, __LINE__, __func__, __FILE__,
Expand Down
Loading