Skip to content

Commit

Permalink
Merge branch 'develop' into feature/min-err
Browse files Browse the repository at this point in the history
  • Loading branch information
Steven-Roberts committed Sep 11, 2024
2 parents 1db5b33 + 9f0f337 commit f81a60d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
6 changes: 3 additions & 3 deletions src/arkode/arkode_arkstep.c
Original file line number Diff line number Diff line change
Expand Up @@ -2223,7 +2223,7 @@ int arkStep_SetButcherTables(ARKodeMem ark_mem)
itable = ARKSTEP_DEFAULT_ARK_ITABLE_5;
break;
default: /* no available method, set default */
arkProcessError(ark_mem, ARK_ILL_INPUT, __LINE__, __func__, __FILE__,
arkProcessError(ark_mem, ARK_WARNING, __LINE__, __func__, __FILE__,
"No ImEx method at requested order, using q=5.");
etable = ARKSTEP_DEFAULT_ARK_ETABLE_5;
itable = ARKSTEP_DEFAULT_ARK_ITABLE_5;
Expand All @@ -2242,7 +2242,7 @@ int arkStep_SetButcherTables(ARKodeMem ark_mem)
case (4): itable = ARKSTEP_DEFAULT_DIRK_4; break;
case (5): itable = ARKSTEP_DEFAULT_DIRK_5; break;
default: /* no available method, set default */
arkProcessError(ark_mem, ARK_ILL_INPUT, __LINE__, __func__, __FILE__,
arkProcessError(ark_mem, ARK_WARNING, __LINE__, __func__, __FILE__,
"No implicit method at requested order, using q=5.");
itable = ARKSTEP_DEFAULT_DIRK_5;
break;
Expand All @@ -2264,7 +2264,7 @@ int arkStep_SetButcherTables(ARKodeMem ark_mem)
case (8): etable = ARKSTEP_DEFAULT_ERK_8; break;
case (9): etable = ARKSTEP_DEFAULT_ERK_9; break;
default: /* no available method, set default */
arkProcessError(ark_mem, ARK_ILL_INPUT, __LINE__, __func__, __FILE__,
arkProcessError(ark_mem, ARK_WARNING, __LINE__, __func__, __FILE__,
"No explicit method at requested order, using q=9.");
etable = ARKSTEP_DEFAULT_ERK_9;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/arkode/arkode_erkstep.c
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ int erkStep_SetButcherTable(ARKodeMem ark_mem)
case (8): etable = ERKSTEP_DEFAULT_8; break;
case (9): etable = ERKSTEP_DEFAULT_9; break;
default: /* no available method, set default */
arkProcessError(ark_mem, ARK_ILL_INPUT, __LINE__, __func__, __FILE__,
arkProcessError(ark_mem, ARK_WARNING, __LINE__, __func__, __FILE__,
"No explicit method at requested order, using q=9.");
etable = ERKSTEP_DEFAULT_9;
break;
Expand Down
2 changes: 1 addition & 1 deletion src/arkode/arkode_mristep.c
Original file line number Diff line number Diff line change
Expand Up @@ -1745,7 +1745,7 @@ int mriStep_SetCoupling(ARKodeMem ark_mem)

if (q_actual < 1 || q_actual > 4)
{
arkProcessError(ark_mem, ARK_ILL_INPUT, __LINE__, __func__, __FILE__,
arkProcessError(ark_mem, ARK_WARNING, __LINE__, __func__, __FILE__,
"No MRI method at requested order, using q=3.");
q_actual = 3;
}
Expand Down
2 changes: 2 additions & 0 deletions src/arkode/arkode_sprkstep.c
Original file line number Diff line number Diff line change
Expand Up @@ -407,6 +407,8 @@ int sprkStep_Init(ARKodeMem ark_mem, int init_type)
step_mem->method = ARKodeSPRKTable_Load(SPRKSTEP_DEFAULT_10);
break;
default:
arkProcessError(ark_mem, ARK_WARNING, __LINE__, __func__, __FILE__,
"No SPRK method at requested order, using q=4.");
step_mem->method = ARKodeSPRKTable_Load(SPRKSTEP_DEFAULT_4);
break;
}
Expand Down

0 comments on commit f81a60d

Please sign in to comment.