From ec8bbdeb80a4c5a588467ea20cb8c9c918942c37 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Wed, 2 Oct 2024 15:38:37 -0700 Subject: [PATCH] more cleanup --- src/arkode/arkode_arkstep.c | 16 ++++++++-------- src/arkode/arkode_impl.h | 3 --- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/arkode/arkode_arkstep.c b/src/arkode/arkode_arkstep.c index 26e6e7499e..dd98d674ef 100644 --- a/src/arkode/arkode_arkstep.c +++ b/src/arkode/arkode_arkstep.c @@ -3143,26 +3143,26 @@ int ARKStepCreateMRIStepInnerStepper(void* inner_arkode_mem, &ark_mem, &step_mem); if (retval) { - arkProcessError(NULL, ARK_ILL_INPUT, __LINE__, __func__, __FILE__, + arkProcessError(inner_arkode_mem, ARK_ILL_INPUT, __LINE__, __func__, __FILE__, "The ARKStep memory pointer is NULL"); return ARK_ILL_INPUT; } retval = MRIStepInnerStepper_Create(ark_mem->sunctx, stepper); - if (retval != ARK_SUCCESS) { return (retval); } + if (retval != ARK_SUCCESS) { return retval; } retval = MRIStepInnerStepper_SetContent(*stepper, inner_arkode_mem); - if (retval != ARK_SUCCESS) { return (retval); } + if (retval != ARK_SUCCESS) { return retval; } retval = MRIStepInnerStepper_SetEvolveFn(*stepper, arkStep_MRIStepInnerEvolve); - if (retval != ARK_SUCCESS) { return (retval); } + if (retval != ARK_SUCCESS) { return retval; } retval = MRIStepInnerStepper_SetFullRhsFn(*stepper, arkStep_MRIStepInnerFullRhs); - if (retval != ARK_SUCCESS) { return (retval); } + if (retval != ARK_SUCCESS) { return retval; } retval = MRIStepInnerStepper_SetResetFn(*stepper, arkStep_MRIStepInnerReset); - if (retval != ARK_SUCCESS) { return (retval); } + if (retval != ARK_SUCCESS) { return retval; } return (ARK_SUCCESS); } @@ -3337,9 +3337,9 @@ int arkStep_SetInnerForcing(ARKodeMem ark_mem, sunrealtype tshift, /* access ARKodeARKStepMem structure */ if (ark_mem->step_mem == NULL) { - arkProcessError(NULL, ARK_MEM_NULL, __LINE__, __func__, __FILE__, + arkProcessError(ark_mem, ARK_MEM_NULL, __LINE__, __func__, __FILE__, MSG_ARKSTEP_NO_MEM); - return (ARK_MEM_NULL); + return ARK_MEM_NULL; } step_mem = (ARKodeARKStepMem)ark_mem->step_mem; diff --git a/src/arkode/arkode_impl.h b/src/arkode/arkode_impl.h index 50dc937c5b..fd8227ff70 100644 --- a/src/arkode/arkode_impl.h +++ b/src/arkode/arkode_impl.h @@ -650,9 +650,6 @@ int arkSetAdaptivityMethod(void* arkode_mem, int imethod, int idefault, int pq, sunrealtype adapt_params[3]); int arkSetAdaptivityFn(void* arkode_mem, ARKAdaptFn hfun, void* h_data); -int arkAllocSUNStepperForcing(SUNStepper stepper, int count, N_Vector tmpl); -int arkFreeSUNStepperForcing(SUNStepper stepper); - ARKODE_DIRKTableID arkButcherTableDIRKNameToID(const char* imethod); ARKODE_ERKTableID arkButcherTableERKNameToID(const char* emethod);