Skip to content

Add message about switching to default SPRK order #563

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Sep 11, 2024
Merged

Add message about switching to default SPRK order #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7a2058
Add message about switching to default SPRK order
Steven-Roberts Sep 4, 2024
e97af40
Merge branch 'develop' into bugfix/sprk-order-msg
Steven-Roberts Sep 6, 2024
bab2185
Make invalid order a warning
Steven-Roberts Sep 6, 2024
c09456a
Merge branch 'develop' into bugfix/sprk-order-msg
gardner48 Sep 10, 2024
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
6 changes: 3 additions & 3 deletions src/arkode/arkode_arkstep.c
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading