Skip to content

Commit

Permalink
Merge branch 'develop' into bugfix/return-val
Browse files Browse the repository at this point in the history
  • Loading branch information
gardner48 authored Jan 31, 2025
2 parents a1b231b + 3e3c999 commit d0e76d8
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions examples/arkode/C_serial/ark_analytic_lsrk.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ int main(void)
specify the right-hand side function in y'=f(t,y), the initial time
T0, and the initial dependent variable vector y. */
arkode_mem = LSRKStepCreateSTS(f, T0, y, ctx);
if (check_flag((void*)arkode_mem, "ARKStepCreate", 0)) { return 1; }
if (check_flag((void*)arkode_mem, "LSRKStepCreateSTS", 0)) { return 1; }

/* Set routines */
flag = ARKodeSetUserData(arkode_mem,
Expand All @@ -131,7 +131,7 @@ int main(void)

/* Specify tolerances */
flag = ARKodeSStolerances(arkode_mem, reltol, abstol);
if (check_flag(&flag, "ARKStepSStolerances", 1)) { return 1; }
if (check_flag(&flag, "ARKodeSStolerances", 1)) { return 1; }

/* Specify user provided spectral radius */
flag = LSRKStepSetDomEigFn(arkode_mem, dom_eig);
Expand Down
6 changes: 3 additions & 3 deletions examples/arkode/C_serial/ark_analytic_lsrk_varjac.c
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ int main(void)
specify the right-hand side function in y'=f(t,y), the initial time
T0, and the initial dependent variable vector y. */
arkode_mem = LSRKStepCreateSTS(f, T0, y, ctx);
if (check_flag((void*)arkode_mem, "ARKStepCreate", 0)) { return 1; }
if (check_flag((void*)arkode_mem, "LSRKStepCreateSTS", 0)) { return 1; }

/* Set routines */
flag = ARKodeSetUserData(arkode_mem,
Expand All @@ -156,7 +156,7 @@ int main(void)

/* Specify tolerances */
flag = ARKodeSStolerances(arkode_mem, reltol, abstol);
if (check_flag(&flag, "ARKStepSStolerances", 1)) { return 1; }
if (check_flag(&flag, "ARKodeSStolerances", 1)) { return 1; }

/* Specify user provided spectral radius */
flag = LSRKStepSetDomEigFn(arkode_mem, dom_eig);
Expand Down Expand Up @@ -198,7 +198,7 @@ int main(void)
while (Tf - t > SUN_RCONST(1.0e-15))
{
flag = ARKodeEvolve(arkode_mem, tout, y, &t, ARK_NORMAL); /* call integrator */
if (check_flag(&flag, "LSRKodeEvolve", 1)) { break; }
if (check_flag(&flag, "ARKodeEvolve", 1)) { break; }
printf(" %10.6" FSYM " %10.6" FSYM "\n", t,
N_VGetArrayPointer(y)[0]); /* access/print solution */
fprintf(UFID, " %.16" ESYM " %.16" ESYM "\n", t, N_VGetArrayPointer(y)[0]);
Expand Down
2 changes: 1 addition & 1 deletion examples/arkode/C_serial/ark_analytic_partitioned.c
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ int main(int argc, char* argv[])
}

flag = SplittingStepSetCoefficients(arkode_mem, coefficients);
if (check_flag(&flag, "ARKodeSetFixedStep", 1)) { return 1; }
if (check_flag(&flag, "SplittingStepSetCoefficients", 1)) { return 1; }

SplittingStepCoefficients_Destroy(&coefficients);
}
Expand Down
4 changes: 2 additions & 2 deletions examples/arkode/C_serial/ark_analytic_ssprk.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ int main(void)
specify the right-hand side function in y'=f(t,y), the initial time
T0, and the initial dependent variable vector y. */
arkode_mem = LSRKStepCreateSSP(f, T0, y, ctx);
if (check_flag((void*)arkode_mem, "ARKStepCreate", 0)) { return 1; }
if (check_flag((void*)arkode_mem, "LSRKStepCreateSSP", 0)) { return 1; }

/* Set routines */
flag = ARKodeSetUserData(arkode_mem,
Expand All @@ -122,7 +122,7 @@ int main(void)

/* Specify tolerances */
flag = ARKodeSStolerances(arkode_mem, reltol, abstol);
if (check_flag(&flag, "ARKStepSStolerances", 1)) { return 1; }
if (check_flag(&flag, "ARKodeSStolerances", 1)) { return 1; }

/* Specify max number of steps allowed */
flag = ARKodeSetMaxNumSteps(arkode_mem, 1000);
Expand Down

0 comments on commit d0e76d8

Please sign in to comment.