From f6ff36da3d47c75a4db0f81410d38549242e6354 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 26 Jul 2024 13:50:38 -0700 Subject: [PATCH 01/31] Update default RK methods by order --- include/arkode/arkode_arkstep.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h index f7a6f112f5..960839a805 100644 --- a/include/arkode/arkode_arkstep.h +++ b/include/arkode/arkode_arkstep.h @@ -36,31 +36,33 @@ extern "C" { /* explicit */ static const int ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; -static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_HEUN_EULER_2_1_2; +// TODO(SBR): replace with FSAL Ralston method +static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_EULER_2_1_2; static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; -static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_ZONNEVELD_5_3_4; -static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_CASH_KARP_6_4_5; -static const int ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_8_5_6; +static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; +// TODO(SBR): Consider https://doi.org/10.1016/j.camwa.2011.06.002. Needs extension to quad precision +static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_DORMAND_PRINCE_7_4_5; +static const int ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6; static const int ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7; -static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_13_7_8; +static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8; static const int ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9; /* implicit */ static const int ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1; -static const int ARKSTEP_DEFAULT_DIRK_2 = ARKODE_SDIRK_2_1_2; -static const int ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ARK324L2SA_DIRK_4_2_3; -static const int ARKSTEP_DEFAULT_DIRK_4 = ARKODE_SDIRK_5_3_4; -static const int ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ARK548L2SA_DIRK_8_4_5; +static const int ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2; +static const int ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3; +static const int ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4; +static const int ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5; /* ImEx */ static const int ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2; static const int ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3; -static const int ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK436L2SA_ERK_6_3_4; -static const int ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SA_ERK_8_4_5; +static const int ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4; +static const int ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5; static const int ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2; static const int ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3; -static const int ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK436L2SA_DIRK_6_3_4; -static const int ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SA_DIRK_8_4_5; +static const int ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4; +static const int ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5; /* ------------------- * Exported Functions From 2bc4fb07883a7f1004c6798980521ee16e9ca052 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 26 Jul 2024 16:06:30 -0700 Subject: [PATCH 02/31] Add 5th order ERK of Tsitouras --- include/arkode/arkode_arkstep.h | 3 +- include/arkode/arkode_butcher_erk.h | 3 +- src/arkode/arkode_butcher_erk.def | 53 +++++++++++++++++++++++++++++ 3 files changed, 56 insertions(+), 3 deletions(-) diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h index 960839a805..c67d81d329 100644 --- a/include/arkode/arkode_arkstep.h +++ b/include/arkode/arkode_arkstep.h @@ -40,8 +40,7 @@ static const int ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_EULER_2_1_2; static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; -// TODO(SBR): Consider https://doi.org/10.1016/j.camwa.2011.06.002. Needs extension to quad precision -static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_DORMAND_PRINCE_7_4_5; +static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5; static const int ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6; static const int ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7; static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8; diff --git a/include/arkode/arkode_butcher_erk.h b/include/arkode/arkode_butcher_erk.h index c6c0373510..9b210038da 100644 --- a/include/arkode/arkode_butcher_erk.h +++ b/include/arkode/arkode_butcher_erk.h @@ -52,7 +52,8 @@ typedef enum ARKODE_FORWARD_EULER_1_1, ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, - ARKODE_MAX_ERK_NUM = ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2 + ARKODE_TSITOURAS_7_4_5, + ARKODE_MAX_ERK_NUM = ARKODE_TSITOURAS_7_4_5 } ARKODE_ERKTableID; /* Accessor routine to load built-in ERK table */ diff --git a/src/arkode/arkode_butcher_erk.def b/src/arkode/arkode_butcher_erk.def index 4da35f9d07..94cb4d6068 100644 --- a/src/arkode/arkode_butcher_erk.def +++ b/src/arkode/arkode_butcher_erk.def @@ -50,6 +50,7 @@ ARKODE_ARK436L2SA_ERK_6_3_4* N ARKODE_ARK437L2SA_ERK_7_3_4* N ARKODE_SAYFY_ABURUB_6_3_4 N + ARKODE_TSITOURAS_7_4_5 Y ARKODE_CASH_KARP_6_4_5 Y ARKODE_FEHLBERG_6_4_5 Y ARKODE_DORMAND_PRINCE_7_4_5 Y @@ -424,6 +425,58 @@ ARK_BUTCHER_TABLE(ARKODE_SAYFY_ABURUB_6_3_4, { /* Sayfy-Aburub-4-3-ERK */ return B; }) +ARK_BUTCHER_TABLE(ARKODE_TSITOURAS_7_4_5, { /* Tsitouras-ERK */ + ARKodeButcherTable B = ARKodeButcherTable_Alloc(7, SUNTRUE); + B->q = 5; + B->p = 4; + B->A[1][0] = SUN_RCONST(0.161); + B->A[2][0] = SUN_RCONST(-0.008480655492356988544426874250230774675121); + B->A[2][1] = SUN_RCONST(0.3354806554923569885444268742502307746751); + B->A[3][0] = SUN_RCONST(2.897153057105493432130432594192938764925); + B->A[3][1] = SUN_RCONST(-6.359448489975074843148159912383825625953); + B->A[3][2] = SUN_RCONST(4.362295432869581411017727318190886861028); + B->A[4][0] = SUN_RCONST(5.325864828439256604428877920840511317836); + B->A[4][1] = SUN_RCONST(-11.74888356406282787774717033978577296189); + B->A[4][2] = SUN_RCONST(7.495539342889836208304604784564358155659); + B->A[4][3] = SUN_RCONST(-0.0924950663617552492565020793320719161135); + B->A[5][0] = SUN_RCONST(5.861455442946420028659251486982647890394); + B->A[5][1] = SUN_RCONST(-12.92096931784710929170611868178335939542); + B->A[5][2] = SUN_RCONST(8.159367898576158643180400794539253485182); + B->A[5][3] = SUN_RCONST(-0.07158497328140099722453054252582973869127); + B->A[5][4] = SUN_RCONST(-0.02826905039406838290900305721271224146718); + B->A[6][0] = SUN_RCONST(0.09646076681806522951816731316512876333712); + B->A[6][1] = SUN_RCONST(0.01); + B->A[6][2] = SUN_RCONST(0.479889650414499574775249532290596519913); + B->A[6][3] = SUN_RCONST(1.379008574103741893192274821856872770756); + B->A[6][4] = SUN_RCONST(-3.290069515436080679901047585711363850116); + B->A[6][5] = SUN_RCONST(2.324710524099773982415355918398765796109); + + B->b[0] = SUN_RCONST(0.09646076681806522951816731316512876333712); + B->b[1] = SUN_RCONST(0.01); + B->b[2] = SUN_RCONST(0.479889650414499574775249532290596519913); + B->b[3] = SUN_RCONST(1.379008574103741893192274821856872770756); + B->b[4] = SUN_RCONST(-3.290069515436080679901047585711363850116); + B->b[5] = SUN_RCONST(2.324710524099773982415355918398765796109); + B->b[6] = SUN_RCONST(0.0); + + B->d[0] = SUN_RCONST(0.09352374858189270663659270466268853095681); + B->d[1] = SUN_RCONST(0.008652883141566367609681000495464767703693); + B->d[2] = SUN_RCONST(0.4928930991314318681922688329502649219068); + B->d[3] = SUN_RCONST(1.140235412267858095755952327702024828167); + B->d[4] = SUN_RCONST(-2.329180192439364558618150528135494254063); + B->d[5] = SUN_RCONST(1.568875049316615520423655662325051205328); + B->d[6] = SUN_RCONST(0.025); + + B->c[0] = SUN_RCONST(0.0); + B->c[1] = SUN_RCONST(0.161); + B->c[2] = SUN_RCONST(0.327); + B->c[3] = SUN_RCONST(0.9); + B->c[4] = SUN_RCONST(0.9800255409045096857298102862870245954942); + B->c[5] = SUN_RCONST(1.0); + B->c[6] = SUN_RCONST(1.0); + return B; + }) + ARK_BUTCHER_TABLE(ARKODE_CASH_KARP_6_4_5, { /* Cash-Karp-ERK */ ARKodeButcherTable B = ARKodeButcherTable_Alloc(6, SUNTRUE); B->q = 5; From 6acabdc7b93648854dc10a4dbf8b54c757421ee1 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 26 Jul 2024 16:20:43 -0700 Subject: [PATCH 03/31] Add FSAL 2nd order Ralston method --- include/arkode/arkode_arkstep.h | 4 ++-- include/arkode/arkode_butcher_erk.h | 1 + src/arkode/arkode_butcher_erk.def | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h index c67d81d329..6124c4670d 100644 --- a/include/arkode/arkode_arkstep.h +++ b/include/arkode/arkode_arkstep.h @@ -36,8 +36,8 @@ extern "C" { /* explicit */ static const int ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; -// TODO(SBR): replace with FSAL Ralston method -static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_EULER_2_1_2; +//TODO(SBR): Check if this is better than ARKODE_HEUN_EULER_2_1_2 +static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2; static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5; diff --git a/include/arkode/arkode_butcher_erk.h b/include/arkode/arkode_butcher_erk.h index 9b210038da..9e079c6a5a 100644 --- a/include/arkode/arkode_butcher_erk.h +++ b/include/arkode/arkode_butcher_erk.h @@ -52,6 +52,7 @@ typedef enum ARKODE_FORWARD_EULER_1_1, ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, + ARKODE_RALSTON_3_1_2, ARKODE_TSITOURAS_7_4_5, ARKODE_MAX_ERK_NUM = ARKODE_TSITOURAS_7_4_5 } ARKODE_ERKTableID; diff --git a/src/arkode/arkode_butcher_erk.def b/src/arkode/arkode_butcher_erk.def index 94cb4d6068..e2337b8527 100644 --- a/src/arkode/arkode_butcher_erk.def +++ b/src/arkode/arkode_butcher_erk.def @@ -81,6 +81,29 @@ ARK_BUTCHER_TABLE(ARKODE_FORWARD_EULER_1_1, { /* Euler-ERK */ return B; }) +ARK_BUTCHER_TABLE(ARKODE_RALSTON_3_1_2, { /* Ralston-ERK */ + ARKodeButcherTable B = ARKodeButcherTable_Alloc(3, SUNTRUE); + B->q = 2; + B->p = 1; + + B->A[1][0] = SUN_RCONST(2.0)/SUN_RCONST(3.0); + B->A[2][0] = SUN_RCONST(1.0)/SUN_RCONST(4.0); + B->A[2][1] = SUN_RCONST(3.0)/SUN_RCONST(4.0); + + B->b[0] = SUN_RCONST(1.0)/SUN_RCONST(4.0); + B->b[1] = SUN_RCONST(3.0)/SUN_RCONST(4.0); + B->b[2] = SUN_RCONST(0.0); + + B->d[0] = SUN_RCONST(5.0)/SUN_RCONST(37.0); + B->d[1] = SUN_RCONST(2.0)/SUN_RCONST(3.0); + B->d[2] = SUN_RCONST(22.0)/SUN_RCONST(111.0); + + B->c[1] = SUN_RCONST(2.0)/SUN_RCONST(3.0); + B->c[2] = SUN_RCONST(1.0); + + return B; + }) + ARK_BUTCHER_TABLE(ARKODE_HEUN_EULER_2_1_2, { /* Heun-Euler-ERK */ ARKodeButcherTable B = ARKodeButcherTable_Alloc(2, SUNTRUE); B->q = 2; From c5aeea6f87bd8b8a9c557a95052071ea09cb25c4 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 26 Jul 2024 16:21:54 -0700 Subject: [PATCH 04/31] Add Ralston to table in def file --- src/arkode/arkode_butcher_erk.def | 1 + 1 file changed, 1 insertion(+) diff --git a/src/arkode/arkode_butcher_erk.def b/src/arkode/arkode_butcher_erk.def index e2337b8527..b7daadd20a 100644 --- a/src/arkode/arkode_butcher_erk.def +++ b/src/arkode/arkode_butcher_erk.def @@ -39,6 +39,7 @@ imeth QP --------------------------------------- ARKODE_FORWARD_EULER_1_1 Y + ARKODE_RALSTON_3_1_2 Y ARKODE_HEUN_EULER_2_1_2 Y ARKODE_RALSTON_EULER_2_1_2 Y ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2 Y From 609abba8ad5bbb5d7cde14ead93b379918066828 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 26 Jul 2024 16:27:28 -0700 Subject: [PATCH 05/31] Update Fortran interfaces --- src/arkode/fmod_int32/farkode_arkstep_mod.f90 | 26 +++++++++---------- src/arkode/fmod_int32/farkode_mod.f90 | 7 +++-- src/arkode/fmod_int64/farkode_arkstep_mod.f90 | 26 +++++++++---------- src/arkode/fmod_int64/farkode_mod.f90 | 7 +++-- 4 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/arkode/fmod_int32/farkode_arkstep_mod.f90 b/src/arkode/fmod_int32/farkode_arkstep_mod.f90 index cc0373f1eb..3708886004 100644 --- a/src/arkode/fmod_int32/farkode_arkstep_mod.f90 +++ b/src/arkode/fmod_int32/farkode_arkstep_mod.f90 @@ -27,27 +27,27 @@ module farkode_arkstep_mod ! DECLARATION CONSTRUCTS integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_2 = ARKODE_HEUN_EULER_2_1_2 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_4 = ARKODE_ZONNEVELD_5_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_5 = ARKODE_CASH_KARP_6_4_5 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_8_5_6 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_13_7_8 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_2 = ARKODE_SDIRK_2_1_2 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ARK324L2SA_DIRK_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_4 = ARKODE_SDIRK_5_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ARK548L2SA_DIRK_8_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK436L2SA_ERK_6_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SA_ERK_8_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK436L2SA_DIRK_6_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SA_DIRK_8_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5 public :: FARKStepCreate public :: FARKStepReInit public :: FARKStepSetExplicit diff --git a/src/arkode/fmod_int32/farkode_mod.f90 b/src/arkode/fmod_int32/farkode_mod.f90 index 366867f40a..70e4d51066 100644 --- a/src/arkode/fmod_int32/farkode_mod.f90 +++ b/src/arkode/fmod_int32/farkode_mod.f90 @@ -362,7 +362,9 @@ module farkode_mod enumerator :: ARKODE_FORWARD_EULER_1_1 enumerator :: ARKODE_RALSTON_EULER_2_1_2 enumerator :: ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2 - enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2 + enumerator :: ARKODE_RALSTON_3_1_2 + enumerator :: ARKODE_TSITOURAS_7_4_5 + enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_TSITOURAS_7_4_5 end enum integer, parameter, public :: ARKODE_ERKTableID = kind(ARKODE_ERK_NONE) public :: ARKODE_ERK_NONE, ARKODE_MIN_ERK_NUM, ARKODE_HEUN_EULER_2_1_2, ARKODE_BOGACKI_SHAMPINE_4_2_3, & @@ -371,7 +373,8 @@ module farkode_mod ARKODE_VERNER_8_5_6, ARKODE_FEHLBERG_13_7_8, ARKODE_KNOTH_WOLKE_3_3, ARKODE_ARK437L2SA_ERK_7_3_4, & ARKODE_ARK548L2SAb_ERK_8_4_5, ARKODE_ARK2_ERK_3_1_2, ARKODE_SOFRONIOU_SPALETTA_5_3_4, ARKODE_SHU_OSHER_3_2_3, & ARKODE_VERNER_9_5_6, ARKODE_VERNER_10_6_7, ARKODE_VERNER_13_7_8, ARKODE_VERNER_16_8_9, ARKODE_FORWARD_EULER_1_1, & - ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, ARKODE_MAX_ERK_NUM + ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, ARKODE_RALSTON_3_1_2, ARKODE_TSITOURAS_7_4_5, & + ARKODE_MAX_ERK_NUM public :: FARKodeButcherTable_LoadERK public :: FARKodeButcherTable_LoadERKByName public :: FARKodeButcherTable_ERKIDToName diff --git a/src/arkode/fmod_int64/farkode_arkstep_mod.f90 b/src/arkode/fmod_int64/farkode_arkstep_mod.f90 index cc0373f1eb..3708886004 100644 --- a/src/arkode/fmod_int64/farkode_arkstep_mod.f90 +++ b/src/arkode/fmod_int64/farkode_arkstep_mod.f90 @@ -27,27 +27,27 @@ module farkode_arkstep_mod ! DECLARATION CONSTRUCTS integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_2 = ARKODE_HEUN_EULER_2_1_2 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_4 = ARKODE_ZONNEVELD_5_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_5 = ARKODE_CASH_KARP_6_4_5 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_8_5_6 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_13_7_8 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_2 = ARKODE_SDIRK_2_1_2 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ARK324L2SA_DIRK_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_4 = ARKODE_SDIRK_5_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ARK548L2SA_DIRK_8_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK436L2SA_ERK_6_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SA_ERK_8_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2 integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK436L2SA_DIRK_6_3_4 - integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SA_DIRK_8_4_5 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4 + integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5 public :: FARKStepCreate public :: FARKStepReInit public :: FARKStepSetExplicit diff --git a/src/arkode/fmod_int64/farkode_mod.f90 b/src/arkode/fmod_int64/farkode_mod.f90 index e627472572..cf37c6eb1c 100644 --- a/src/arkode/fmod_int64/farkode_mod.f90 +++ b/src/arkode/fmod_int64/farkode_mod.f90 @@ -362,7 +362,9 @@ module farkode_mod enumerator :: ARKODE_FORWARD_EULER_1_1 enumerator :: ARKODE_RALSTON_EULER_2_1_2 enumerator :: ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2 - enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2 + enumerator :: ARKODE_RALSTON_3_1_2 + enumerator :: ARKODE_TSITOURAS_7_4_5 + enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_TSITOURAS_7_4_5 end enum integer, parameter, public :: ARKODE_ERKTableID = kind(ARKODE_ERK_NONE) public :: ARKODE_ERK_NONE, ARKODE_MIN_ERK_NUM, ARKODE_HEUN_EULER_2_1_2, ARKODE_BOGACKI_SHAMPINE_4_2_3, & @@ -371,7 +373,8 @@ module farkode_mod ARKODE_VERNER_8_5_6, ARKODE_FEHLBERG_13_7_8, ARKODE_KNOTH_WOLKE_3_3, ARKODE_ARK437L2SA_ERK_7_3_4, & ARKODE_ARK548L2SAb_ERK_8_4_5, ARKODE_ARK2_ERK_3_1_2, ARKODE_SOFRONIOU_SPALETTA_5_3_4, ARKODE_SHU_OSHER_3_2_3, & ARKODE_VERNER_9_5_6, ARKODE_VERNER_10_6_7, ARKODE_VERNER_13_7_8, ARKODE_VERNER_16_8_9, ARKODE_FORWARD_EULER_1_1, & - ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, ARKODE_MAX_ERK_NUM + ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, ARKODE_RALSTON_3_1_2, ARKODE_TSITOURAS_7_4_5, & + ARKODE_MAX_ERK_NUM public :: FARKodeButcherTable_LoadERK public :: FARKodeButcherTable_LoadERKByName public :: FARKodeButcherTable_ERKIDToName From 1d790fe5266c3a81b78435b8870305ceb32b9cf1 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 6 Sep 2024 16:24:06 -0700 Subject: [PATCH 06/31] Set the default ERKStep methods --- include/arkode/arkode_arkstep.h | 1 - include/arkode/arkode_erkstep.h | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h index 6124c4670d..5e491afb37 100644 --- a/include/arkode/arkode_arkstep.h +++ b/include/arkode/arkode_arkstep.h @@ -36,7 +36,6 @@ extern "C" { /* explicit */ static const int ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; -//TODO(SBR): Check if this is better than ARKODE_HEUN_EULER_2_1_2 static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2; static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h index ed93a240b9..c8a5b883e6 100644 --- a/include/arkode/arkode_erkstep.h +++ b/include/arkode/arkode_erkstep.h @@ -33,13 +33,13 @@ extern "C" { /* Default Butcher tables for each order */ static const int ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1; -static const int ERKSTEP_DEFAULT_2 = ARKODE_HEUN_EULER_2_1_2; +static const int ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2; static const int ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; -static const int ERKSTEP_DEFAULT_4 = ARKODE_ZONNEVELD_5_3_4; -static const int ERKSTEP_DEFAULT_5 = ARKODE_CASH_KARP_6_4_5; -static const int ERKSTEP_DEFAULT_6 = ARKODE_VERNER_8_5_6; +static const int ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; +static const int ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5; +static const int ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6; static const int ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7; -static const int ERKSTEP_DEFAULT_8 = ARKODE_FEHLBERG_13_7_8; +static const int ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8; static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9; /* ------------------- From 4fee262ff7d770c84dedb5b8ed31e45510ef5240 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 6 Sep 2024 16:53:27 -0700 Subject: [PATCH 07/31] Update swig --- src/arkode/fmod_int32/farkode_erkstep_mod.f90 | 10 +++++----- src/arkode/fmod_int64/farkode_erkstep_mod.f90 | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/arkode/fmod_int32/farkode_erkstep_mod.f90 b/src/arkode/fmod_int32/farkode_erkstep_mod.f90 index 291dc643d5..62e68e1227 100644 --- a/src/arkode/fmod_int32/farkode_erkstep_mod.f90 +++ b/src/arkode/fmod_int32/farkode_erkstep_mod.f90 @@ -27,13 +27,13 @@ module farkode_erkstep_mod ! DECLARATION CONSTRUCTS integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_2 = ARKODE_HEUN_EULER_2_1_2 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2 integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_4 = ARKODE_ZONNEVELD_5_3_4 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_5 = ARKODE_CASH_KARP_6_4_5 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_6 = ARKODE_VERNER_8_5_6 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6 integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_8 = ARKODE_FEHLBERG_13_7_8 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8 integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9 public :: FERKStepCreate public :: FERKStepReInit diff --git a/src/arkode/fmod_int64/farkode_erkstep_mod.f90 b/src/arkode/fmod_int64/farkode_erkstep_mod.f90 index 291dc643d5..62e68e1227 100644 --- a/src/arkode/fmod_int64/farkode_erkstep_mod.f90 +++ b/src/arkode/fmod_int64/farkode_erkstep_mod.f90 @@ -27,13 +27,13 @@ module farkode_erkstep_mod ! DECLARATION CONSTRUCTS integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_2 = ARKODE_HEUN_EULER_2_1_2 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2 integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_4 = ARKODE_ZONNEVELD_5_3_4 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_5 = ARKODE_CASH_KARP_6_4_5 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_6 = ARKODE_VERNER_8_5_6 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6 integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7 - integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_8 = ARKODE_FEHLBERG_13_7_8 + integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8 integer(C_INT), parameter, public :: ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9 public :: FERKStepCreate public :: FERKStepReInit From 045adb51fb56e5b01f28eef3ca95a7eb9e0e7e89 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Fri, 6 Sep 2024 17:11:51 -0700 Subject: [PATCH 08/31] Butcher docs fixes --- doc/arkode/guide/source/Butcher.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 0b7e401a56..82a06dcc1c 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -194,7 +194,7 @@ Accessible via the constant ``ARKODE_HEUN_EULER_2_1_2`` to Accessible via the string ``"ARKODE_HEUN_EULER_2_1_2"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the default 2nd order explicit method. +(primary method from :cite:p:`Runge:95`). .. math:: @@ -227,7 +227,7 @@ Accessible via the constant ``ARKODE_RALSTON_EULER_2_1_2`` to :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_RALSTON_EULER_2_1_2"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or -:c:func:`ARKodeButcherTable_LoadERKByName` +:c:func:`ARKodeButcherTable_LoadERKByName`. (primary method from :cite:p:`Ralston:62`). .. math:: @@ -261,7 +261,7 @@ Accessible via the constant ``ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2`` to :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or -:c:func:`ARKodeButcherTable_LoadERKByName` +:c:func:`ARKodeButcherTable_LoadERKByName`. (primary method from :cite:p:`Runge:95`). .. math:: From fb02b3ec43300619d0b884a40fc4870b02b1e56d Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Sat, 7 Sep 2024 20:53:33 -0700 Subject: [PATCH 09/31] Add Ralson method to docs --- doc/arkode/guide/source/Butcher.rst | 36 ++++++++++++++++++ .../figs/arkode/ralston_stab_region.png | Bin 0 -> 23525 bytes 2 files changed, 36 insertions(+) create mode 100644 doc/shared/figs/arkode/ralston_stab_region.png diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 82a06dcc1c..39ec9b9dba 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -181,6 +181,42 @@ This is the default 1st order explicit method (from :cite:p:`Euler:68`). Linear stability region for the forward Euler method. +.. _Butcher.Ralston: + +Ralston-3-1-2 +^^^^^^^^^^^^^ + +.. index:: Ralston-3-1-2 ERK method + +Accessible via the constant ``ARKODE_RALSTON_3_1_2`` to +:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or +:c:func:`ARKodeButcherTable_LoadERK`. +Accessible via the string ``"ARKODE_RALSTON_3_1_2"`` to +:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or +:c:func:`ARKodeButcherTable_LoadERKByName`. +This is the default 2nd order explicit method +(primary method from :cite:p:`Ralston:62`). + +.. math:: + + \renewcommand{\arraystretch}{1.5} + \begin{array}{r|cc} + 0 & 0 & 0 & 0 \\ + \frac{2}{3} & \frac{2}{3} & 0 & 0 \\ + 1 & \frac{1}{4} & \frac{3}{4} & 0 \\ + \hline + 2 & \frac{1}{4} & \frac{3}{4} & 0 \\ + 1 & \frac{5}{37} & \frac{2}{3} & \frac{22}{111} + \end{array} + +.. figure:: /figs/arkode/ralston_stab_region.png + :scale: 50 % + :align: center + + Linear stability region for the Ralston method. The method's + region is outlined in blue; the embedding's region is in red. + + .. _Butcher.Heun_Euler: Heun-Euler-2-1-2 diff --git a/doc/shared/figs/arkode/ralston_stab_region.png b/doc/shared/figs/arkode/ralston_stab_region.png new file mode 100644 index 0000000000000000000000000000000000000000..d224603614b27c4cd9753f22de416073e2b529ce GIT binary patch literal 23525 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 H<)r-&5tWPx literal 0 HcmV?d00001 From 6a9a0ff2d485a2708052e4e502d7d1ba1449cb28 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Sat, 7 Sep 2024 22:10:23 -0700 Subject: [PATCH 10/31] Update defaults in docs --- doc/arkode/guide/source/Butcher.rst | 75 ++++++++++++++------------- doc/arkode/guide/source/Constants.rst | 39 +++++++------- 2 files changed, 60 insertions(+), 54 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 39ec9b9dba..b5365c2442 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -513,6 +513,7 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_SOFRONIOU_SPALETTA_5_3_4"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. +This is the default 4th order explicit method (from :cite:p:`Sof:04`). .. math:: @@ -552,7 +553,6 @@ Accessible via the constant ``ARKODE_ZONNEVELD_5_3_4`` to Accessible via the string ``"ARKODE_ZONNEVELD_5_3_4"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName`, or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the default 4th order explicit method (from :cite:p:`Zon:63`). .. math:: @@ -593,8 +593,8 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_ARK436L2SA_ERK_6_3_4"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the explicit portion of the default 4th order additive method (the -explicit portion of the ARK4(3)6L[2]SA method from :cite:p:`KenCarp:03`). +This is the explicit portion of the ARK4(3)6L[2]SA method from +:cite:p:`KenCarp:03`. .. math:: @@ -634,8 +634,8 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_ARK437L2SA_ERK_7_3_4"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the explicit portion of the 4th order additive method (the explicit -portion of the ARK4(3)7L[2]SA method from :cite:p:`KenCarp:19`). +This is the explicit portion of the default 4th order additive method and the +explicit portion of the ARK4(3)7L[2]SA method from :cite:p:`KenCarp:19`. .. only:: html @@ -849,8 +849,8 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_ARK548L2SA_ERK_8_4_5"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the explicit portion of the default 5th order additive method (the -explicit portion of the ARK5(4)8L[2]SA method from :cite:p:`KenCarp:03`). +This is the explicit portion of the ARK5(4)8L[2]SA method from +:cite:p:`KenCarp:03`. .. only:: html @@ -901,7 +901,8 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_ARK548L2SAb_ERK_8_4_5"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the explicit portion of the 5th order ARK5(4)8L[2]SA method from +This is the explicit portion of the default 5th order additive method and the +explicit portion of the 5th order ARK5(4)8L[2]SA method from :cite:p:`KenCarp:19`. .. only:: html @@ -951,7 +952,7 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_VERNER_8_5_6"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the default 6th order explicit method (from :cite:p:`HEJ:76`). +(from :cite:p:`HEJ:76`). .. math:: @@ -992,7 +993,8 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_VERNER_9_5_6"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the 6th order explicit method IIIXb-6(5) from :cite:p:`Ver:10`. +This is the default 6th order explicit method +(method IIIXb-6(5) from :cite:p:`Ver:10`). .. only:: html @@ -1093,7 +1095,7 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_FEHLBERG_13_7_8"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the default 8th order explicit method (from :cite:p:`Butcher:08`). +(from :cite:p:`Butcher:08`). .. math:: @@ -1140,7 +1142,8 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_VERNER_13_7_8"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the 8th order explicit method IIIX-8(7) from :cite:p:`Ver:10`. +This is the default 8th order explicit method +(method IIIX-8(7) from :cite:p:`Ver:10`). .. only:: html @@ -1302,8 +1305,7 @@ Accessible via the constant ``ARKODE_SDIRK_2_1_2`` to Accessible via the string ``"ARKODE_SDIRK_2_1_2"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the default 2nd order implicit method. Both the method and embedding -are A- and B-stable. +Both the method and embedding are A- and B-stable. .. math:: @@ -1337,8 +1339,9 @@ Accessible via the constant ``ARKODE_ARK2_DIRK_3_1_2`` to Accessible via the string ``"ARKODE_ARK2_DIRK_3_1_2"`` to :c:func:`ARKStepSetTableName`, or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the implicit portion of the default 2nd order additive method (the -implicit portion of the ARK2 method from :cite:p:`giraldo2013implicit`). +This is the default 2nd order implicit method and the implicit portion of the +default 2nd order additive method +(the implicit portion of the ARK2 method from :cite:p:`giraldo2013implicit`). .. math:: @@ -1535,7 +1538,8 @@ Accessible via the constant ``ARKODE_ESDIRK325L2SA_5_2_3`` to Accessible via the string ``"ARKODE_ESDIRK325L2SA_5_2_3"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the ESDIRK3(2)5L[2]SA method from :cite:p:`KenCarp:16`. +This is the default 3rd order implicit method and the ESDIRK3(2)5L[2]SA method +from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. .. figure:: /figs/arkode/stab_region_26.png @@ -1624,10 +1628,10 @@ Accessible via the constant ``ARKODE_ARK324L2SA_DIRK_4_2_3`` to Accessible via the string ``"ARKODE_ARK324L2SA_DIRK_4_2_3"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the default 3rd order implicit method, and the implicit portion of the -default 3rd order additive method. Both the method and embedding are A-stable; -additionally the method is L-stable (this is the implicit portion of the -ARK3(2)4L[2]SA method from :cite:p:`KenCarp:03`). +This is the implicit portion of the default 3rd order additive method. Both the +method and embedding are A-stable; additionally the method is L-stable +(this is the implicit portion of the ARK3(2)4L[2]SA method from +:cite:p:`KenCarp:03`). .. math:: @@ -1751,9 +1755,8 @@ Accessible via the constant ``ARKODE_SDIRK_5_3_4`` to Accessible via the string ``"ARKODE_SDIRK_5_3_4"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the default 4th order implicit method. Here, the method is both A- and -L-stable, although the embedding has reduced stability -(from :cite:p:`HaWa:91`). +Here, the method is both A- and L-stable, although the embedding has reduced +stability (from :cite:p:`HaWa:91`). .. math:: @@ -1844,9 +1847,9 @@ Accessible via the constant ``ARKODE_ARK436L2SA_DIRK_6_3_4`` to Accessible via the string ``"ARKODE_ARK436L2SA_DIRK_6_3_4"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the implicit portion of the default 4th order additive method. Both the -method and embedding are A-stable; additionally the method is L-stable (this is -the implicit portion of the ARK4(3)6L[2]SA method from :cite:p:`KenCarp:03`). +Both the method and embedding are A-stable; additionally the method is L-stable +(this is the implicit portion of the ARK4(3)6L[2]SA method from +:cite:p:`KenCarp:03`). .. math:: @@ -1888,7 +1891,8 @@ Accessible via the constant ``ARKODE_ARK437L2SA_DIRK_7_3_4`` to Accessible via the string ``"ARKODE_ARK437L2SA_DIRK_7_3_4"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the implicit portion of the 4th order ARK4(3)7L[2]SA method from +This is the implicit portion of the default 4th order additive method and the +implicit portion of the 4th order ARK4(3)7L[2]SA method from :cite:p:`KenCarp:19`. Both the method and embedding are A- and L-stable. .. math:: @@ -1927,8 +1931,8 @@ Accessible via the constant ``ARKODE_ESDIRK436L2SA_6_3_4`` to Accessible via the string ``"ARKODE_ESDIRK436L2SA_6_3_4"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the ESDIRK4(3)6L[2]SA method from :cite:p:`KenCarp:16`. -Both the method and embedding are A- and L-stable. +This is the default 4th order implicit method and the ESDIRK4(3)6L[2]SA method +from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. .. figure:: /figs/arkode/stab_region_28.png :scale: 50 % @@ -2072,10 +2076,8 @@ Accessible via the constant ``ARKODE_ARK548L2SA_DIRK_8_4_5`` for Accessible via the string ``"ARKODE_ARK548L2SA_DIRK_8_4_5"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the default 5th order implicit method, and the implicit portion of the -default 5th order additive method. Both the method and embedding are A-stable; -additionally the method is L-stable (the implicit portion of the ARK5(4)8L[2]SA -method from :cite:p:`KenCarp:03`). +Both the method and embedding are A-stable; additionally the method is L-stable +(the implicit portion of the ARK5(4)8L[2]SA method from :cite:p:`KenCarp:03`). .. only:: html @@ -2124,6 +2126,7 @@ Accessible via the constant ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` for Accessible via the string ``"ARKODE_ARK548L2SAb_DIRK_8_4_5"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. +This is the implicit portion of the default 5th order additive method. Both the method and embedding are A-stable; additionally the method is L-stable (this is the implicit portion of the 5th order ARK5(4)8L[2]SA method from :cite:p:`KenCarp:19`). @@ -2195,8 +2198,8 @@ Accessible via the constant ``ARKODE_ESDIRK547L2SA2_7_4_5`` to Accessible via the string ``"ARKODE_ESDIRK547L2SA2_7_4_5"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the ESDIRK5(4)7L[2]SA2 method from :cite:p:`KenCarp:19b`. -Both the method and embedding are A- and L-stable. +This is the default 5th order implicit method and the ESDIRK5(4)7L[2]SA2 method +from :cite:p:`KenCarp:19b`. Both the method and embedding are A- and L-stable. .. figure:: /figs/arkode/stab_region_33.png :scale: 50 % diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst index 22363ef243..541dd33db4 100644 --- a/doc/arkode/guide/source/Constants.rst +++ b/doc/arkode/guide/source/Constants.rst @@ -130,25 +130,25 @@ contains the ARKODE output constants. | | (ARKODE_FORWARD_EULER_1_1). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_2` | Use ARKStep's default second-order ERK method | - | | (ARKODE_HEUN_EULER_2_1_2). | + | | (ARKODE_RALSTON_3_1_2). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_3` | Use ARKStep's default third-order ERK method | | | (ARKODE_BOGACKI_SHAMPINE_4_2_3). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_4` | Use ARKStep's default fourth-order ERK method | - | | (ARKODE_ZONNEVELD_5_3_4). | + | | (ARKODE_SOFRONIOU_SPALETTA_5_3_4). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_5` | Use ARKStep's default fifth-order ERK method | - | | (ARKODE_CASH_KARP_6_4_5). | + | | (ARKODE_TSITOURAS_7_4_5). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_6` | Use ARKStep's default sixth-order ERK method | - | | (ARKODE_VERNER_8_5_6). | + | | (ARKODE_VERNER_9_5_6). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_7` | Use ARKStep's default seventh-order ERK method | | | (ARKODE_VERNER_10_6_7). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_8` | Use ARKStep's default eighth-order ERK method | - | | (ARKODE_FEHLBERG_13_7_8). | + | | (ARKODE_VERNER_13_7_8). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ERK_9` | Use ARKStep's default ninth-order ERK method | | | (ARKODE_VERNER_16_8_9). | @@ -157,25 +157,25 @@ contains the ARKODE output constants. | | (ARKODE_FORWARD_EULER_1_1). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_2` | Use ERKStep's default second-order ERK method | - | | (ARKODE_HEUN_EULER_2_1_2). | + | | (ARKODE_RALSTON_3_1_2). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_3` | Use ERKStep's default third-order ERK method | | | (ARKODE_BOGACKI_SHAMPINE_4_2_3). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_4` | Use ERKStep's default fourth-order ERK method | - | | (ARKODE_ZONNEVELD_5_3_4). | + | | (ARKODE_SOFRONIOU_SPALETTA_5_3_4). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_5` | Use ERKStep's default fifth-order ERK method | - | | (ARKODE_CASH_KARP_6_4_5). | + | | (ARKODE_TSITOURAS_7_4_5). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_6` | Use ERKStep's default sixth-order ERK method | - | | (ARKODE_VERNER_8_5_6). | + | | (ARKODE_VERNER_9_5_6). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_7` | Use ERKStep's default seventh-order ERK method | | | (ARKODE_VERNER_10_6_7). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_8` | Use ERKStep's default eighth-order ERK method | - | | (ARKODE_FEHLBERG_13_7_8). | + | | (ARKODE_VERNER_13_7_8). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ERKSTEP_DEFAULT_9` | Use ERKStep's default ninth-order ERK method | | | (ARKODE_VERNER_16_8_9). | @@ -242,16 +242,16 @@ contains the ARKODE output constants. | | (ARKODE_BACKWARD_EULER_1_1). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_DIRK_2` | Use ARKStep's default second-order DIRK method | - | | (ARKODE_SDIRK_2_1_2). | + | | (ARKODE_ARK2_DIRK_3_1_2). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_DIRK_3` | Use ARKStep's default third-order DIRK method | - | | (ARKODE_ARK324L2SA_DIRK_4_2_3). | + | | (ARKODE_ESDIRK325L2SA_5_2_3). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_DIRK_4` | Use ARKStep's default fourth-order DIRK method | - | | (ARKODE_SDIRK_5_3_4). | + | | (ARKODE_ESDIRK436L2SA_6_3_4). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_DIRK_5` | Use ARKStep's default fifth-order DIRK method | - | | (ARKODE_ARK548L2SA_DIRK_8_4_5). | + | | (ARKODE_ESDIRK547L2SA2_7_4_5). | +-----------------------------------------------+------------------------------------------------------------+ | | | +-----------------------------------------------+------------------------------------------------------------+ @@ -275,17 +275,20 @@ contains the ARKODE output constants. | ARKODE_ARK548L2SAb_ERK_8_4_5 & | Use the :index:`ARK-8-4-5b ARK method`. | | ARKODE_ARK548L2SAb_DIRK_8_4_5 | | +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_2` & | Use ARKStep's default second-order ARK method | + | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_2` | (ARKODE_ARK2_ERK_3_1_2 and ARKODE_ARK2_DIRK_3_1_2). | + +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_3` & | Use ARKStep's default third-order ARK method | | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_3` | (ARKODE_ARK324L2SA_ERK_4_2_3 and | | | ARKODE_ARK324L2SA_DIRK_4_2_3). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_4` & | Use ARKStep's default fourth-order ARK method | - | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_4` | (ARKODE_ARK436L2SA_ERK_6_3_4 and | - | | ARKODE_ARK436L2SA_DIRK_6_3_4). | + | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_4` | (ARKODE_ARK437L2SA_ERK_7_3_4 and | + | | ARKODE_ARK437L2SA_DIRK_7_3_4). | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_5` & | Use ARKStep's default fifth-order ARK method | - | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_5` | (ARKODE_ARK548L2SA_ERK_8_4_5 and | - | | ARKODE_ARK548L2SA_DIRK_8_4_5). | + | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_5` | (ARKODE_ARK548L2SAb_ERK_8_4_5 and | + | | ARKODE_ARK548L2SAb_DIRK_8_4_5). | +-----------------------------------------------+------------------------------------------------------------+ | | | +-----------------------------------------------+------------------------------------------------------------+ From f0b32d938c56e766a0755e11403e3f5fb2c1e4bd Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Sat, 7 Sep 2024 22:15:36 -0700 Subject: [PATCH 11/31] Add new methods to constants --- doc/arkode/guide/source/Constants.rst | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst index 541dd33db4..a87c1f9b8c 100644 --- a/doc/arkode/guide/source/Constants.rst +++ b/doc/arkode/guide/source/Constants.rst @@ -78,6 +78,8 @@ contains the ARKODE output constants. +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKODE_FORWARD_EULER_1_1` | Use the Forward-Euler-1-1 ERK method. | +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKODE_RALSTON_3_1_2` | Use the Ralston-3-1-2 ERK method. | + +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKODE_HEUN_EULER_2_1_2` | Use the Heun-Euler-2-1-2 ERK method. | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKODE_RALSTON_EULER_2_1_2` | Use the Ralston-Euler-2-1-2 ERK method. | @@ -98,6 +100,8 @@ contains the ARKODE output constants. +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKODE_SAYFY_ABURUB_6_3_4` | Use the Sayfy-Aburub-6-3-4 ERK method. | +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKODE_TSITOURAS_7_4_5` | Use the Tsitouras 7-4-5 ERK method. | + +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKODE_CASH_KARP_6_4_5` | Use the Cash-Karp-6-4-5 ERK method. | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKODE_FEHLBERG_6_4_5` | Use the Fehlberg-6-4-5 ERK method. | From b7518b2b7768b8f58422e5d03d99e526c747a58c Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Sat, 7 Sep 2024 22:48:38 -0700 Subject: [PATCH 12/31] Update changelog --- CHANGELOG.md | 19 +++++++++++++++++++ doc/shared/RecentChanges.rst | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a82dd8621..c4b5070932 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,25 @@ ### New Features and Enhancements +Added the `ARKODE_RALSTON_3_1_2` and `ARKODE_TSITOURAS_7_4_5` explicit +Runge-Kutta Butcher tables. + +Improved the efficiency of default ARKODE methods with the following changes: + +| Type | Old Default | New Default | +| ------------------ | ---------------------------------------------------------------- | ------------------------------------------------------------------ | +| 2nd Order Explicit | `ARKODE_HEUN_EULER_2_1_2` | `ARKODE_RALSTON_3_1_2` | +| 4th Order Explicit | `ARKODE_ZONNEVELD_5_3_4` | `ARKODE_SOFRONIOU_SPALETTA_5_3_4` | +| 5th Order Explicit | `ARKODE_CASH_KARP_6_4_5` | `ARKODE_TSITOURAS_7_4_5` | +| 6th Order Explicit | `ARKODE_VERNER_8_5_6` | `ARKODE_VERNER_9_5_6` | +| 8th Order Explicit | `ARKODE_FEHLBERG_13_7_8` | `ARKODE_VERNER_13_7_8` | +| 2nd Order Implicit | `ARKODE_SDIRK_2_1_2` | `ARKODE_ARK2_DIRK_3_1_2` | +| 3rd Order Implicit | `ARKODE_ARK324L2SA_DIRK_4_2_3` | `ARKODE_ESDIRK325L2SA_5_2_3` | +| 4th Order Implicit | `ARKODE_SDIRK_5_3_4` | `ARKODE_ESDIRK436L2SA_6_3_4` | +| 5th Order Implicit | `ARKODE_ARK548L2SA_DIRK_8_4_5` | `ARKODE_ESDIRK547L2SA2_7_4_5` | +| 4th Order ARK | `ARKODE_ARK436L2SA_ERK_6_3_4` and `ARKODE_ARK436L2SA_DIRK_6_3_4` | `ARKODE_ARK437L2SA_ERK_7_3_4` and `ARKODE_ARK437L2SA_DIRK_7_3_4` | +| 5th Order ARK | `ARKODE_ARK548L2SA_ERK_8_4_5` and `ARKODE_ARK548L2SA_DIRK_8_4_5` | `ARKODE_ARK548L2SAb_ERK_8_4_5` and `ARKODE_ARK548L2SAb_DIRK_8_4_5` | + The default value of `CMAKE_CUDA_ARCHITECTURES` is no longer set to `70` and is now determined automatically by CMake. The previous default was only valid for Volta GPUs while the automatically selected value will vary across compilers and diff --git a/doc/shared/RecentChanges.rst b/doc/shared/RecentChanges.rst index 0cd3986ee3..f5148946a1 100644 --- a/doc/shared/RecentChanges.rst +++ b/doc/shared/RecentChanges.rst @@ -2,6 +2,40 @@ **New Features and Enhancements** +Added the ``ARKODE_RALSTON_3_1_2`` and ``ARKODE_TSITOURAS_7_4_5`` explicit +Runge-Kutta Butcher tables. + +Improved the efficiency of default ARKODE methods with the following changes: + ++--------------------+-------------------------------------+--------------------------------------+ +| Type | Old Default | New Default | ++====================+=====================================+======================================+ +| 2nd Order Explicit | ``ARKODE_HEUN_EULER_2_1_2`` | ``ARKODE_RALSTON_3_1_2`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 4th Order Explicit | ``ARKODE_ZONNEVELD_5_3_4`` | ``ARKODE_SOFRONIOU_SPALETTA_5_3_4`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 5th Order Explicit | ``ARKODE_CASH_KARP_6_4_5`` | ``ARKODE_TSITOURAS_7_4_5`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 6th Order Explicit | ``ARKODE_VERNER_8_5_6`` | ``ARKODE_VERNER_9_5_6`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 8th Order Explicit | ``ARKODE_FEHLBERG_13_7_8`` | ``ARKODE_VERNER_13_7_8`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 2nd Order Implicit | ``ARKODE_SDIRK_2_1_2`` | ``ARKODE_ARK2_DIRK_3_1_2`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 3rd Order Implicit | ``ARKODE_ARK324L2SA_DIRK_4_2_3`` | ``ARKODE_ESDIRK325L2SA_5_2_3`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 4th Order Implicit | ``ARKODE_SDIRK_5_3_4`` | ``ARKODE_ESDIRK436L2SA_6_3_4`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 5th Order Implicit | ``ARKODE_ARK548L2SA_DIRK_8_4_5`` | ``ARKODE_ESDIRK547L2SA2_7_4_5`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 4th Order ARK | ``ARKODE_ARK436L2SA_ERK_6_3_4`` and | ``ARKODE_ARK437L2SA_ERK_7_3_4`` and | +| | ``ARKODE_ARK436L2SA_DIRK_6_3_4`` | ``ARKODE_ARK437L2SA_DIRK_7_3_4`` | ++--------------------+-------------------------------------+--------------------------------------+ +| 5th Order ARK | ``ARKODE_ARK548L2SA_ERK_8_4_5`` and | ``ARKODE_ARK548L2SAb_ERK_8_4_5`` and | +| | ``ARKODE_ARK548L2SA_DIRK_8_4_5`` | ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` | ++--------------------+-------------------------------------+--------------------------------------+ + + The default value of :cmakeop:`CMAKE_CUDA_ARCHITECTURES` is no longer set to ``70`` and is now determined automatically by CMake. The previous default was only valid for Volta GPUs while the automatically selected value will vary From 3f015dd17154e3270ef8899d62d7798f8bc90428 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Sat, 7 Sep 2024 23:30:29 -0700 Subject: [PATCH 13/31] Add Tsitouras method to docs --- doc/arkode/guide/source/Butcher.rst | 45 +++++++++++++++++- .../figs/arkode/tsitouras_stab_region.png | Bin 0 -> 24936 bytes doc/shared/sundials.bib | 14 ++++++ 3 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 doc/shared/figs/arkode/tsitouras_stab_region.png diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index b5365c2442..00cd563500 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -707,7 +707,50 @@ Accessible via the string ``"ARKODE_SAYFY_ABURUB_6_3_4"`` to region is outlined in blue; the embedding's region is in red. +.. _Butcher.Tsitouras: +Tsitouras-6-4-5 +^^^^^^^^^^^^^^^ + +.. index:: Tsitouras-6-4-5 ERK method + +Accessible via the constant ``ARKODE_TSITOURAS_7_4_5`` to +:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` +or :c:func:`ARKodeButcherTable_LoadERK`. +Accessible via the string ``"ARKODE_TSITOURAS_7_4_5"`` to +:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or +:c:func:`ARKodeButcherTable_LoadERKByName`. +This is the default 5th order explicit method (from :cite:p:`Tsitouras:11`). + +.. only:: html + + .. math:: + + \renewcommand{\arraystretch}{1.5} + \begin{array}{r|ccccccc} + 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ + 0.1610000000000000 & 0.1610000000000000 & 0 & 0 & 0 & 0 & 0 & 0 \\ + 0.3270000000000000 & -0.008480655492356989 & 0.3354806554923570 & 0 & 0 & 0 & 0 & 0 \\ + 0.9000000000000000 & 2.897153057105493 & -6.359448489975075 & 4.362295432869581 & 0 & 0 & 0 & 0 \\ + 0.9800255409045097 & 5.325864828439257 & -11.74888356406283 & 7.495539342889836 & -0.09249506636175525 & 0 & 0 & 0 \\ + 1.000000000000000 & 5.861455442946420 & -12.92096931784711 & 8.159367898576159 & -0.07158497328140100 & -0.02826905039406838 & 0 & 0 \\ + 1.000000000000000 & 0.09646076681806523 & 0.01000000000000000 & 0.4798896504144996 & 1.379008574103742 & -3.290069515436081 & 2.324710524099774 & 0 \\ + \hline + 5 & 0.09646076681806523 & 0.01000000000000000 & 0.4798896504144996 & 1.379008574103742 & -3.290069515436081 & 2.324710524099774 & 0 \\ + 4 & 0.09352374858189271 & 0.008652883141566368 & 0.4928930991314319 & 1.140235412267858 & -2.329180192439365 & 1.568875049316616 & 0.02500000000000000 + \end{array} + +.. only:: latex + + The Butcher table is too large to fit in the PDF version of this documentation. Please see the HTML documentation for the table coefficients. + + +.. figure:: /figs/arkode/tsitouras_stab_region.png + :scale: 50 % + :align: center + + Linear stability region for the Tsitouras method. The method's + region is outlined in blue; the embedding's region is in red. .. _Butcher.Cash-Karp: @@ -723,7 +766,7 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_CASH_KARP_6_4_5"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the default 5th order explicit method (from :cite:p:`CashKarp:90`). +(from :cite:p:`CashKarp:90`). .. math:: diff --git a/doc/shared/figs/arkode/tsitouras_stab_region.png b/doc/shared/figs/arkode/tsitouras_stab_region.png new file mode 100644 index 0000000000000000000000000000000000000000..664b69ded3a02bf8b171f3442c5675b32a7dfe14 GIT binary patch literal 24936 zcmc$`XH*nj*DYEEp-I{x0+O2`3X(x`MuI2`5=4m-Bq*7doCF0yf`X_75fA|plqgvd z0YQ+QlLX0>%(8<-o?JT>dqosiCwP6N0o&!Bz z#nsxv-OkC8UC-{0H6kRzf7RNVUqnbmj9o-jT1Z@4NNmQQ?FoXgBbus8dY(xO!(N`W z`e|D$okn58#NWeG2}EKkh*du^#Ae;*#n2Oz#LI{%s+wbsCdW^(e4=)bJ9*yO*+NG> z9TUu;#PWOWNUT1#?mdH80p$%2njm_ml9=CH(T@u{9Q2)vla{7eR%Y|^@}%`mW)ECS zT)kvj31FZzPt5V?Pjj9+b@;)c=u3sH>ukX*#pFe-2^>s#Z`;e;9wdo&kGBQp_U)9xZ zO_5{Tyb&o7J+8yRpCcN{C_Wc&XsW{+%`CM#m0)(RR2J8gD6teo%DVk$`eiXif}q(* zncKAFLX}yKKhNcquCi5@yF)8&D#vDxr5dg29z+a9Df`pi87O)#W~aNnah!&xqod=6 zxI<6H-KF`w3V}v}gXw^S>7E---PO`|9U1&LO0q7$^xv@?<$ory{nc_jA#t(VYjQm3 zVidDfM}c)Sd#_3~t6b6i)@-M`pWVv%*Vu*Y``$Fl85tR>t90qj>7KM|5p$HB>QQ>p zj+2eCHuO9p@R4GK5Wb-vCo9~s~k=oi?Pv%0G&w{MSYlap!S~!^)^QT0t8e>>w@Xt)h zt7vFwyw_)5$@X;CI=cHwqT|fT$%$)_81bAC{UMv)m0aXFJkaHOp1|o*UhU-EWpE*R&50_AQOX*z>jtA2&jH9IiC5@kMubbYxzBIRZ~_pxEK1 zLV$nE3vrpdzt8gWij;R+ufh@mGJIXU@2$({LPAsHE&wjG$K+oRQ0*l`HHWMRwtm5GM#{z|XHosUkV)nD#YU1jaf(n=WLRcn~e+l--n&2hNfQDvmLLSCW3CV2Uwss19$}-WqiNd7L!eFTr%t})yT-WD>`M1a1b4`A`n^hB0GQsqp+S;?vIgQ9V zja0%Q;omD)P0?%L-M?wG@1Yd3&3KPJ=~uZqvzkkFv?jwh1%t ztot>mC#4BiZ>OcD-P~UO`QRwasvLP}>oH}i6Arz3`U&3?B`%jObar;abIlXzb!%05 z`UfV*zBBWYlkk1YljHiHcYK+JZ-$K4Rt*0x9r1Sf`tZc==Hl+}iY0jFtE;ObA|kGC zZcb%Wblh9p`w?w_-q_E4dSvS4tsU3CL@viu7t@+7bBtN?%Ha--dw+i^AYZn%sfkh6 z^Zn}fRld1dYA1Gb!(KK}mx`uh4Y@x@gZzEuZ1^G)`% zv$H`x-x?d+HqWiiDT)Rh_>La6znXcm{V8s>IvN+PypN-muS%6={m~*Znp=JS`gO)h z_fQvi*68W)&qV{azp(8+<%hhN{U$}X*SOlZY)99|CKJ!8^5CexSqHvqmAB&ooBy*H zFXoC95=^}{E3zR_{utD|{~j{h|4G~J!#;Zm4{z-o&r93pbgI)90oZ}7KVQS0s{Qb4 z6cIEj7rUZaL?>vPI~+0Up`9cdn~*@CwLC|*;xjeBcU9bdOf6qRj;E=uJ8dl_gf_!6 z?bSvxk19sT$mrw@|JI04{$?HH+=Dp}MhXgws-u-&Yrh(zSbP>fG*mvlWn;rC@7w2a zbwJ_9J86$O-_>tCP4?abDMHnnvLyKu>7%mm3CGh_tN;9BT4cM0$8XNGr;qw9$<@>} z+#k2RaN&Zswsvox3FQCmN0&~XJc(A0o-Thp7i{uK9bIXkSeg9wE9bSe z^H^YcF%jv}EQb<@UV-g0s)-p{*2_OqoD{7 zBM&e5in))))-@>pcWN?P@Q{0q$0pidsRZ@(9*9@1)HBVkCM6{)I(_^8y^C&lB3hxx zNW11u`w~WI<40Zdy<_rO!*QEA8W%5qZ)s`y_Dv@NlK$<1qHmV6@^gPq>CDuO)NcO@ zI)P=I>UgC>S`+XZ=HMO)6|aDRLGK<^!UO@6oOc^udn*kIrWpt2(U83->K_f5Fw5X` zufEZqtAP5Mezw=2lngi5^RB}8&njebC?5F5f$U~`SabCGDPa zs$5Z9KF(C%Zs+p?Cb}Bp7=rp%Yf`%bKi8>KzXyt&ukKIF%E;WPaFAQk!Nk6Ju>&c{ z4}d^uXy`!Gy+3QyeDgnEDwtJ_8Wq|k%iPVYtQ>kvuC&XYci6ebAC2WuP^fwT-uYnf z&*7TFVWC}TW}`wF4F0T1c@fO;+>T{^q>jA9YuDyBsotx<#tcK1FZ=3|)`>Zd?7>Q( zTmACjSPe|?Wrh7BC$BC(vmfUj*Z-3%UcEg(O-6QRQo}xfKxq-Zl2N56l+}ng7oVq@ zRGWVej;YYl*6#U}Pr*N$AA5Ji>(*e&9n+04J3BkKU*Dm?41RQ(D5B_Iv}Jn1C}x}L zpF7aZE+NsIzBDepb7@@Ivnq6@g@}(`zUg&krR?^0r^`gWUGFicb1_FK=(3i0PoKU* z=j}&ocds>wh_vXiRp88-6+f+oQ@^uwbM*oc^pXOGgRQz(ul`7uq2G)7A}M_*yHdO2 z+?2vf-SLz;g=v_vp1fR9`POH`Dt_6isfs4@-s`s3KZoy*z7y#3ziOzjZ#NjP>>s|n z4@(;|E?d5Y+SI*eX`KCVVl6slHgfBA4TpO_4)si1T3e5HNV9F$$*CP1n%SV+3@3Ll zo{_~Rp1X5>PUQv_ou==4cd8Om{sO}cKVYG)oJXBs=EZW3@5d!1I3&CsHiwug+Hg}i z+$$_F-gT*2Yn2%=8Nv_VnbU%aTQgDEu9H)4kO*%W+n{^r#9DV!fZai@MG|@ zB^28^t)G5FxEjrn&-46|POR4mIP+gWiHQ*c{Do7w4}ib|ip|%rUjh08SSTy6tqrAs zQu+4QRRAV;0NwP~L~dwkYOcH}*7lJo+a4{j?t5<$us?4W|BcYh|Id`;aJk>|XVSU1 z1NmBV?ySk14IK`8L7TlCytg>HxzEcK6hj86p3l1XI}|%G$~8KEruJYx6#MPlw_a19 zcT1}?{@7{`sp+65<`c(xw2do0KS*z)3$H0P57rA0lp`o7Ns=x%xdx-Bzy8`%Jy~`A zri-$v*VG9W&iu8twZg(eK-dMYQx|Zm*49(GMuiU}A|R79*>UIktHeS7WmcW0*z`!6A-(c6Cc0QHtE@8Wu`vB{VX^RSg2t&5rgDYP8cB*`L9PUnf zV5;Q?Rf%6#WA>=kx9%;U*pxb^`ztHUFyB;D^BZ8MVaUvP+%m9fIXQEHZ+j07XAQYX z9oN0re9|IK`9H|xydxQe$6@X6uXkQHe0TkIW)Xl4`L*w&K_epWGi_+q_Jg`VQ0=#i znP>M4O%gWssdubcENLaE`%SleKksj$#6Y3kTpG>biehkwxD2qd^`YZy_e;~j*G<7reDrYs3bqi&&jc`4I!ITwGBE|gHfJt zho0r4$;W_0|3$i@c|NuWn_G%9G)9<}uk>aN{IARg@L5$pTlQwF-Z_}v&SL@(*+K+W zre$00yK}@{#_PJ@8omVJ1VN#dAfP{ZIuvWla{7^o_m~b8t&i8&lVSo6)?QYd6cDy3 zF_c8H$jI+4f0^sdzWOHTYS=FHX&(>3!Tv72 zfN@rJMpwO^&t+Bxf8)iY+Y5z1pv>__((H8Lbvh0d^UP{Y?JC!3zP({nbyvU$-f#7i zy#r~6KN6c})A9mvxFOFby)yAPzK3J$5(3%V$?xaswL1DfcvA_01 z;SiAPv4Yj*pI?eQF>z0yj(E?%Te%oBkhBk!U_I-2?B&8Y8Mi;``#lxwpsor3IEKrNX?W~fxLS@zvj1o?MRi+ylklj^KdMudeKHMTokYkip~3lLbIW55i*>@}`=X_P z0r{<|rg){D`x3ToiZVVWn{?$lk&%>(Nq1uF)T0~H7fW7WxO52xecf;753R`6w|dY zF;4QE9%7rCn#fbw(@(I;vHmFcm=E3}?5J-Tqrc2B%Ebz~@D-X1ANA7Aw!QkY_h)UX zYRhy{;iCSf7h+yNL+M8X4*eEucQ)n&4*pD|AbnI2eN3&-Mb&q8q5lDpU8T5{qsz_3 z-_6<1TN`uTO)MtqeA_x%(3KT!akhT{PMLo^{vf>qGA?wwI}a50KF^Q# zLtg{XsvnvpIJr9%PxB^cEZR+zQ&1EuXh5NT>AM;}DkJk? zfA#_GyJNLzI&pL?n|j*w?#6CZ+9hpmR%!PcI9K_=B&4$O5v!*=^azGplRR8=(4Fz# znJ+83bPg?%wobC100#E<_O^>|j=DDU%itFn&fR{tbm=C*s-@~($2$+WlSgCjGn9`| z`mKH9Fix2}%njlKHmCyP1?YhC;op#hCa0!CB`QL&wTt+CaC39Bl%Tv)1K{ZG;YhNOg>nq;srQV6bm?G~|GxL@2rIzk*Ng2>%!s7` zXVsmf5BbQcC-*u2AnLSh#qe9he0gX-_IEb!4c)zFBDHW?Aq*<4|E$8a%LKlnW`A=K zdNz}f&Nv+IC!l&KfK^>u)-#{deX5|aj=L!*wJhQT_BVP-k1}7Wo`c7*C>~+OOrE;t zExO)9)Je^@F;MRDR^(6_8iMZv6gQ_X2kbl<==6n(J2&(-OjI6&ycfx&>a~Vmh=_zT zD>s)`88Xic6K2(ZxM|3*zB6sFJm!1OXzgq+YFULVpl2MhXY=@zf4GwmX!~&a%dz0? z8P&VP9tn8gFR<3i;BfDax#!ooq*j!WK>oIHt|GLphrwT#|C7;wL@Aexn;Tj!_|MpD zDjsssNRi#~*srv{Sj3#7Oa8v|^4Mo|!e%?Ho8rzi`3`i+1MT}B6RS63I= z@l(%Cu)uk0vCESbI{&PtVmcSerZ5s$Aw+~A*RY)VL^)Ymo}2x*WT23~H55!=>K-ws zKoH63@5%jP(FB*0B-K9NlDCh(I$<4+ahcgW6Rv~zR#mgG<>%o_a1Ne zTpWGOt!0pJDu-XVM&b|Su+`a}8HIjG6nF_yQQ!sh&SvN2=(3*Ha{Ty{L|T;)sowo9 zQy78NF|D-M08G*|FoJWYi?bqewY$);8k3%qoc1c z?l>fgtAm*j#TuIV6-#l$-3Xn4%Rq2?@uPjhxFwK+-%nEm(aVixBS0`Ohj-=6jX#@C zwYo1yY=@nG;zmLm|NVjB+6RiGX5(K*LOX*KDS3WMNyvM(2Nn`{QJ6FLHciL#V_%p(llx14?pmKQTk|y zLy(f2Tr%FW7TmH^ca$1NZB@9eRDiJlbgJuu(r~{p$Aw_ZB&=pk2gl!Q7!GwjiR~HB z+PFj+kF~3OdVGZ%30(e~y_EiWf#K3CJY!Bg(@|CQ{DH_@4X1Bir{TyEbt)%NZ~pep zBFY63GSSwK>OUWNhhgXE)4c~N;XVkWeQM1~c74K(@qU{p6$B4aSTy`A6u6D~U;e>f zR8UX=^c<8q2|A|Hnt;QhGPh%_vJ4TAIOot)Q(ruM_>f!c>B4A@S%ovi_mLw<=6my_ zzp_d=4qdx)o0@$qr^<(0|F6nLZs^9cf$;KI_&u;9(vC|R< znik-EU0vPKkg>HOl(sX1g1vd7w_2HBXO#})Z$R1wT4NV_J2D(FSj@Yfzh1U$eeF*$ z(5P#87PFT_h(tJVmVS6V4V*`&c5=?yKagHQ6}Vnx8yg>A4DE^a&&ZRaA=u-mE?!A_ znvei&sg<>Ld|cdVt<8o0PAFbLTS23vY*gU;#}!wH;- zm*)T~VO&-xHK%5Q>xYT&n#`FQEX~JHy!6{N^7i%y5~65+$fMT;cb973e1;N1&ixWU zrIt;9QB$*B;Co}^6&@E@jnmIXZ$athUiDktuU}lj#6Ew1CImA<7kqcf zMI9zuORy?KpbRP+ki5r_AD8i%%Q!m=I0%~Mh5o{Bk0?+RoPR2(?*@lw`4Jthn zVao%cHZDFB`n-q-4)ZsBD)58+XU=$yhx334m!B&NdQX4hErp$#bjQ*PcoRASZ+O$b zC)W#9r#=?(vFU zPoourF$4nG&Mv$EHG=f7+@Va4H06D4c6}XYn|MgsFfF>S^GUy2C3R%=;KNl zHK#z$o@@RiHU)oQcp1nd0Ob3-TYw$ky{e+Xl{k%>Uc2VGKGW`yS7rl1%l{Z|TUr5n z@ErZOj1rEJWZuZ70e(X>LZXC|_Js?KLgtD<-B*o#gb0EZ4Kc-+2rd2sC?_M(hQl<> z%avj3?lIUxz3D#>DC=<06I2wC#9m|5bkfy8B?%7?hk=0PrE7TY|7Xb)?`-`U8#ZoG>|Vb#1L%QP#4a zGQY(eC(p>SE1?ys;jd57#@9oAASyk zP2NDEzYw2+w}ATeMmxD^$$q4=3?JIjp^K}l+8TN5wgfHQaTG;pR@6R{7|CjJ_U>6> zV(U)h1yu3cPYe2Y>`e%b0S~B#s=kqQYNkYr#vhIS57s>0_vw2|Oaxv9?6Uq`J$z~N zF3{&gg5m><{X^f}YaclH`QHILdLst601T1aZwN@0-6Bw*l*2$R*REI|aLC`^na?lQ zg7uT>Hvst!^2gr1*rnGLVUE;CzUvt@0z41BuY!jA`&S}xNK7$+p za_cEMx#6wX;1+Or>HR2N6D^t0tk}}qSXuqWdKs_~OcO!tpM~&u|Gf`%G=#XRptZHN z-OD+nhJ2tdm3Q@|IJ%E1?2Vn!1T=5rq2Jh|%mXPw^`7DVhj_K{m0v{56-+N*2u1&} z{}pE-uc@gC;LB@k_^zLsu3C}m3@oqB>*M%}co$yp&6JoJ=k*z#`~(5xkEwn+w~~dr zvUE^M$&{jsL!3j&molrMU=@JCXsOdEAXYin%QiN@fHKP0YbH`;=6HNw<(ZR|Zw{NB z(p#Q)uI!t=z(1k$C@6UOq%@0%neWP1NFGI62JfzSXX$Vz`}}Bb9t2rBl!E^8V}B|% z7o02CW`G$jg%gXUnaseTVIjYS-Wp;Wog$$BQC~rR^^QH%*0`Xb zVazMSsX(}2+AY$2atgfw+cD(8B{}kIUei*6j;ZASOsmm#{cYhDTa)mOq06FXOg$p~APc9d|o5UnGmo|$A z1I5xe*Zmem7B8?DkQ(vB>_2Ct2yCenZj@AzB$-~)Q{PY0SiQ4=uZW0<-~&g8hzKm{ z32{m(<%VdsL#VFMOWy#hWMl+B$_qFg$i4YLJJfo^+X4=^0sso6Ln?$sUY*ZarN>oP zM2Ne`1RP8}8AVsr7lb*uiy>g3ydi?;tDB3|t#2_QA;eSuZ69J{V}FVhWVBbAK_k_~ zU&3kJ5Ca&dJJ;x{UpdS=lr!*)?6yP+J>1TUpkant&@nZYH~$p)HotmcfrcRL{`P%Z zk4mbX75iZWwLy$47l-bZE6y<4ki!4uyv-YUZ=nLzB}kj`iJk1Obq(0K9{VYmch`%- z%<^0OZU8$FT&7x9c~d00+|?$F7)6q8_c$(f4%vU)&QE|`(A*`Yq@d0hkPMI52lRf~ zx@BSmmx4KZ^7QF1e1(>l7D^AJ&kB%(J#>PN5;SxKd=Gs{UeycxcB}WCmeQ56qrs}y zKo__%Pydz5dp}nzHVX<1Tli>^2~5=H>*oTxQpo~8 zf36dr;*e)-d##l~Ktxjc=T{<%+c=|TZ{l5$8FRHKJl{^85{r*z{kgMYk#&{di=P@x zQKxPRJrgeEG#{U61v?TflAX@{S(w$=)hY(7sldTb7ZzO)rj^T>SIHDeU@?|?%H@NO zj8zyh)?{dHpa$F>pi=tq55ZD{unfVX%lTv|AvUh}T~rH(Zy97Go}7}k5hdqk1aKWw!sh5Of;Ii}%M0mu{%z zi@1v~TSdOb5qJSj(-+kLxn*IW^Cs&L!F!YG`)4|~sA`?9lbcQg86x~k2aO!Q7Rn!JEBc%lhWwwR#|?0avo zW@$^TeAQ9oODG|+;v#3DZK0Jz@yBZd5huv$GV{q2tD|GEE7Xd5Mg_&!ua%0>8ob`U z{_5YT15bZ&RxEUGH^0+mNOS;`!_Ih?x$Ug6*fl14Dl7tLS#`07KHYoAEyJPvs{Gu4 zM-f=u`Mg+*RHn^kqYa)_+7f5r`)l$qjH(0QQ%Nfln!^21>L$*e-HT{il1r?}u6lLk{uZIGOx97DMZHr@q!6lz+{1SB`{TE6hfum z0g+!g&U~bw8X1q;#wdO{>L#6YJKmMxlay^GiE}K=FL%9I7HTJgf&Bk`+(dzB0~I%E^W&^d=_+AhIz+5dwuIe>%XAafB0|q=en+qSg@ix{ z+t^_6<*oi^E>GwhdIcEK;}5sU3vXo;e0m-h9e8n}e_abtjA+5+vy%?unYd(X?JLU_ z&`E_)bC&kmbl2+>U8!xCWz~@r{LfrR*-V$q%()|;mm2kCGEN8$s) zM0z$?monobGnI3|14mh|EnBaRtB?=0i=wM#K>d@_!pq8q0OFXyA2TNv&(*1aIF~8U2=IVMuOUu$& zt+9ogs;5?}f#BOmSmxBmPRS`Bcso!;YmlFfRSp3C~UF8k>}YA`YUQNf=kyapUO(sP7cO zDryAO)dgW-aw2u?^vn_l!K?Xp%>#r1CW}s4cD0eyyXVKZZ!6b1+<3@Tn_T+a&paSh zq^nk#2da0@b!UARFbzuUp&nmo1U4!|--pdO8#vQ;$<(?$+tQ&iRhWPLMswWK_HRf1 znH0*u&&J%w8-@LE3*(BXw7*9km1b1L?8qx$fO-cIkIi!|2wG~;|4}N^hMu&;xyg6z zdY24gpeUB@9&q4b7DOE((8BBiZUC)9AJ8b2UEB{YAnjELgGdrujhQLziq|6Gzc{9>Tnj7)k_K#il;jKVtGTTLg;OH-bpr&DNPV zGM)f=aI+)_$VTlsp-=7o?cooO*rHGMXM&#gpsaqYE=ET5&-W zo69As`srA-Guda4W3xbT*F6*ad?8qcIA( z$e_LSCC;&XL+;em2r?Eipq?sSkd6(0?u{TpP!*}rKLnzYz|^qlPv@=FskDg@b}VqO z#0~bgB_s$j+(CvqzALq#5y8@|P`h%R^nm%J{AaIqHaFUs$v=^G%>SKd6qXOCH&XDi;JOm3Jg>Z%BvJze_s_+OBMhqgt%DS-8s0nCA_z6woBjOq zKmpn&uoEeVf#y~iK@09> ziI7ivVx|obodzX{O4DJc1X`I9)nI`;*XtUt;m)eDkzo*Xn*5g@-#WP-^}Z)7uq0*> zBSOMB#yJ-Pw~q@KNFeOj!=m5IX3i2IpDw^}LtvA6@vf~$Z^zc zM01c*P<>7yG?zi(IJe#yA(94b>pidTG59Q1-;j+fmLy1ED9pRCyH_M@D>s5d9C7b$``aLU(;%&Y=4$bx0FpmOhwIM;d_VON8Lk#gC3l3TP0ioUNA zX~MyY?DDm@#R>=!b3S+p(Fbj+4_NNZn?)YCue_!}!dS*RzpK=TbKjKudkLWvC*iCL zoO~^p*bO4Y{PKUdjD(y-L*Y{i)bdVjD*+;W-dA-f))8n-(SLdsyF5qr-$Q<(0vM{D zg-NE(L6GgjGK^AIB}M8OSEyHNS>Q1`6OVI_huI4w$U^jX*vC}#us3i4)4vy>{&xZP zZwrJBcwj1_?Up;-TZ7<{0elbCKIj|*Ws{GAa2WNRcm(qbUYqKEYgG?Q5)$N-k}>P< zULG5m)Zqz%{Eex;4yqCCD`4}Uc@-BIw@v%~KOC`!+&o@eaZy945%sM z(wX;@hVc^BHzvZKP}MO7c<4UfdoV(>^5NshZD2o6D1*=6wkOvJ*n!Wz3P6d&){14Q zR4LLPyujT-PZ6bl=IxWcoSgfDJ=^2HL@V`X$#GnVuSy%*o`XZj4;(>g->qz;j#Ksa z-huw46q;`!07S*b#W!CQHf4V6TA3LJd*n#~SY`z)i$a8Pwu zfVO*X!VD)F^@+=q<3Kdrn|qs2jsuPR4;UvB|GsyoPZHjf#xH!l-7kWxgZW7vdQJi- z30p61pAPv5zzA3XBVda`2nA78@yiElCxL{1ZuAg~T{r}+(L(Thqr9YCRe zZo+}V5l`44h%*=Li28~$AwT=nqnL#&&ccaN)-~JD0EmI5wMI}5(h%5G!ri>!os99- zwps?F$D^7im{WdYq_G>bv~; z?=!gs=iVq(@}-5&v|SxI#G2jVrK2D*yG}u0Tm$5g#IXBSkQ%~|^VE*af(b>+qBaCH zqIEFi?EyV{2wP%+-nIdv89dMKeS>jF>*%mc5F*k$~Ubl z$1h$lv}wu6;3^&T1Jw-Jko}GPfZ@Vh(b6tIKxH}Dn^t&G)rnFF-!wNh-f)xt|0w(3Ow6tCMW(uo*AkkuQf4BYY-Dh$5;RcyWq+g z|DwI31D15uP6=ada2JG~S#-+A_HbmP%QXo9?gyfEngubM8b$*2E%KBsiVO8 zgVx~9Z&)syBJ0%=A_80Pt|9-BA5Ik((q8o(zT#fZKJa+WWsOs=XO4wn1upG!M0mQ{D*EQbO! z-&_!uxbAXx35trYfp-CYAGCh3^xwp(s;Sjqy)3t}J9;R8)TdP9^~rcsPmrZz_s1<^ z5Wwbc!ABl>5hwicg_zyyXHvF0Z$Y^1xtle1UtW5Sli}(>o3q6$!E07lH3RCnx?Zz@ zVeng2R#t+xI}9dw{|2MOhJZcwJqk!%W1c0E(a_j|x-JQA3mABS%lloSJh=usKJrO$ z_iF=~l3#)SqiF)9lI`RzonM1j;H|p2{qc!ZrF$V*C^WtxdxGZMB5)K`OydO!cXTV3 zGNvG%>Ix|(5_r5{5S%`FadET->D|J!fL@M5O6voc1mu!rDYyE6$-2>h#RWR2@$m&T zb%lxUQYA~ln80HI7Oq`@HZ4g~YZ5ho9*ugjp^Iue0lYAuRu<^l(6j_QsK{{8H-SY! zux4IpDV^JS+5th5;Hqdx1r0Q1b=2q%*oF|*R{xb1kcEUQQ2)$o+EW-dLV{(Z*1E8z z4s*i(4^@~)S4TrdX95CqG)85ZqSweb`c7NK*XOjeQ=I$(sIzPP`0ivY+7C5Q1a2LZ@1 zpA-k5kCLw{vkn0n61Y#zMlGnPNQjJKfEUnV_;nNs6Gu^rEdVxn6PB_$a6l{Pk8r`$ z|LfC1_s`a`oQMGk1**R@<0?R=%&=%7A_7=lgTQ#eWWi@%R7OwP1W1>yfgVe>LjCKf zK;H*d5r9B|>NC^GWX@^)LIV2$WfA^81Q3}`dKy?6Zoo^7S%Ikc359d72_F-mypyDZ zD4s>3o|uI?6N>IQ0m_l2zXt~v(KzSX`^0cN#ef^R-Gd{~p|}w&NbecS7tS9;aU%)^ zk0rCi!9wGlxew8Uxw)U4AWXmmfDn+Mm4#JypY8a%Fy5$?9q3+W8}KN`l|w252?WZL z1a@vLoi!?$gggP(gW!UUqN1)L4$Y8Lw-MxQc>TP22}nM$HbE8!lB8v!KqDOegpDh^ z4Bx@7{1R#fc*$_8sO9QwEX|{Q>Iqsvz7g9Dl(Fr+VXz7N8VP`M*Uj~EKAUHG| zCA6+ZlF?Xwlyrk`<{#o;(V;zYLf^n3=dwdr7Ipk~*fks}0bWj*zfc!tYG&< z(>>U0IXyj{sB_vlLoZW@)DFu-iC}T#mO`j%4zfqFR@WPFTS%m2#!#l*EsnIKNG6%u&Z^#kUDv(q=@#@w~Z8TUx%?p`` zfrlB!4X=k9-1f`LI)b3yg9e~}5v*37x+L{JyT=$M0aB~t8{!rVD?N+=uJ?%eB<&kg z1WN+vX#?*{I5q?(Gn~9KA!R06q!e6I4LVd(8VFq-W#14njTnM9BAUN#s0dDpq~3@C znSqeD(ug@gUr%LQp-6S9r5jRD)Xm<16M3@fTT z_CJ3RLK7iBL+%y3&I9=a)(b{)$6jOhGAuc0ps~-^2_9<4C}IQ>w3hD@&SKeuQZp{c z{AC1C7T{Im@QKHJKsCT;t;b5LwTDn45I=7}R`;A$Cm9XG4qS=qq(kFVK~W;4k{abRdSfmH6C>Z?_b^Q<;f#w7 zM+*ly7A~c4V5RLQ~dY60Dq5)zev^3rGdnNg)xl4E;wF{ zl$^LO!~msy!l>*{-JdKyj-Xb^o0?JgZ%es~AY=3}ocavA(fBcJ(44UVE+j&WZ57hp z2OcGr5;5G#ta@%)R%vHNc{t8AY2@$dG+{a7vMt61+wANP}x;XJM6-MG9Y%luWdp3 zvr^ZJSQLfv+%>lbmXk)Inba8G9Rn<% z;z{?G{HzSwBYP`Ws#IJc zfQXI#KM7Olja;2?2D=-)=0zIAVtc)zA@BzF5XEHsTce`@pkwBzCnr7mW6PrXYo|Zj z`8{hP4P^OqklP%&eHu&-diwgW<)IGW0l#Kd4}8JF5P*?u#>PWn{!`eWz3hEX>zb;V zl*4s48`=j?phR<3`uA{Oep08dqo=25WRxxcPAC1op)csvzGFe8=NyOnKwbmzQePDq zh^@8jj_FdW6>da1M;%&vdhj^3{JLgjBz3bc3?L#{wEjSI5$V*9upQ00pK+81x&3ha z^y4Q_h^k;@;&2pz0B}_YEnwa{UlGr^S1ZId;aWy)$UphDaXt_zB$$r)1xZlO;kyV5 zwTNv`i|+Q-5cIj+YsSS!7z!o`W~eM$Dx$lz0NeA1NP?XcRJMq9{DX7>*#Zn`_~1oc z=(U17ay<_xHO@JvdM+Q931MJ7yfmIFSE{jke`{q+hwZ?iH=l~Fcz8uDmqhCXk+g+(_Ax9FcLAu)pEfCXWK-G^w&6#xn-^c@x z;q+e?E>Ho^jQxNY z=OUwtO>?DQRsyM!iZ05IPJl7@(&%{=Q~}$@uwOW9Or;sD`pjKV?!V$4@7vY|mEaIz zV?IT5xJbKA_jA9G{8W*zu2W;c?ah8Jci`!rZ_1x<8Vl_A|5fNf2Lu4bKls=q{XOM9 zLy~{<6v$9$b)#hC0x=(snotR1p)Pa-z0>7;6ohR-a3RxNLn^xu?xQ+|@ zX<>W?oaVIfyt2_3M2;x!siv@?!d<&3)hEKUolh^Rlo%TeM2D?E23i}PdGnJ7!GNI$*%c(=ON~A70{4PT4?+yrI$>n#%0`o6S!S%m%=dTBKs7Y54l22g>dthF z(NF&KXp4>5KWB@-nk4p_7$s1Q`>R?Ts<;jv4?LoL7Hp=Zs>l35$$o%;tRX6$)XvoL z6x0mYvJf7%e^Urd$wED!Qhlj>csOoR^{NR=MRdg9YYRVv>wWO`BH-UKf%KnAOQtCPD^$Z< z<+|R+SR)Tn9pQ@bv;W)d!^6j?h529GeIhPW#h%g+tbNeT9pW5r=BUC@dil$gtIij) ze&=>3H_)(vay)=7nBds01R{*^-P0#euEN(X{0Ju44%JLA)Qrh&*OMTZC#;K@R9KI! zJogK>C&Rw{6UxkT-dzg?$Z|tQdwimK z2}O9-P1To=a~6B@*ozSDN1W#5t|p8eb$t)tr5Xrj#O^YqvQ?LDT8)n32VfPh zUw<*UD8SFZzg2UHZXxUe?Fy)m&!h2Ao=g<0{*o^V)ZfNOM6Ng~s1$OhNx29lV3X9I zHK5)Ty|Re^5A0Ut`;UVJGA5hfx(*(XPwnPni#gJ#<~v`2iG5|K&YGRQ(t9gVU*kaK z@?!dFUfvuqn7`}+H<^a-LdWZ7xWN&iSkW(h0jeQfi-4dm(&>i=^_Qe^kLKH}ZGx2~ zZ_O?~Voe-ke*8CZ{*|XwTp`cCXMr~F3E6UP(Jyj0})C%M_$LR-qbBBqR8)L%o{+UO4WIvRL|7Ze`nn; zKNPxlXh~DBk)!u~mr3k#- zr#TSO;rS4uu%;v98^m`J1#nNKRE+MUep}D=d683VgIc<(qU3*AejM+XQ%!X8vm0xi zSxZ|4r~*xgBCMPJzectr$lFzND&a5<)A$sF>{5yobbf|7GlHXlBm-?RDX07l-}n3? z!gNuI+D_ffB`5kM0y!7Vj|5Flv=kDz{$zd&JI7{K6g9fit|wssAA^CS@%AMKX?3Fq z7kCKFdgUGtaueRJ<>3ECr}oe9V$PcUjq`Dt@A_geF)^xYA=g+pZXmfKc3;rFNX>R@ zl|--5z8b^!Phy0QlxP3MODkj56DVQ4i*efVv~g9}`+JPp-Y-8rPIHC|3b7?wDH;p3 zqsLZzTB&m{o_A4i%Iuo`MHVXrNgfH*|624S1{>~-p7;L!wKvkrT#=UJtUzhgfAL~7 z$=eQ78V#gPBt-DkntXlkT>BOF_0wdJ4Q`{=55{u(RzsiOcBsT*G-QuuPmLI~3PBH> z_M)5PB*|KHg>lpJs^stu(h|i{;5?Evvn3+MHoat(G11Q1S5*k1`urOqXR2ydRyRE_ z*<*tKkEn42slE02-0-vSgEK2(5%)r#(bJ&2+{~%kvxFj5O41o=&{LVY4f=INk8_df zf((Y9l3g9`Qms|OuGI7pW<_y3t$$0nfT^mE^P9dPj!YLVwg@xF!51S2MNZUgiiBZK z#1#CUS9z@sKd~bxVo^?9L@J!9tcjfO_D7lH=vT`%1wLuk}YmqBw)s|H1(EVA+jLH$t5G*bG&>Q$=GQB``&nw=1bK0Vk6Hj&b+Mq_pHdZk^78fa!fQ~dA@ zj(l-NhWo~azwyGta51JmJ5aBLMv}E-UPt@y^wFl&cqFf>e@Tuy6d5Wf|m>3`S#8 zE*mFeo7$+w8Jvp1@)m<~wk78g$U?5og z4fOOdxN`T|n|LFb19Mlrp4SOZ#Rm;$hOTE0*S4$0+s>VJO?^*zzjdYk=ClXV3}DX?2gmB@ z-Y*GouOWf9e&u&HGBG`*r4PW&H`wr}T^OF0m z36N`AP)S+@2(eCe4Q;42@Fp`;8@7x5~+QXW~4C6bgqJBMCjj?hVkgw7nhB4o*uG%>B#IF^v? z`%)Akp3j+i-{-pCzu))%$JLeYv)te9_x&sl)<*+*o5-Ont>`Ap9Ka61wf=-0%+f%z z_~OEP*I%a(L|8mJ_Zn-L{f2i=L6*6o&xu$3^?x6J1omQnxEmi2bxkGoStH_youvLF z&m?rWESuE)bhc|L`U^gyIIm9V zs%kdXYGy4f^~R!wXw_mx^R_73eO2-T)$~sZruIQqm2=^GMMG)p+$ z>g^L?%Xq}*rKEgf*ttrMOewuKKR=JXgunk11f3Pt)l*-B;&d14_>QtZEa~|1*XQJi z1Y~4n7~%Z&c$q5yxzMFq8wN+QsE5ZKcn#2nvYg^bKHxocby+0nmtoxsF(V_RZWmQ#BKtQUR|H*MrR|c$* zVE6*56A;d?3kz)*%Wwz=YZcJv0=5wm*PE(HUA^k@^ofmkKg`VF5ba&L1}wzg)pdvJ zPBzIM+?C|ejdcoxgWn`13vuLZg}(U2%wEogUQLskdTmJ?{9^$-mte< z68q=bDo5oh%;0;VkV>I|=j7yMII^*^0B9%^_;`6Cj7@DR<}#E@fPY*n6^MPr^}njf zHa3lFP7Dk^uV(CQx~UnmzV zA61h0tk5U)?xmj}G6&@az#i`|`3UM_5aO|><=7UTQr``b(?mr@5vm7$#GX4^mgnck zQaAGmiTNC2x3^4mvLr$&n$l9N6>Rc=Ndj^&dCS{HvXCOBJ(BT-F`?noP~jApvXb>`a=f6Ub?4Y01w&G+T^2be->Az;ghDUyFo- zsr{0DW*TR;edz$3yE9W)lNaX)bl4o&|BL$7@We`2Q-y&${3zgOS6p07W}M6k29yW( zVuF5FUvtB?*jUAfs+eAgvZr&8wwd)&zHs9&4)6cr{SyqIH-nxHyVmYoAu?V67 zaw^dYA_Ye41+4Z*hldqI*8&(rj}D}r6x_KJnhutb#ORLfv2o8o(suD|CL(Vx`W@_~ zZE+AARS=yRDv7y%eN>aAlA#-S7h5*ECZ*yiWOL0PH}$i?2q&XaKp;9TL2)f#SzMa) zxJM#_pJV{PM%@fpua(l6PALV!`1EFG9pIVFg!(Qf-o01iGhwps1>+r577L3mEY2#9 zOHXS}G54oOMMZ&$fzq~#lQRs6y%Jx`we^x&Vr%7PXQI5_8f|sVXEH*@>~ztP!grUC zHtW+c&O57KQ2>Mvkl@(pxg)BocYEzw!knDi>hc+#5~hcranxDhii*NUP&869X^kCe zB6H(|gEtcsUnDHpm6Bg0u@OIRd)=yoSF-tdctA*82agq6P6!o4pM5>xJN+q-V`(I<>K@USlV4LksNij^%B zS9?1oUsq+!^Gr$g{%$>NF&*Cr%{&HnDm>z7?4V$^{Nj5M>71+(s4B-v=nBLV_wO4v zI}g{GJrGY9v<>*vsUyqhRxn8rhkdB|@rA!gREqDA{w?(hqsqtE`V( zQjGaI@=R4B4+DV+I@~0gLkAD8!UD=kKDn>9=Pw>-RX+2*J#=k`p0P0;UQnTq!Yzkq za~;YtdIid%j*dtJBcXh@`&N#oa5b z-99ZhSN#AUHTy>pjx%m_OpK$YALx93wNDGVQd0K+Q*poUPtdQ0 zLS%e=97EqMMVGX`zK-5hy1JGJkQ@9IfzGRS!I1fzJtVvIC+%UNCqR`C&Tgs~BPPZG z%^GuKTlUly~m&be#dkXw8AXd)+vA#v9%J2t-*J_CQm{MSa!X{q2^q z=0FgAI_1CLjm7WT*%A!LBI~lUG6+Eym#*kB>Wb5lsStpoi$|TUH}j8I5aNN80jyF4 z>tttVXGfKP-&CX^95;%}ET7!a(_>wFIa({?22Mu6m^aP;YYTo74qaJfjcxz8pU%=)m($m+CnPEw-v#MDbDtkRvio@?s4z;th_D?i3Ol9~ohO9kQ$R7FSmf z`7?Y|q9%A{Do7e}aVOZox$%JsDeT#NiLfo>?<$^uUKt`(UoZf8+OnIHSu!zHeFcRQ z5Vm$|6r;C`i9PG-QG+1+S4^K4e5!?PT2ENsQb2ofVTu#qzrQ&}nMQ?}mi4d7cPl}x zpJjsEGT-&aQxT6G92{`*#ML7J;QWgi&eNY@jhAut?~6qIw73|1?HV^PuS7b4pvNOc zthr1P^R0963U(sV7cddHMFZUrlKsk0__!C*f&m>CE%ufjPd2Oy%)+1>gK0(uWwpGz zx;iIk4CF1K%}!5@eSLjFvPU-4Xf&@t%*tTs85CB7z=E}%Hw}eiYJ8mKS3ttM9TM!Co`)m6H%C{u`{tgOS z0~j0-sY5Zk)`VGt1eeqE-XWo>;&bQ}U|Io)=k^UU9FA=U6H6AxKFPq?5cOq@h-oRXp7 z9l^93qccVd&12QDcOzvoFVYKa!QzQTrqsury#rm=cK)}I$SW$a4M2^(JB{LThIrA{ z)zHZ3a5rB67a}^ypn-yN85$Hm}Ro$sT$uoOCDm;X~f7 zTMG(V`gvb_d;5c&io3RLAG_wtfP63iYya_8Zs@H*Va3P_Pk$1cL0>O?5W@xApcln+alHq0I`jjZ7045~&`` zRS*D2o9WGkm9Gk>Ev&88KyBMlrzRz_h^RI;Y2PFgoy_wsSo%VIIpDjNdEemV+q10| zy4!nMV6>P;C1Vw}!Ntpq$PA-UG#=Og^0L35PQ{QID>&{FO_t6HqeTs)dyfnczZ&@r z>y!?@=Nf$>*}Q~j3j|Ptp4H-+60gx{g#`s8`Y&R44Gj!@0v^YwxqL;0)5Y)sQ@F5b zXllxUgjy+44aoxCI(rNwrAc1t7a>!rpZMcM)ymz@V9CbqgA?qUfv2Y@dYWzqIzdcq z>@YW+J*MCXfs1qV=9O>X0)vCMpGNG%dFG516LZ}1!AMO_O@v@Awg^T>MmV)C*Ufen zU!_8XT>}a0f?!{NJ1`VjrCYy-j<%^Hj=qYm1>bQIh3b0Ocmo#~$@hVaa& zuR^|y5w47pI2Tr{*a=z&IG{qdj75h~6pGX?nA*MG>PXGSxeJFxcwjBBug=j2#L@Q2 zmX?7i*F!N$2uD6LYF-hcP8R!KR|*|Y(2)@lyHz~JpeM{K3$^lIUki-W%{V1_Lyi5} zx(rEqW$GZP-$4` Date: Mon, 9 Sep 2024 21:07:45 -0700 Subject: [PATCH 14/31] Update doc/arkode/guide/source/Butcher.rst --- doc/arkode/guide/source/Butcher.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 00cd563500..7cba5e9e67 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -513,7 +513,7 @@ or :c:func:`ARKodeButcherTable_LoadERK`. Accessible via the string ``"ARKODE_SOFRONIOU_SPALETTA_5_3_4"`` to :c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadERKByName`. -This is the default 4th order explicit method +This is the default 4th order explicit method. (from :cite:p:`Sof:04`). .. math:: From d61fb3722b8874a7508a404923ad1584a8341444 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Tue, 10 Sep 2024 20:20:00 -0700 Subject: [PATCH 15/31] Apply suggestions from code review Co-authored-by: David Gardner --- doc/arkode/guide/source/Butcher.rst | 104 +++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 7cba5e9e67..b227f00921 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -197,6 +197,10 @@ Accessible via the string ``"ARKODE_RALSTON_3_1_2"`` to This is the default 2nd order explicit method (primary method from :cite:p:`Ralston:62`). +.. versionchanged:: x.y.z + + Added as the default 2nd order explicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -232,6 +236,10 @@ Accessible via the string ``"ARKODE_HEUN_EULER_2_1_2"`` to :c:func:`ARKodeButcherTable_LoadERKByName`. (primary method from :cite:p:`Runge:95`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_RALSTON_3_1_2`` as the default 2nd order explicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -516,6 +524,10 @@ Accessible via the string ``"ARKODE_SOFRONIOU_SPALETTA_5_3_4"`` to This is the default 4th order explicit method. (from :cite:p:`Sof:04`). +.. versionchanged:: x.y.z + + Made the default 4th order explicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -555,6 +567,10 @@ Accessible via the string ``"ARKODE_ZONNEVELD_5_3_4"`` to :c:func:`ARKodeButcherTable_LoadERKByName`. (from :cite:p:`Zon:63`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_SOFRONIOU_SPALETTA_5_3_4`` as the default 4th order explicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -596,6 +612,10 @@ Accessible via the string ``"ARKODE_ARK436L2SA_ERK_6_3_4"`` to This is the explicit portion of the ARK4(3)6L[2]SA method from :cite:p:`KenCarp:03`. +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ARK437L2SA_ERK_7_3_4`` as the explicit portion of the default 4th order additive method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -637,6 +657,10 @@ Accessible via the string ``"ARKODE_ARK437L2SA_ERK_7_3_4"`` to This is the explicit portion of the default 4th order additive method and the explicit portion of the ARK4(3)7L[2]SA method from :cite:p:`KenCarp:19`. +.. versionchanged:: x.y.z + + Made the explicit portion of the default 4th order additive method + .. only:: html .. math:: @@ -709,10 +733,10 @@ Accessible via the string ``"ARKODE_SAYFY_ABURUB_6_3_4"`` to .. _Butcher.Tsitouras: -Tsitouras-6-4-5 +Tsitouras-7-4-5 ^^^^^^^^^^^^^^^ -.. index:: Tsitouras-6-4-5 ERK method +.. index:: Tsitouras-7-4-5 ERK method Accessible via the constant ``ARKODE_TSITOURAS_7_4_5`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -722,6 +746,10 @@ Accessible via the string ``"ARKODE_TSITOURAS_7_4_5"`` to :c:func:`ARKodeButcherTable_LoadERKByName`. This is the default 5th order explicit method (from :cite:p:`Tsitouras:11`). +.. versionchanged:: x.y.z + + Added as the default 5th order explicit method + .. only:: html .. math:: @@ -768,6 +796,10 @@ Accessible via the string ``"ARKODE_CASH_KARP_6_4_5"`` to :c:func:`ARKodeButcherTable_LoadERKByName`. (from :cite:p:`CashKarp:90`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_TSITOURAS_7_4_5`` as the default 5th order explicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -895,6 +927,10 @@ Accessible via the string ``"ARKODE_ARK548L2SA_ERK_8_4_5"`` to This is the explicit portion of the ARK5(4)8L[2]SA method from :cite:p:`KenCarp:03`. +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ARK548L2SAb_ERK_8_4_5`` as the explicit portion of the default 5th order additive method + .. only:: html .. math:: @@ -948,6 +984,10 @@ This is the explicit portion of the default 5th order additive method and the explicit portion of the 5th order ARK5(4)8L[2]SA method from :cite:p:`KenCarp:19`. +.. versionchanged:: x.y.z + + Made the explicit portion of the default 5th order additive method + .. only:: html .. math:: @@ -997,6 +1037,10 @@ Accessible via the string ``"ARKODE_VERNER_8_5_6"`` to :c:func:`ARKodeButcherTable_LoadERKByName`. (from :cite:p:`HEJ:76`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_VERNER_9_5_6`` as the default 6th order explicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1039,6 +1083,10 @@ Accessible via the string ``"ARKODE_VERNER_9_5_6"`` to This is the default 6th order explicit method (method IIIXb-6(5) from :cite:p:`Ver:10`). +.. versionchanged:: x.y.z + + Made the default 6th order explicit method + .. only:: html .. math:: @@ -1140,6 +1188,10 @@ Accessible via the string ``"ARKODE_FEHLBERG_13_7_8"`` to :c:func:`ARKodeButcherTable_LoadERKByName`. (from :cite:p:`Butcher:08`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_VERNER_13_7_8`` as the default 8th order explicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1188,6 +1240,10 @@ Accessible via the string ``"ARKODE_VERNER_13_7_8"`` to This is the default 8th order explicit method (method IIIX-8(7) from :cite:p:`Ver:10`). +.. versionchanged:: x.y.z + + Made the default 8th order explicit method + .. only:: html @@ -1350,6 +1406,10 @@ Accessible via the string ``"ARKODE_SDIRK_2_1_2"`` to :c:func:`ARKodeButcherTable_LoadDIRKByName`. Both the method and embedding are A- and B-stable. +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ARK2_DIRK_3_1_2`` as the default 2nd order implicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1386,6 +1446,10 @@ This is the default 2nd order implicit method and the implicit portion of the default 2nd order additive method (the implicit portion of the ARK2 method from :cite:p:`giraldo2013implicit`). +.. versionchanged:: x.y.z + + Made the default 2nd order implicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1585,6 +1649,10 @@ This is the default 3rd order implicit method and the ESDIRK3(2)5L[2]SA method from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. +.. versionchanged:: x.y.z + + Made the default 3rd order implicit method + .. figure:: /figs/arkode/stab_region_26.png :scale: 50 % :align: center @@ -1676,6 +1744,10 @@ method and embedding are A-stable; additionally the method is L-stable (this is the implicit portion of the ARK3(2)4L[2]SA method from :cite:p:`KenCarp:03`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ESDIRK325L2SA_5_2_3`` as the default 3rd order implicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1801,6 +1873,10 @@ Accessible via the string ``"ARKODE_SDIRK_5_3_4"`` to Here, the method is both A- and L-stable, although the embedding has reduced stability (from :cite:p:`HaWa:91`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ESDIRK436L2SA_6_3_4`` as the default 4th order implicit method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1894,6 +1970,10 @@ Both the method and embedding are A-stable; additionally the method is L-stable (this is the implicit portion of the ARK4(3)6L[2]SA method from :cite:p:`KenCarp:03`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ARK437L2SA_DIRK_7_3_4`` as the implicit portion of the default 4th order additive method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1938,6 +2018,10 @@ This is the implicit portion of the default 4th order additive method and the implicit portion of the 4th order ARK4(3)7L[2]SA method from :cite:p:`KenCarp:19`. Both the method and embedding are A- and L-stable. +.. versionchanged:: x.y.z + + Made the implicit portion of the default 4th order additive method + .. math:: \renewcommand{\arraystretch}{1.5} @@ -1977,6 +2061,10 @@ Accessible via the string ``"ARKODE_ESDIRK436L2SA_6_3_4"`` to This is the default 4th order implicit method and the ESDIRK4(3)6L[2]SA method from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. +.. versionchanged:: x.y.z + + Made the default 4th order implicit method + .. figure:: /figs/arkode/stab_region_28.png :scale: 50 % :align: center @@ -2122,6 +2210,10 @@ Accessible via the string ``"ARKODE_ARK548L2SA_DIRK_8_4_5"`` to Both the method and embedding are A-stable; additionally the method is L-stable (the implicit portion of the ARK5(4)8L[2]SA method from :cite:p:`KenCarp:03`). +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ESDIRK547L2SA2_7_4_5`` as the default 5th order implicit method and replaced by ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` as the implicit portion of the default 5th order additive method + .. only:: html .. math:: @@ -2174,6 +2266,10 @@ Both the method and embedding are A-stable; additionally the method is L-stable (this is the implicit portion of the 5th order ARK5(4)8L[2]SA method from :cite:p:`KenCarp:19`). +.. versionchanged:: x.y.z + + Made the implicit portion of the default 5th order additive method + .. only:: html .. math:: @@ -2244,6 +2340,10 @@ Accessible via the string ``"ARKODE_ESDIRK547L2SA2_7_4_5"`` to This is the default 5th order implicit method and the ESDIRK5(4)7L[2]SA2 method from :cite:p:`KenCarp:19b`. Both the method and embedding are A- and L-stable. +.. versionchanged:: x.y.z + + Made the default 5th order implicit method + .. figure:: /figs/arkode/stab_region_33.png :scale: 50 % :align: center From 405355c8f8eb5da40211901f7e9b6cba1df07510 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Tue, 10 Sep 2024 20:24:17 -0700 Subject: [PATCH 16/31] Remove trailing 0 from table --- doc/arkode/guide/source/Butcher.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index b227f00921..3c5344146e 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -757,15 +757,15 @@ This is the default 5th order explicit method (from :cite:p:`Tsitouras:11`). \renewcommand{\arraystretch}{1.5} \begin{array}{r|ccccccc} 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ - 0.1610000000000000 & 0.1610000000000000 & 0 & 0 & 0 & 0 & 0 & 0 \\ - 0.3270000000000000 & -0.008480655492356989 & 0.3354806554923570 & 0 & 0 & 0 & 0 & 0 \\ - 0.9000000000000000 & 2.897153057105493 & -6.359448489975075 & 4.362295432869581 & 0 & 0 & 0 & 0 \\ + 0.161 & 0.161 & 0 & 0 & 0 & 0 & 0 & 0 \\ + 0.327 & -0.008480655492356989 & 0.3354806554923570 & 0 & 0 & 0 & 0 & 0 \\ + 0.9 & 2.897153057105493 & -6.359448489975075 & 4.362295432869581 & 0 & 0 & 0 & 0 \\ 0.9800255409045097 & 5.325864828439257 & -11.74888356406283 & 7.495539342889836 & -0.09249506636175525 & 0 & 0 & 0 \\ - 1.000000000000000 & 5.861455442946420 & -12.92096931784711 & 8.159367898576159 & -0.07158497328140100 & -0.02826905039406838 & 0 & 0 \\ - 1.000000000000000 & 0.09646076681806523 & 0.01000000000000000 & 0.4798896504144996 & 1.379008574103742 & -3.290069515436081 & 2.324710524099774 & 0 \\ + 1 & 5.861455442946420 & -12.92096931784711 & 8.159367898576159 & -0.07158497328140100 & -0.02826905039406838 & 0 & 0 \\ + 1 & 0.09646076681806523 & 0.01 & 0.4798896504144996 & 1.379008574103742 & -3.290069515436081 & 2.324710524099774 & 0 \\ \hline - 5 & 0.09646076681806523 & 0.01000000000000000 & 0.4798896504144996 & 1.379008574103742 & -3.290069515436081 & 2.324710524099774 & 0 \\ - 4 & 0.09352374858189271 & 0.008652883141566368 & 0.4928930991314319 & 1.140235412267858 & -2.329180192439365 & 1.568875049316616 & 0.02500000000000000 + 5 & 0.09646076681806523 & 0.01 & 0.4798896504144996 & 1.379008574103742 & -3.290069515436081 & 2.324710524099774 & 0 \\ + 4 & 0.09352374858189271 & 0.008652883141566368 & 0.4928930991314319 & 1.140235412267858 & -2.329180192439365 & 1.568875049316616 & 0.025 \end{array} .. only:: latex From 5bfc505497909e2aa36df5fe4974629e83768659 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 15:08:52 -0700 Subject: [PATCH 17/31] Fix number of columns in table --- doc/arkode/guide/source/Butcher.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 3c5344146e..179db6f54b 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -204,7 +204,7 @@ This is the default 2nd order explicit method .. math:: \renewcommand{\arraystretch}{1.5} - \begin{array}{r|cc} + \begin{array}{r|ccc} 0 & 0 & 0 & 0 \\ \frac{2}{3} & \frac{2}{3} & 0 & 0 \\ 1 & \frac{1}{4} & \frac{3}{4} & 0 \\ From b622b203ebfbfd45eacabc6ae0f0c7ab6e958999 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 15:50:15 -0700 Subject: [PATCH 18/31] Add table of ERK properties --- doc/arkode/guide/source/Butcher.rst | 261 +++++++++++++++++----------- 1 file changed, 162 insertions(+), 99 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 179db6f54b..fac32c06b0 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -141,13 +141,76 @@ Explicit Butcher tables --------------------------- In the category of explicit Runge--Kutta methods, ARKODE includes -methods that have orders 2 through 6, with embeddings that are of -orders 1 through 5. Each of ARKODE's explicit Butcher tables are +methods that have orders 2 through 9, with embeddings that are of +orders 1 through 8. Each of ARKODE's explicit Butcher tables are specified via a unique ID and name: .. c:enum:: ARKODE_ERKTableID with values specified for each method below (e.g., ``ARKODE_HEUN_EULER_2_1_2``). +A summary of the method is given in :numref:`ARKODE.Butcher.ERK_properties`. + +.. _ARKODE.Butcher.ERK_properties: +.. table:: Explicit Butcher tables. The default method for each order is marked + with an asterisk (*). + + +------------------------------------------+--------+----------------+-------+ + | Method ID | Stages | Embedded Order | Order | + +==========================================+========+================+=======+ + | ``ARKODE_FORWARD_EULER_1_1`` | 1 | --- | 1* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_RALSTON_3_1_2`` | 3 | 1 | 2* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_HEUN_EULER_2_1_2`` | 2 | 1 | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_RALSTON_EULER_2_1_2`` | 2 | 1 | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2`` | 2 | 1 | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK2_ERK_3_1_2`` | 3 | 1 | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_BOGACKI_SHAMPINE_4_2_3`` | 4 | 2 | 3* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK324L2SA_ERK_4_2_3`` | 4 | 2 | 3 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_SHU_OSHER_3_2_3`` | 3 | 2 | 3 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_KNOTH_WOLKE_3_3`` | 3 | --- | 3 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_SOFRONIOU_SPALETTA_5_3_4`` | 5 | 3 | 4* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ZONNEVELD_5_3_4`` | 5 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK436L2SA_ERK_6_3_4`` | 6 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK437L2SA_ERK_7_3_4`` | 7 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_SAYFY_ABURUB_6_3_4`` | 6 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_TSITOURAS_7_4_5`` | 7 | 4 | 5* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_CASH_KARP_6_4_5`` | 6 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_FEHLBERG_6_4_5`` | 6 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_DORMAND_PRINCE_7_4_5`` | 7 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK548L2SA_ERK_8_4_5`` | 8 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK548L2SAb_ERK_8_4_5`` | 8 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_VERNER_9_5_6`` | 9 | 5 | 6* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_VERNER_8_5_6`` | 8 | 5 | 6 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_VERNER_10_6_7`` | 10 | 6 | 7* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_VERNER_13_7_8`` | 13 | 7 | 8* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_FEHLBERG_13_7_8`` | 13 | 7 | 8 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_VERNER_16_8_9`` | 16 | 8 | 9* | + +------------------------------------------+--------+----------------+-------+ .. _Butcher.Forward_Euler: @@ -1021,52 +1084,6 @@ explicit portion of the 5th order ARK5(4)8L[2]SA method from - -.. _Butcher.Verner-6-5: - -Verner-8-5-6 -^^^^^^^^^^^^^^ - -.. index:: Verner-8-5-6 ERK method - -Accessible via the constant ``ARKODE_VERNER_8_5_6`` to -:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` -or :c:func:`ARKodeButcherTable_LoadERK`. -Accessible via the string ``"ARKODE_VERNER_8_5_6"`` to -:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or -:c:func:`ARKodeButcherTable_LoadERKByName`. -(from :cite:p:`HEJ:76`). - -.. versionchanged:: x.y.z - - Replaced by ``ARKODE_VERNER_9_5_6`` as the default 6th order explicit method - -.. math:: - - \renewcommand{\arraystretch}{1.5} - \begin{array}{r|cccccccc} - 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ - \frac{1}{6} & \frac{1}{6} & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ - \frac{4}{15} & \frac{4}{75} & \frac{16}{75} & 0 & 0 & 0 & 0 & 0 & 0 \\ - \frac{2}{3} & \frac{5}{6} & -\frac{8}{3} & \frac{5}{2} & 0 & 0 & 0 & 0 & 0 \\ - \frac{5}{6} & -\frac{165}{64} & \frac{55}{6} & -\frac{425}{64} & \frac{85}{96} & 0 & 0 & 0 & 0 \\ - 1 & \frac{12}{5} & -8 & \frac{4015}{612} & -\frac{11}{36} & \frac{88}{255} & 0 & 0 & 0 \\ - \frac{1}{15} & -\frac{8263}{15000} & \frac{124}{75} & -\frac{643}{680} & -\frac{81}{250} & \frac{2484}{10625} & 0 & 0 & 0 \\ - 1 & \frac{3501}{1720} & -\frac{300}{43} & \frac{297275}{52632} & -\frac{319}{2322} & \frac{24068}{84065} & 0 & \frac{3850}{26703} & 0 \\ - \hline - 6 & \frac{3}{40} & 0 & \frac{875}{2244} & \frac{23}{72} & \frac{264}{1955} & 0 & \frac{125}{11592} & \frac{43}{616} \\ - 5 & \frac{13}{160} & 0 & \frac{2375}{5984} & \frac{5}{16} & \frac{12}{85} & \frac{3}{44} & 0 & 0 - \end{array} - -.. figure:: /figs/arkode/stab_region_10.png - :scale: 50 % - :align: center - - Linear stability region for the Verner-8-5-6 method. The method's - region is outlined in blue; the embedding's region is in red. - - - .. _Butcher.Verner-6-5b: Verner-9-5-6 @@ -1123,6 +1140,52 @@ This is the default 6th order explicit method + +.. _Butcher.Verner-6-5: + +Verner-8-5-6 +^^^^^^^^^^^^^^ + +.. index:: Verner-8-5-6 ERK method + +Accessible via the constant ``ARKODE_VERNER_8_5_6`` to +:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` +or :c:func:`ARKodeButcherTable_LoadERK`. +Accessible via the string ``"ARKODE_VERNER_8_5_6"`` to +:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or +:c:func:`ARKodeButcherTable_LoadERKByName`. +(from :cite:p:`HEJ:76`). + +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_VERNER_9_5_6`` as the default 6th order explicit method + +.. math:: + + \renewcommand{\arraystretch}{1.5} + \begin{array}{r|cccccccc} + 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ + \frac{1}{6} & \frac{1}{6} & 0 & 0 & 0 & 0 & 0 & 0 & 0 \\ + \frac{4}{15} & \frac{4}{75} & \frac{16}{75} & 0 & 0 & 0 & 0 & 0 & 0 \\ + \frac{2}{3} & \frac{5}{6} & -\frac{8}{3} & \frac{5}{2} & 0 & 0 & 0 & 0 & 0 \\ + \frac{5}{6} & -\frac{165}{64} & \frac{55}{6} & -\frac{425}{64} & \frac{85}{96} & 0 & 0 & 0 & 0 \\ + 1 & \frac{12}{5} & -8 & \frac{4015}{612} & -\frac{11}{36} & \frac{88}{255} & 0 & 0 & 0 \\ + \frac{1}{15} & -\frac{8263}{15000} & \frac{124}{75} & -\frac{643}{680} & -\frac{81}{250} & \frac{2484}{10625} & 0 & 0 & 0 \\ + 1 & \frac{3501}{1720} & -\frac{300}{43} & \frac{297275}{52632} & -\frac{319}{2322} & \frac{24068}{84065} & 0 & \frac{3850}{26703} & 0 \\ + \hline + 6 & \frac{3}{40} & 0 & \frac{875}{2244} & \frac{23}{72} & \frac{264}{1955} & 0 & \frac{125}{11592} & \frac{43}{616} \\ + 5 & \frac{13}{160} & 0 & \frac{2375}{5984} & \frac{5}{16} & \frac{12}{85} & \frac{3}{44} & 0 & 0 + \end{array} + +.. figure:: /figs/arkode/stab_region_10.png + :scale: 50 % + :align: center + + Linear stability region for the Verner-8-5-6 method. The method's + region is outlined in blue; the embedding's region is in red. + + + .. _Butcher.Verner-7-6: Verner-10-6-7 @@ -1173,57 +1236,6 @@ This is the default 7th order explicit method (from :cite:p:`Ver:10`). -.. _Butcher.Fehlberg-8-7: - -Fehlberg-13-7-8 -^^^^^^^^^^^^^^^^^^ - -.. index:: Fehlberg-13-7-8 ERK method - -Accessible via the constant ``ARKODE_FEHLBERG_13_7_8`` to -:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` -or :c:func:`ARKodeButcherTable_LoadERK`. -Accessible via the string ``"ARKODE_FEHLBERG_13_7_8"`` to -:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or -:c:func:`ARKodeButcherTable_LoadERKByName`. -(from :cite:p:`Butcher:08`). - -.. versionchanged:: x.y.z - - Replaced by ``ARKODE_VERNER_13_7_8`` as the default 8th order explicit method - -.. math:: - - \renewcommand{\arraystretch}{1.5} - \begin{array}{r|ccccccccccccc} - 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ - \frac{2}{27}& \frac{2}{27}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ - \frac{1}{9}& \frac{1}{36}& \frac{1}{12}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ - \frac{1}{6}& \frac{1}{24}& 0& \frac{1}{8}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ - \frac{5}{12}& \frac{5}{12}& 0& -\frac{25}{16}& \frac{25}{16}& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ - \frac{1}{2}& \frac{1}{20}& 0& 0& \frac{1}{4}& \frac{1}{5}& 0& 0& 0& 0& 0& 0& 0& 0\\ - \frac{5}{6}& -\frac{25}{108}& 0& 0& \frac{125}{108}& -\frac{65}{27}& \frac{125}{54}& 0& 0& 0& 0& 0& 0& 0\\ - \frac{1}{6}& \frac{31}{300}& 0& 0& 0& \frac{61}{225}& -\frac{2}{9}& \frac{13}{900}& 0& 0& 0& 0& 0& 0\\ - \frac{2}{3}& 2& 0& 0& -\frac{53}{6}& \frac{704}{45}& -\frac{107}{9}& \frac{67}{90}& 3& 0& 0& 0& 0& 0\\ - \frac{1}{3}& -\frac{91}{108}& 0& 0& \frac{23}{108}& -\frac{976}{135}& \frac{311}{54}& -\frac{19}{60}& \frac{17}{6}& -\frac{1}{12}& 0& 0& 0& 0\\ - 1& \frac{2383}{4100}& 0& 0& -\frac{341}{164}& \frac{4496}{1025}& -\frac{301}{82}& \frac{2133}{4100}& \frac{45}{82}& \frac{45}{164}& \frac{18}{41}& 0& 0& 0\\ - 0& \frac{3}{205}& 0& 0& 0& 0& -\frac{6}{41}& -\frac{3}{205}& -\frac{3}{41}& \frac{3}{41}& \frac{6}{41}& 0& 0& 0\\ - 1& -\frac{1777}{4100}& 0& 0& -\frac{341}{164}& \frac{4496}{1025}& -\frac{289}{82}& \frac{2193}{4100}& \frac{51}{82}& \frac{33}{164}& \frac{12}{41}& 0& 1& 0\\ - \hline - 8& 0& 0& 0& 0& 0& \frac{34}{105}& \frac{9}{35}& \frac{9}{35}& \frac{9}{280}& \frac{9}{280}& 0& \frac{41}{840}& \frac{41}{840} \\ - 7& \frac{41}{840}& 0& 0& 0& 0& \frac{34}{105}& \frac{9}{35}& \frac{9}{35}& \frac{9}{280}& \frac{9}{280}& \frac{41}{840}& 0& 0 - \end{array} - - -.. figure:: /figs/arkode/stab_region_23.png - :scale: 50 % - :align: center - - Linear stability region for the Fehlberg-13-7-8 method. The method's - region is outlined in blue; the embedding's region is in red. - - - .. _Butcher.Verner-8-7: Verner-13-7-8 @@ -1283,6 +1295,57 @@ This is the default 8th order explicit method +.. _Butcher.Fehlberg-8-7: + +Fehlberg-13-7-8 +^^^^^^^^^^^^^^^^^^ + +.. index:: Fehlberg-13-7-8 ERK method + +Accessible via the constant ``ARKODE_FEHLBERG_13_7_8`` to +:c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` +or :c:func:`ARKodeButcherTable_LoadERK`. +Accessible via the string ``"ARKODE_FEHLBERG_13_7_8"`` to +:c:func:`ARKStepSetTableName`, :c:func:`ERKStepSetTableName` or +:c:func:`ARKodeButcherTable_LoadERKByName`. +(from :cite:p:`Butcher:08`). + +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_VERNER_13_7_8`` as the default 8th order explicit method + +.. math:: + + \renewcommand{\arraystretch}{1.5} + \begin{array}{r|ccccccccccccc} + 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ + \frac{2}{27}& \frac{2}{27}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ + \frac{1}{9}& \frac{1}{36}& \frac{1}{12}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ + \frac{1}{6}& \frac{1}{24}& 0& \frac{1}{8}& 0& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ + \frac{5}{12}& \frac{5}{12}& 0& -\frac{25}{16}& \frac{25}{16}& 0& 0& 0& 0& 0& 0& 0& 0& 0\\ + \frac{1}{2}& \frac{1}{20}& 0& 0& \frac{1}{4}& \frac{1}{5}& 0& 0& 0& 0& 0& 0& 0& 0\\ + \frac{5}{6}& -\frac{25}{108}& 0& 0& \frac{125}{108}& -\frac{65}{27}& \frac{125}{54}& 0& 0& 0& 0& 0& 0& 0\\ + \frac{1}{6}& \frac{31}{300}& 0& 0& 0& \frac{61}{225}& -\frac{2}{9}& \frac{13}{900}& 0& 0& 0& 0& 0& 0\\ + \frac{2}{3}& 2& 0& 0& -\frac{53}{6}& \frac{704}{45}& -\frac{107}{9}& \frac{67}{90}& 3& 0& 0& 0& 0& 0\\ + \frac{1}{3}& -\frac{91}{108}& 0& 0& \frac{23}{108}& -\frac{976}{135}& \frac{311}{54}& -\frac{19}{60}& \frac{17}{6}& -\frac{1}{12}& 0& 0& 0& 0\\ + 1& \frac{2383}{4100}& 0& 0& -\frac{341}{164}& \frac{4496}{1025}& -\frac{301}{82}& \frac{2133}{4100}& \frac{45}{82}& \frac{45}{164}& \frac{18}{41}& 0& 0& 0\\ + 0& \frac{3}{205}& 0& 0& 0& 0& -\frac{6}{41}& -\frac{3}{205}& -\frac{3}{41}& \frac{3}{41}& \frac{6}{41}& 0& 0& 0\\ + 1& -\frac{1777}{4100}& 0& 0& -\frac{341}{164}& \frac{4496}{1025}& -\frac{289}{82}& \frac{2193}{4100}& \frac{51}{82}& \frac{33}{164}& \frac{12}{41}& 0& 1& 0\\ + \hline + 8& 0& 0& 0& 0& 0& \frac{34}{105}& \frac{9}{35}& \frac{9}{35}& \frac{9}{280}& \frac{9}{280}& 0& \frac{41}{840}& \frac{41}{840} \\ + 7& \frac{41}{840}& 0& 0& 0& 0& \frac{34}{105}& \frac{9}{35}& \frac{9}{35}& \frac{9}{280}& \frac{9}{280}& \frac{41}{840}& 0& 0 + \end{array} + + +.. figure:: /figs/arkode/stab_region_23.png + :scale: 50 % + :align: center + + Linear stability region for the Fehlberg-13-7-8 method. The method's + region is outlined in blue; the embedding's region is in red. + + + .. _Butcher.Verner-9-8: Verner-16-8-9 From 7ef8a2af7e02bc1665323e5be70dc965a4d1c462 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 15:53:21 -0700 Subject: [PATCH 19/31] Remove ERK constants --- doc/arkode/guide/source/Constants.rst | 112 -------------------------- 1 file changed, 112 deletions(-) diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst index a87c1f9b8c..9d59e23d0c 100644 --- a/doc/arkode/guide/source/Constants.rst +++ b/doc/arkode/guide/source/Constants.rst @@ -74,118 +74,6 @@ contains the ARKODE output constants. +-----------------------------------------------+------------------------------------------------------------+ | | | +-----------------------------------------------+------------------------------------------------------------+ - | **Explicit Butcher table specification** | | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_FORWARD_EULER_1_1` | Use the Forward-Euler-1-1 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_RALSTON_3_1_2` | Use the Ralston-3-1-2 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_HEUN_EULER_2_1_2` | Use the Heun-Euler-2-1-2 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_RALSTON_EULER_2_1_2` | Use the Ralston-Euler-2-1-2 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2` | Use the Explicit-Midpoint-Euler-2-1-2 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK2_ERK_3_1_2` | Use the ARK2-ERK-3-1-2 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_BOGACKI_SHAMPINE_4_2_3` | Use the Bogacki-Shampine-4-2-3 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK324L2SA_ERK_4_2_3` | Use the ARK-4-2-3 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SOFRONIOU_SPALETTA_5_3_4` | Use the Sofroniou-Spaletta-5-3-4 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ZONNEVELD_5_3_4` | Use the Zonneveld-5-3-4 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK436L2SA_ERK_6_3_4` | Use the ARK-6-3-4 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SAYFY_ABURUB_6_3_4` | Use the Sayfy-Aburub-6-3-4 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_TSITOURAS_7_4_5` | Use the Tsitouras 7-4-5 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_CASH_KARP_6_4_5` | Use the Cash-Karp-6-4-5 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_FEHLBERG_6_4_5` | Use the Fehlberg-6-4-5 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_DORMAND_PRINCE_7_4_5` | Use the Dormand-Prince-7-4-5 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK548L2SA_ERK_8_4_5` | Use the ARK-8-4-5 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_VERNER_8_5_6` | Use the Verner-8-5-6 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_FEHLBERG_13_7_8` | Use the Fehlberg-13-7-8 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_KNOTH_WOLKE_3_3` | Use the Knoth-Wolke-3-3 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK437L2SA_ERK_7_3_4` | Use the ARK-7-3-4 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK548L2SAb_ERK_8_4_5` | Use the ARK-8-4-5b ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SHU_OSHER_3_2_3` | Use the Shu-Osher-3-2-3 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_VERNER_9_5_6` | Use the Verner-9-5-6 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_VERNER_10_6_7` | Use the Verner-10-6-7 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_VERNER_13_7_8` | Use the Verner-13-7-8 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_VERNER_16_8_9` | Use the Verner-16-8-9 ERK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_1` | Use ARKStep's default first-order ERK method | - | | (ARKODE_FORWARD_EULER_1_1). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_2` | Use ARKStep's default second-order ERK method | - | | (ARKODE_RALSTON_3_1_2). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_3` | Use ARKStep's default third-order ERK method | - | | (ARKODE_BOGACKI_SHAMPINE_4_2_3). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_4` | Use ARKStep's default fourth-order ERK method | - | | (ARKODE_SOFRONIOU_SPALETTA_5_3_4). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_5` | Use ARKStep's default fifth-order ERK method | - | | (ARKODE_TSITOURAS_7_4_5). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_6` | Use ARKStep's default sixth-order ERK method | - | | (ARKODE_VERNER_9_5_6). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_7` | Use ARKStep's default seventh-order ERK method | - | | (ARKODE_VERNER_10_6_7). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_8` | Use ARKStep's default eighth-order ERK method | - | | (ARKODE_VERNER_13_7_8). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ERK_9` | Use ARKStep's default ninth-order ERK method | - | | (ARKODE_VERNER_16_8_9). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_1` | Use ERKStep's default first-order ERK method | - | | (ARKODE_FORWARD_EULER_1_1). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_2` | Use ERKStep's default second-order ERK method | - | | (ARKODE_RALSTON_3_1_2). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_3` | Use ERKStep's default third-order ERK method | - | | (ARKODE_BOGACKI_SHAMPINE_4_2_3). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_4` | Use ERKStep's default fourth-order ERK method | - | | (ARKODE_SOFRONIOU_SPALETTA_5_3_4). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_5` | Use ERKStep's default fifth-order ERK method | - | | (ARKODE_TSITOURAS_7_4_5). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_6` | Use ERKStep's default sixth-order ERK method | - | | (ARKODE_VERNER_9_5_6). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_7` | Use ERKStep's default seventh-order ERK method | - | | (ARKODE_VERNER_10_6_7). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_8` | Use ERKStep's default eighth-order ERK method | - | | (ARKODE_VERNER_13_7_8). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ERKSTEP_DEFAULT_9` | Use ERKStep's default ninth-order ERK method | - | | (ARKODE_VERNER_16_8_9). | - +-----------------------------------------------+------------------------------------------------------------+ - | | | - +-----------------------------------------------+------------------------------------------------------------+ | **Implicit Butcher table specification** | | +-----------------------------------------------+------------------------------------------------------------+ | :index:`ARKODE_BACKWARD_EULER_1_1` | Use the Backward-Euler-1-1 SDIRK method. | From 4ca3a50ba6baab0c808908213afc1db841a1ca26 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 17:05:11 -0700 Subject: [PATCH 20/31] Add DIRK table of properties --- doc/arkode/guide/source/Butcher.rst | 282 ++++++++++++++++---------- doc/arkode/guide/source/Constants.rst | 73 ------- 2 files changed, 171 insertions(+), 184 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index fac32c06b0..49c5d310a0 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -1421,6 +1421,69 @@ specified via a unique ID and name: .. c:enum:: ARKODE_DIRKTableID with values specified for each method below (e.g., ``ARKODE_SDIRK_2_1_2``). +A summary of the method is given in :numref:`ARKODE.Butcher.DIRK_properties`. + +.. _ARKODE.Butcher.DIRK_properties: +.. table:: Implicit Butcher tables. The default method for each order is marked + with an asterisk (*). + + +------------------------------------------+--------+----------------+-------+ + | Method ID | Stages | Embedded Order | Order | + +==========================================+========+================+=======+ + | ``ARKODE_BACKWARD_EULER_1_1`` | 1 | --- | 1* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK2_DIRK_3_1_2`` | 3 | 1 | 2* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_SDIRK_2_1_2`` | 2 | 1 | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_IMPLICIT_MIDPOINT_1_2`` | 1 | --- | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_IMPLICIT_TRAPEZOIDAL_2_2`` | 2 | --- | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_BILLINGTON_3_3_2`` | 3 | 3 | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_TRBDF2_3_3_2`` | 3 | 3 | 2 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK325L2SA_5_2_3`` | 5 | 2 | 3* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK324L2SA_4_2_3`` | 4 | 2 | 3 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK32I5L2SA_5_2_3`` | 5 | 2 | 3 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_KVAERNO_4_2_3`` | 4 | 2 | 3 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK324L2SA_DIRK_4_2_3`` | 4 | 2 | 3 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK436L2SA_6_3_4`` | 6 | 3 | 4* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_CASH_5_2_4`` | 5 | 2 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_CASH_5_3_4`` | 5 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_SDIRK_5_3_4`` | 5 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_KVAERNO_5_3_4`` | 5 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK436L2SA_DIRK_6_3_4`` | 6 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK437L2SA_DIRK_7_3_4`` | 7 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK43I6L2SA_6_3_4`` | 6 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_QESDIRK436L2SA_6_3_4`` | 6 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK437L2SA_7_3_4`` | 7 | 3 | 4 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK547L2SA2_7_4_5`` | 7 | 4 | 5* | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_KVAERNO_7_4_5`` | 7 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK548L2SA_DIRK_8_4_5`` | 8 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` | 8 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ + | ``ARKODE_ESDIRK547L2SA_7_4_5`` | 7 | 4 | 5 | + +------------------------------------------+--------+----------------+-------+ .. _Butcher.Backward-Euler: @@ -1454,44 +1517,6 @@ This is the default 1st order implicit method. The method is A-, L-, and B-stab Linear stability region for the backward Euler method. -.. _Butcher.SDIRK-2-1: - -SDIRK-2-1-2 -^^^^^^^^^^^^^^ - -.. index:: SDIRK-2-1-2 method - -Accessible via the constant ``ARKODE_SDIRK_2_1_2`` to -:c:func:`ARKStepSetTableNum` or -:c:func:`ARKodeButcherTable_LoadDIRK`. -Accessible via the string ``"ARKODE_SDIRK_2_1_2"`` to -:c:func:`ARKStepSetTableName` or -:c:func:`ARKodeButcherTable_LoadDIRKByName`. -Both the method and embedding are A- and B-stable. - -.. versionchanged:: x.y.z - - Replaced by ``ARKODE_ARK2_DIRK_3_1_2`` as the default 2nd order implicit method - -.. math:: - - \renewcommand{\arraystretch}{1.5} - \begin{array}{r|cc} - 1 & 1 & 0 \\ - 0 & -1 & 1 \\ - \hline - 2 & \frac{1}{2} & \frac{1}{2} \\ - 1 & 1 & 0 - \end{array} - -.. figure:: /figs/arkode/stab_region_11.png - :scale: 50 % - :align: center - - Linear stability region for the SDIRK-2-1-2 method. The method's - region is outlined in blue; the embedding's region is in red. - - .. _Butcher.ARK2_DIRK: ARK2-DIRK-3-1-2 @@ -1533,6 +1558,44 @@ default 2nd order additive method region is outlined in blue; the embedding's region is in red. +.. _Butcher.SDIRK-2-1: + +SDIRK-2-1-2 +^^^^^^^^^^^^^^ + +.. index:: SDIRK-2-1-2 method + +Accessible via the constant ``ARKODE_SDIRK_2_1_2`` to +:c:func:`ARKStepSetTableNum` or +:c:func:`ARKodeButcherTable_LoadDIRK`. +Accessible via the string ``"ARKODE_SDIRK_2_1_2"`` to +:c:func:`ARKStepSetTableName` or +:c:func:`ARKodeButcherTable_LoadDIRKByName`. +Both the method and embedding are A- and B-stable. + +.. versionchanged:: x.y.z + + Replaced by ``ARKODE_ARK2_DIRK_3_1_2`` as the default 2nd order implicit method + +.. math:: + + \renewcommand{\arraystretch}{1.5} + \begin{array}{r|cc} + 1 & 1 & 0 \\ + 0 & -1 & 1 \\ + \hline + 2 & \frac{1}{2} & \frac{1}{2} \\ + 1 & 1 & 0 + \end{array} + +.. figure:: /figs/arkode/stab_region_11.png + :scale: 50 % + :align: center + + Linear stability region for the SDIRK-2-1-2 method. The method's + region is outlined in blue; the embedding's region is in red. + + .. _Butcher.Implicit_Midpoint: Implicit-Midpoint-1-2 @@ -1672,55 +1735,55 @@ lower-order method (from :cite:p:`Bank:85`). region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK324L2SA: -ESDIRK324L2SA-4-2-3 +.. _Butcher.ESDIRK325L2SA: + +ESDIRK325L2SA-5-2-3 ^^^^^^^^^^^^^^^^^^^^^ -.. index:: ESDIRK324L2SA-4-2-3 method +.. index:: ESDIRK325L2SA-5-2-3 method -Accessible via the constant ``ARKODE_ESDIRK324L2SA_4_2_3`` to +Accessible via the constant ``ARKODE_ESDIRK325L2SA_5_2_3`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. -Accessible via the string ``"ARKODE_ESDIRK324L2SA_4_2_3"`` to +Accessible via the string ``"ARKODE_ESDIRK325L2SA_5_2_3"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the ESDIRK3(2)4L[2]SA method from :cite:p:`KenCarp:19b`. +This is the default 3rd order implicit method and the ESDIRK3(2)5L[2]SA method +from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. -.. figure:: /figs/arkode/stab_region_25.png +.. versionchanged:: x.y.z + + Made the default 3rd order implicit method + +.. figure:: /figs/arkode/stab_region_26.png :scale: 50 % :align: center - Linear stability region for the ESDIRK324L2SA-4-2-3 method method. The method's + Linear stability region for the ESDIRK325L2SA-5-2-3 method method. The method's region is outlined in blue; the embedding's region is in red. +.. _Butcher.ESDIRK324L2SA: -.. _Butcher.ESDIRK325L2SA: - -ESDIRK325L2SA-5-2-3 +ESDIRK324L2SA-4-2-3 ^^^^^^^^^^^^^^^^^^^^^ -.. index:: ESDIRK325L2SA-5-2-3 method +.. index:: ESDIRK324L2SA-4-2-3 method -Accessible via the constant ``ARKODE_ESDIRK325L2SA_5_2_3`` to +Accessible via the constant ``ARKODE_ESDIRK324L2SA_4_2_3`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. -Accessible via the string ``"ARKODE_ESDIRK325L2SA_5_2_3"`` to +Accessible via the string ``"ARKODE_ESDIRK324L2SA_4_2_3"`` to :c:func:`ARKStepSetTableName` or :c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the default 3rd order implicit method and the ESDIRK3(2)5L[2]SA method -from :cite:p:`KenCarp:16`. +This is the ESDIRK3(2)4L[2]SA method from :cite:p:`KenCarp:19b`. Both the method and embedding are A- and L-stable. -.. versionchanged:: x.y.z - - Made the default 3rd order implicit method - -.. figure:: /figs/arkode/stab_region_26.png +.. figure:: /figs/arkode/stab_region_25.png :scale: 50 % :align: center - Linear stability region for the ESDIRK325L2SA-5-2-3 method method. The method's + Linear stability region for the ESDIRK324L2SA-4-2-3 method method. The method's region is outlined in blue; the embedding's region is in red. @@ -1832,8 +1895,31 @@ method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. +.. _Butcher.ESDIRK436L2SA: +ESDIRK436L2SA-6-3-4 +^^^^^^^^^^^^^^^^^^^^ +.. index:: ESDIRK436L2SA-6-3-4 method + +Accessible via the constant ``ARKODE_ESDIRK436L2SA_6_3_4`` to +:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. +Accessible via the string ``"ARKODE_ESDIRK436L2SA_6_3_4"`` to +:c:func:`ARKStepSetTableName` or +:c:func:`ARKodeButcherTable_LoadDIRKByName`. +This is the default 4th order implicit method and the ESDIRK4(3)6L[2]SA method +from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. + +.. versionchanged:: x.y.z + + Made the default 4th order implicit method + +.. figure:: /figs/arkode/stab_region_28.png + :scale: 50 % + :align: center + + Linear stability region for the ESDIRK436L2SA-6-3-4 method method. The method's + region is outlined in blue; the embedding's region is in red. @@ -2109,33 +2195,6 @@ implicit portion of the 4th order ARK4(3)7L[2]SA method from region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK436L2SA: - -ESDIRK436L2SA-6-3-4 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK436L2SA-6-3-4 method - -Accessible via the constant ``ARKODE_ESDIRK436L2SA_6_3_4`` to -:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. -Accessible via the string ``"ARKODE_ESDIRK436L2SA_6_3_4"`` to -:c:func:`ARKStepSetTableName` or -:c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the default 4th order implicit method and the ESDIRK4(3)6L[2]SA method -from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. - -.. versionchanged:: x.y.z - - Made the default 4th order implicit method - -.. figure:: /figs/arkode/stab_region_28.png - :scale: 50 % - :align: center - - Linear stability region for the ESDIRK436L2SA-6-3-4 method method. The method's - region is outlined in blue; the embedding's region is in red. - - .. _Butcher.ESDIRK43I6L2SA: ESDIRK43I6L2SA-6-3-4 @@ -2205,6 +2264,31 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. +ESDIRK547L2SA2-7-4-5 +^^^^^^^^^^^^^^^^^^^^ + +.. index:: ESDIRK547L2SA2-7-4-5 method + +Accessible via the constant ``ARKODE_ESDIRK547L2SA2_7_4_5`` to +:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. +Accessible via the string ``"ARKODE_ESDIRK547L2SA2_7_4_5"`` to +:c:func:`ARKStepSetTableName` or +:c:func:`ARKodeButcherTable_LoadDIRKByName`. +This is the default 5th order implicit method and the ESDIRK5(4)7L[2]SA2 method +from :cite:p:`KenCarp:19b`. Both the method and embedding are A- and L-stable. + +.. versionchanged:: x.y.z + + Made the default 5th order implicit method + +.. figure:: /figs/arkode/stab_region_33.png + :scale: 50 % + :align: center + + Linear stability region for the ESDIRK547L2SA2-7-4-5 method method. The method's + region is outlined in blue; the embedding's region is in red. + + .. _Butcher.Kvaerno_7_4_5: Kvaerno-7-4-5 @@ -2390,30 +2474,6 @@ Both the method and embedding are A- and L-stable. .. _Butcher.ESDIRK547L2SA2: -ESDIRK547L2SA2-7-4-5 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK547L2SA2-7-4-5 method - -Accessible via the constant ``ARKODE_ESDIRK547L2SA2_7_4_5`` to -:c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. -Accessible via the string ``"ARKODE_ESDIRK547L2SA2_7_4_5"`` to -:c:func:`ARKStepSetTableName` or -:c:func:`ARKodeButcherTable_LoadDIRKByName`. -This is the default 5th order implicit method and the ESDIRK5(4)7L[2]SA2 method -from :cite:p:`KenCarp:19b`. Both the method and embedding are A- and L-stable. - -.. versionchanged:: x.y.z - - Made the default 5th order implicit method - -.. figure:: /figs/arkode/stab_region_33.png - :scale: 50 % - :align: center - - Linear stability region for the ESDIRK547L2SA2-7-4-5 method method. The method's - region is outlined in blue; the embedding's region is in red. - diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst index 9d59e23d0c..e27a227969 100644 --- a/doc/arkode/guide/source/Constants.rst +++ b/doc/arkode/guide/source/Constants.rst @@ -74,79 +74,6 @@ contains the ARKODE output constants. +-----------------------------------------------+------------------------------------------------------------+ | | | +-----------------------------------------------+------------------------------------------------------------+ - | **Implicit Butcher table specification** | | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_BACKWARD_EULER_1_1` | Use the Backward-Euler-1-1 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SDIRK_2_1_2` | Use the SDIRK-2-1-2 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK2_DIRK_3_1_2` | Use the ARK2-DIRK-3-1-2 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMPLICIT_MIDPOINT_1_2` | Use the Implicit-Midpoint-1-2 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMPLICIT_TRAPEZOIDAL_2_2` | Use the Implicit-Trapezoidal-2-2 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_BILLINGTON_3_3_2` | Use the Billington-3-3-2 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK324L2SA_4_2_3` | Use the ESDIRK324L2SA-4-2-3 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK325L2SA_5_2_3` | Use the ESDIRK325L2SA-5-2-3 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK32I5L2SA_5_2_3` | Use the ESDIRK32I5L2SA-5-2-3 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_TRBDF2_3_3_2` | Use the TRBDF2-3-3-2 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_KVAERNO_4_2_3` | Use the Kvaerno-4-2-3 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK324L2SA_DIRK_4_2_3` | Use the ARK-4-2-3 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_CASH_5_2_4` | Use the Cash-5-2-4 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_CASH_5_3_4` | Use the Cash-5-3-4 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SDIRK_5_3_4` | Use the SDIRK-5-3-4 SDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_KVAERNO_5_3_4` | Use the Kvaerno-5-3-4 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK436L2SA_DIRK_6_3_4` | Use the ARK-6-3-4 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_KVAERNO_7_4_5` | Use the Kvaerno-7-4-5 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK436L2SA_6_3_4` | Use the ESDIRK436L2SA-6-3-4 method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK43I6L2SA_6_3_4` | Use the ESDIRK43I6L2SA-6-3-4 method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_QESDIRK436L2SA_6_3_4` | Use the QESDIRK436L2SA-6-3-4 method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK437L2SA_7_3_4` | Use the ESDIRK437L2SA-7-3-4 method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK548L2SA_DIRK_8_4_5` | Use the ARK-8-4-5 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK437L2SA_DIRK_7_3_4` | Use the ARK-7-3-4 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ARK548L2SAb_DIRK_8_4_5` | Use the ARK-8-4-5b ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK547L2SA_7_4_5` | Use the ESDIRK547L2SA-7-4-5 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_ESDIRK547L2SA2_7_4_5` | Use the ESDIRK547L2SA2-7-4-5 ESDIRK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_DIRK_1` | Use ARKStep's default first-order DIRK method | - | | (ARKODE_BACKWARD_EULER_1_1). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_DIRK_2` | Use ARKStep's default second-order DIRK method | - | | (ARKODE_ARK2_DIRK_3_1_2). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_DIRK_3` | Use ARKStep's default third-order DIRK method | - | | (ARKODE_ESDIRK325L2SA_5_2_3). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_DIRK_4` | Use ARKStep's default fourth-order DIRK method | - | | (ARKODE_ESDIRK436L2SA_6_3_4). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_DIRK_5` | Use ARKStep's default fifth-order DIRK method | - | | (ARKODE_ESDIRK547L2SA2_7_4_5). | - +-----------------------------------------------+------------------------------------------------------------+ - | | | - +-----------------------------------------------+------------------------------------------------------------+ | **ImEx Butcher table specification** | | +-----------------------------------------------+------------------------------------------------------------+ | ARKODE_ARK2_ERK_3_1_2 & | Use the :index:`ARK-3-1-2 ARK method`. | From bc56b9db2bb283a42761100ab5dc9e678613bbe3 Mon Sep 17 00:00:00 2001 From: "David J. Gardner" Date: Mon, 16 Sep 2024 17:34:19 -0700 Subject: [PATCH 21/31] update output files --- .../CXX_parallel/ark_heat2D_p_--np_2_2.out | 68 +-- .../ark_heat2D_hypre_ls_--np_2_2.out | 62 +-- .../ark_heat2D_hypre_pfmg_--np_2_2.out | 70 +-- .../ark_heat2D_hypre_pfmg_mri_--np_2_2.out | 32 +- .../arkode/CXX_serial/ark_analytic_sys.out | 12 +- examples/arkode/CXX_serial/ark_heat2D.out | 68 +-- .../arkode/CXX_serial/ark_kpr_Mt_0_-4.out | 18 +- .../ark_kpr_Mt_0_4_0_-10_0_10_1.out | 220 ++++---- .../ark_kpr_Mt_0_4_0_-10_1_10_1.out | 220 ++++---- .../arkode/CXX_serial/ark_kpr_Mt_0_4_1.out | 216 ++++---- examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out | 220 ++++---- .../CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out | 18 +- .../arkode/CXX_serial/ark_kpr_Mt_1_-5.out | 18 +- examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out | 222 ++++---- .../CXX_serial/ark_kpr_Mt_2_-5_0_-10.out | 18 +- .../CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out | 214 ++++---- .../CXX_serial/ark_kpr_Mt_2_8_0_-10.out | 204 ++++---- .../ark_brusselator1D_FEM_sludist.out | 184 +++---- ...mg_xbraid_--np_2_1_2_--x_print_level_0.out | 22 +- ..._p_xbraid_--np_2_1_2_--x_print_level_0.out | 20 +- .../ark_heat2D_xbraid_--x_print_level_0.out | 20 +- .../ark_brusselator1D_manyvec.out | 46 +- .../arkode/C_openmp/ark_brusselator1D_omp.out | 160 +++--- examples/arkode/C_openmp/ark_heat1D_omp.out | 10 +- .../C_parallel/ark_diurnal_kry_bbd_p.out | 136 ++--- .../arkode/C_parallel/ark_diurnal_kry_p.out | 66 +-- .../arkode/C_parhyp/ark_diurnal_kry_ph.out | 66 +-- .../arkode/C_serial/ark_KrylovDemo_prec.out | 474 +++++++++--------- .../arkode/C_serial/ark_KrylovDemo_prec_1.out | 474 +++++++++--------- .../arkode/C_serial/ark_KrylovDemo_prec_2.out | 474 +++++++++--------- examples/arkode/C_serial/ark_analytic.out | 14 +- .../arkode/C_serial/ark_analytic_mels.out | 10 +- .../arkode/C_serial/ark_analytic_nonlin.out | 20 +- examples/arkode/C_serial/ark_brusselator.out | 36 +- .../arkode/C_serial/ark_brusselator1D.out | 160 +++--- .../C_serial/ark_brusselator1D_FEM_slu.out | 184 +++---- .../arkode/C_serial/ark_brusselator1D_klu.out | 24 +- .../arkode/C_serial/ark_brusselator_fp.out | 28 +- .../arkode/C_serial/ark_brusselator_fp_1.out | 28 +- .../ark_conserved_exp_entropy_ark_1_0.out | 15 +- .../ark_conserved_exp_entropy_erk_1.out | 19 +- .../ark_dissipated_exp_entropy_1_0.out | 16 +- examples/arkode/C_serial/ark_heat1D.out | 10 +- examples/arkode/C_serial/ark_heat1D_adapt.out | 183 ++----- examples/arkode/C_serial/ark_robertson.out | 230 ++++----- .../C_serial/ark_robertson_constraints.out | 216 ++++---- .../arkode/C_serial/ark_robertson_root.out | 42 +- .../F2003_serial/ark_analytic_f2003.out | 22 +- .../CXX_parallel/ark_test_heat2D_mri_0.out | 6 +- .../CXX_parallel/ark_test_heat2D_mri_1.out | 6 +- .../arkode/CXX_serial/ark_test_butcher.out | 2 + .../ark_test_dahlquist_ark_0_-1_0.out | 70 +++ .../ark_test_dahlquist_ark_0_0_0.out | 70 +++ .../ark_test_dahlquist_ark_0_0_1.out | 70 +++ .../ark_test_dahlquist_ark_0_1_0.out | 70 +++ .../ark_test_dahlquist_ark_0_1_1.out | 70 +++ .../ark_test_dahlquist_ark_1_-1_0.out | 70 +++ .../ark_test_dahlquist_ark_1_0_0.out | 70 +++ .../ark_test_dahlquist_ark_1_0_1.out | 70 +++ .../ark_test_dahlquist_ark_1_1_0.out | 70 +++ .../ark_test_dahlquist_ark_1_1_1.out | 70 +++ .../ark_test_dahlquist_ark_2_-1_0.out | 70 +++ .../ark_test_dahlquist_ark_2_0_0.out | 70 +++ .../ark_test_dahlquist_ark_2_0_1.out | 70 +++ .../ark_test_dahlquist_ark_2_1_0.out | 70 +++ .../ark_test_dahlquist_ark_2_1_1.out | 70 +++ .../CXX_serial/ark_test_dahlquist_erk_-1.out | 70 +++ .../CXX_serial/ark_test_dahlquist_erk_0.out | 70 +++ .../CXX_serial/ark_test_dahlquist_erk_1.out | 70 +++ .../CXX_serial/ark_test_dahlquist_mri_-1.out | 6 +- .../CXX_serial/ark_test_dahlquist_mri_0.out | 6 +- .../CXX_serial/ark_test_dahlquist_mri_1.out | 6 +- .../arkode/CXX_serial/ark_test_getjac.out | 10 +- 73 files changed, 3897 insertions(+), 2714 deletions(-) diff --git a/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out b/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out index 015642ed18..c699d8969a 100644 --- a/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out +++ b/examples/arkode/CXX_parallel/ark_heat2D_p_--np_2_2.out @@ -37,45 +37,45 @@ t ||u||_rms max error ----------------------------------------------------------------------- 0.000000000000000e+00 3.632812500000001e-01 0.000000000000000e+00 - 5.000000000000000e-02 3.551988422773351e-01 2.455482033533629e-03 - 1.000000000000000e-01 3.296234292363186e-01 2.897896070159778e-03 - 1.500000000000000e-01 2.894441908882201e-01 2.832303715537221e-03 - 2.000000000000000e-01 2.387114782162635e-01 2.525801964766261e-03 - 2.500000000000000e-01 1.824256478587985e-01 2.078269197756610e-03 - 3.000000000000000e-01 1.261168083661019e-01 1.580109403207297e-03 - 3.500000000000000e-01 7.529981277589509e-02 1.084790395311314e-03 - 4.000000000000000e-01 3.495180900127044e-02 6.472682226835030e-04 - 4.500000000000000e-01 9.023693955015859e-03 3.135810295420080e-04 - 4.999999999999999e-01 5.528701560828762e-05 1.158664423513919e-04 - 5.499999999999999e-01 8.918915917892657e-03 7.372606708900761e-05 - 6.000000000000000e-01 3.475275193022622e-02 1.914158609587074e-04 - 6.500000000000000e-01 7.502609251490090e-02 4.577116702588202e-04 - 7.000000000000001e-01 1.257965751111169e-01 8.461653361390153e-04 - 7.500000000000001e-01 1.820941861365472e-01 1.318095291393762e-03 - 8.000000000000002e-01 2.384093995701346e-01 1.830603310791989e-03 - 8.500000000000002e-01 2.892274536261998e-01 2.327914469715142e-03 - 9.000000000000002e-01 3.295751200290455e-01 2.764242715480814e-03 - 9.500000000000003e-01 3.555039203482325e-01 3.099492713609875e-03 - 1.000000000000000e+00 3.644737419511721e-01 3.296010382883741e-03 + 5.000000000000000e-02 3.551975186497072e-01 2.451401722563751e-03 + 1.000000000000000e-01 3.296193245542247e-01 2.886719822310813e-03 + 1.500000000000000e-01 2.894394995327852e-01 2.819561275503424e-03 + 2.000000000000000e-01 2.387051236315032e-01 2.508728100702684e-03 + 2.500000000000000e-01 1.824192500474078e-01 2.061018435531359e-03 + 3.000000000000000e-01 1.261114731502070e-01 1.565744344754094e-03 + 3.500000000000000e-01 7.529670538702467e-02 1.076502253154671e-03 + 4.000000000000000e-01 3.495085386661465e-02 6.448406239761145e-04 + 4.500000000000000e-01 9.023288131469501e-03 3.126108214156556e-04 + 4.999999999999999e-01 5.510794368507914e-05 1.154822782246535e-04 + 5.499999999999999e-01 8.918945620517841e-03 7.385136832613326e-05 + 6.000000000000000e-01 3.475329657677299e-02 1.929567559659923e-04 + 6.500000000000000e-01 7.502673187705128e-02 4.594930062402358e-04 + 7.000000000000001e-01 1.257972362776034e-01 8.479937558674155e-04 + 7.500000000000001e-01 1.820950537074953e-01 1.320467993117580e-03 + 8.000000000000002e-01 2.384122561642808e-01 1.838591535529566e-03 + 8.500000000000002e-01 2.892284300226399e-01 2.330589400411087e-03 + 9.000000000000002e-01 3.295763779392321e-01 2.767574885876978e-03 + 9.500000000000003e-01 3.555075593683923e-01 3.109525857063367e-03 + 1.000000000000000e+00 3.644743080794827e-01 3.297333545081771e-03 ----------------------------------------------------------------------- Final integrator statistics: - Steps = 124 - Step attempts = 125 + Steps = 84 + Step attempts = 85 Error test fails = 1 - RHS evals = 753 - NLS iters = 375 + RHS evals = 683 + NLS iters = 340 NLS fails = 0 - LS iters = 12926 - LS fails = 36 - LS setups = 56 - LS RHS evals = 12926 - Jv products = 12926 + LS iters = 10953 + LS fails = 3 + LS setups = 37 + LS RHS evals = 10953 + Jv products = 10953 - Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 34.469333 + Avg NLS iters per step attempt = 4.000000 + Avg LS iters per NLS iter = 32.214706 - Preconditioner setups = 4 - Preconditioner solves = 12926 + Preconditioner setups = 2 + Preconditioner solves = 10953 - Max error = 3.296010382883741e-03 + Max error = 3.297333545081771e-03 diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out index b39cea2617..5516288ce6 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_ls_--np_2_2.out @@ -39,41 +39,41 @@ t ||u||_rms max error ----------------------------------------------------------------------- 0.000000000000000e+00 3.691406249999997e-01 0.000000000000000e+00 - 5.000000000000000e-02 3.603048616826305e-01 5.947581725728179e-04 - 1.000000000000000e-01 3.341442212752840e-01 7.029488321168564e-04 - 1.500000000000000e-01 2.933129364265377e-01 6.872104657476008e-04 - 2.000000000000000e-01 2.418371828053933e-01 6.138967875570778e-04 - 2.500000000000000e-01 1.847632280574957e-01 5.043531454586581e-04 - 3.000000000000000e-01 1.276840002086280e-01 3.835930415112543e-04 - 3.500000000000000e-01 7.618719032747635e-02 2.636045188839364e-04 - 4.000000000000000e-01 3.531419592900913e-02 1.573064596348678e-04 - 4.500000000000000e-01 9.066519339379787e-03 7.648429036438351e-05 - 4.999999999999999e-01 1.366001182955177e-05 2.823151525618881e-05 - 5.499999999999999e-01 9.040623249804480e-03 1.797011257116676e-05 - 6.000000000000000e-01 3.526521493542879e-02 4.668318201424271e-05 - 6.500000000000000e-01 7.611978800168766e-02 1.113065272941860e-04 - 7.000000000000001e-01 1.276052139795589e-01 2.055077733629229e-04 - 7.500000000000001e-01 1.846816872915429e-01 3.198180091369962e-04 - 8.000000000000002e-01 2.417622665897317e-01 4.436012686840352e-04 - 8.500000000000002e-01 2.932595626759314e-01 5.646812043708094e-04 - 9.000000000000002e-01 3.341325736187309e-01 6.709855218919314e-04 - 9.500000000000003e-01 3.603805168237892e-01 7.524532351735891e-04 - 1.000000000000000e+00 3.694333172786592e-01 7.994041731184121e-04 + 5.000000000000000e-02 3.603050605457244e-01 5.949542919905237e-04 + 1.000000000000000e-01 3.341384725268842e-01 6.872428139877984e-04 + 1.500000000000000e-01 2.933118108140592e-01 6.841988946905131e-04 + 2.000000000000000e-01 2.418329045193057e-01 6.024519870932998e-04 + 2.500000000000000e-01 1.847611021704818e-01 4.987490647692661e-04 + 3.000000000000000e-01 1.276829050921574e-01 3.807788495995834e-04 + 3.500000000000000e-01 7.618579917816400e-02 2.600027995683929e-04 + 4.000000000000000e-01 3.531332131463580e-02 1.550723013370309e-04 + 4.500000000000000e-01 9.066121491604642e-03 7.551344438811239e-05 + 4.999999999999999e-01 1.353803921817276e-05 2.798148703851016e-05 + 5.499999999999999e-01 9.040653419481041e-03 1.808327580855515e-05 + 6.000000000000000e-01 3.526532709799456e-02 4.701644881505151e-05 + 6.500000000000000e-01 7.612055654194419e-02 1.134012380054339e-04 + 7.000000000000001e-01 1.276052252048378e-01 2.055459239037050e-04 + 7.500000000000001e-01 1.846819826297028e-01 3.207203792571778e-04 + 8.000000000000002e-01 2.417630598586837e-01 4.457636102735973e-04 + 8.500000000000002e-01 2.932631800624002e-01 5.744314225956115e-04 + 9.000000000000002e-01 3.341347581886813e-01 6.768394853960968e-04 + 9.500000000000003e-01 3.603810282828733e-01 7.538503163625476e-04 + 1.000000000000000e+00 3.694337373313009e-01 8.004071841360982e-04 ----------------------------------------------------------------------- Final integrator statistics: - Steps = 134 - Step attempts = 135 - Error test fails = 1 - RHS evals = 813 - NLS iters = 405 + Steps = 90 + Step attempts = 90 + Error test fails = 0 + RHS evals = 723 + NLS iters = 360 NLS fails = 0 - LS iters = 2925 + LS iters = 2575 LS fails = 0 - LS setups = 59 - J evals = 4 + LS setups = 43 + J evals = 2 - Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 7.222222 + Avg NLS iters per step attempt = 4.000000 + Avg LS iters per NLS iter = 7.152778 - Max error = 7.994041731184121e-04 + Max error = 8.004071841360982e-04 diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out index 3aa6089418..c1e29bbe6e 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_--np_2_2.out @@ -40,46 +40,46 @@ t ||u||_rms max error ----------------------------------------------------------------------- 0.000000000000000e+00 3.691406249999997e-01 0.000000000000000e+00 - 5.000000000000000e-02 3.603048619753333e-01 5.947590016540660e-04 - 1.000000000000000e-01 3.341442195764323e-01 7.029443280297532e-04 - 1.500000000000000e-01 2.933129358633914e-01 6.872088817982958e-04 - 2.000000000000000e-01 2.418371813857269e-01 6.138930097124851e-04 - 2.500000000000000e-01 1.847632276239268e-01 5.043519623673109e-04 - 3.000000000000000e-01 1.276839995499893e-01 3.835912864304514e-04 - 3.500000000000000e-01 7.618719105489918e-02 2.636064591631515e-04 - 4.000000000000000e-01 3.531419609803035e-02 1.573069173000513e-04 - 4.500000000000000e-01 9.066519524079126e-03 7.648478735214695e-05 - 4.999999999999999e-01 1.366000892977262e-05 2.823150845772370e-05 - 5.499999999999999e-01 9.040623278407151e-03 1.797019017690110e-05 - 6.000000000000000e-01 3.526521486057654e-02 4.668298068317978e-05 - 6.500000000000000e-01 7.611978811031622e-02 1.113068150605245e-04 - 7.000000000000001e-01 1.276052145445968e-01 2.055092828922023e-04 - 7.500000000000001e-01 1.846816859443554e-01 3.198144283996229e-04 - 8.000000000000002e-01 2.417622651778854e-01 4.435975267760295e-04 - 8.500000000000002e-01 2.932595614654954e-01 5.646779628073473e-04 - 9.000000000000002e-01 3.341325728392148e-01 6.709834145076643e-04 - 9.500000000000003e-01 3.603805172400869e-01 7.524543311739906e-04 - 1.000000000000000e+00 3.694333171606730e-01 7.994038031826634e-04 + 5.000000000000000e-02 3.603050603105894e-01 5.949536547211753e-04 + 1.000000000000000e-01 3.341384722277078e-01 6.872420084500508e-04 + 1.500000000000000e-01 2.933118083957050e-01 6.841924389963117e-04 + 2.000000000000000e-01 2.418329020991048e-01 6.024454764734788e-04 + 2.500000000000000e-01 1.847610999094610e-01 4.987429422280698e-04 + 3.000000000000000e-01 1.276829087160619e-01 3.807886564125562e-04 + 3.500000000000000e-01 7.618579849980092e-02 2.600009957156035e-04 + 4.000000000000000e-01 3.531332097018328e-02 1.550713801812958e-04 + 4.500000000000000e-01 9.066121776386335e-03 7.551421711559161e-05 + 4.999999999999999e-01 1.353803821238967e-05 2.798148454130189e-05 + 5.499999999999999e-01 9.040653262527190e-03 1.808285169141444e-05 + 6.000000000000000e-01 3.526532781704243e-02 4.701840358070641e-05 + 6.500000000000000e-01 7.612055221081775e-02 1.133895251361206e-04 + 7.000000000000001e-01 1.276052097316916e-01 2.055040744969316e-04 + 7.500000000000001e-01 1.846819873529386e-01 3.207331722942519e-04 + 8.000000000000002e-01 2.417630666185325e-01 4.457818996586038e-04 + 8.500000000000002e-01 2.932631795090666e-01 5.744299739853798e-04 + 9.000000000000002e-01 3.341347671827456e-01 6.768638571579277e-04 + 9.500000000000003e-01 3.603810347225249e-01 7.538677468750254e-04 + 1.000000000000000e+00 3.694337374441339e-01 8.004076128652615e-04 ----------------------------------------------------------------------- Final integrator statistics: - Steps = 134 - Step attempts = 135 - Error test fails = 1 - RHS evals = 813 - NLS iters = 405 + Steps = 90 + Step attempts = 90 + Error test fails = 0 + RHS evals = 723 + NLS iters = 360 NLS fails = 0 - LS iters = 2482 + LS iters = 2162 LS fails = 0 - LS setups = 59 - LS RHS evals = 2482 - Jv products = 2482 + LS setups = 43 + LS RHS evals = 2162 + Jv products = 2162 - Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 6.128395 + Avg NLS iters per step attempt = 4.000000 + Avg LS iters per NLS iter = 6.005556 - Preconditioner setups = 59 - Preconditioner solves = 2482 - PFMG iters = 2482 + Preconditioner setups = 43 + Preconditioner solves = 2162 + PFMG iters = 2162 - Max error = 7.994038031826634e-04 + Max error = 8.004076128652615e-04 diff --git a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out index 5c1a518ea8..24f186834b 100644 --- a/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out +++ b/examples/arkode/CXX_parhyp/ark_heat2D_hypre_pfmg_mri_--np_2_2.out @@ -42,16 +42,16 @@ t ||u||_rms ---------------------------------------------- 0.000000000000000e+00 3.691406249999997e-01 - 1.000000000000000e-01 5.162014241947240e-02 - 2.000000000000000e-01 7.426100187263422e-03 - 3.000000000000000e-01 1.067221316468460e-03 - 4.000000000000000e-01 1.533638016722887e-04 - 5.000000000000000e-01 2.203889954704845e-05 - 6.000000000000000e-01 3.167064268518253e-06 - 7.000000000000000e-01 4.551178805373316e-07 - 7.999999999999999e-01 6.540199603778498e-08 - 8.999999999999999e-01 9.398525782915539e-09 - 1.000000000000000e+00 1.350608880519736e-09 + 1.000000000000000e-01 5.162013348084430e-02 + 2.000000000000000e-01 7.426099611781720e-03 + 3.000000000000000e-01 1.067221239904711e-03 + 4.000000000000000e-01 1.533637906675603e-04 + 5.000000000000000e-01 2.203889796541893e-05 + 6.000000000000000e-01 3.167064041223480e-06 + 7.000000000000000e-01 4.551178478732877e-07 + 7.999999999999999e-01 6.540199134369242e-08 + 8.999999999999999e-01 9.398525108333204e-09 + 1.000000000000000e+00 1.350608783576075e-09 ---------------------------------------------- Final slow integrator statistics: @@ -74,16 +74,16 @@ Final fast integrator statistics: Steps = 3003 Step attempts = 3003 Error test fails = 0 - RHS evals = 29862 - NLS iters = 17842 + RHS evals = 38706 + NLS iters = 23683 NLS fails = 0 - LS iters = 10048 + LS iters = 13067 LS fails = 0 LS setups = 0 - Jv products = 10048 + Jv products = 13067 - Avg NLS iters per step attempt = 5.941392 - Avg LS iters per NLS iter = 0.563166 + Avg NLS iters per step attempt = 7.886447 + Avg LS iters per NLS iter = 0.551746 Preconditioner setups = 0 Preconditioner solves = 0 diff --git a/examples/arkode/CXX_serial/ark_analytic_sys.out b/examples/arkode/CXX_serial/ark_analytic_sys.out index 955ee55f38..cb5cb0156a 100644 --- a/examples/arkode/CXX_serial/ark_analytic_sys.out +++ b/examples/arkode/CXX_serial/ark_analytic_sys.out @@ -6,9 +6,9 @@ Analytical ODE test problem: t y0 y1 y2 -------------------------------------- - 0.0050 0.70328 0.70627 0.41005 + 0.0050 0.70327 0.70627 0.41004 0.0100 0.52267 0.52865 0.05232 - 0.0150 0.41249 0.42145 -0.16456 + 0.0150 0.41249 0.42145 -0.16455 0.0200 0.34504 0.35697 -0.29600 0.0250 0.30350 0.31838 -0.37562 0.0300 0.27767 0.29551 -0.42382 @@ -19,12 +19,12 @@ Analytical ODE test problem: -------------------------------------- Final Solver Statistics: - Internal solver steps = 67 (attempted = 69) - Total RHS evals: Fe = 0, Fi = 348 - Total linear solver setups = 22 + Internal solver steps = 31 (attempted = 33) + Total RHS evals: Fe = 0, Fi = 168 + Total linear solver setups = 14 Total RHS evals for setting up the linear system = 0 Total number of Jacobian evaluations = 3 - Total number of Newton iterations = 345 + Total number of Newton iterations = 165 Total number of linear solver convergence failures = 0 Total number of error test failures = 2 diff --git a/examples/arkode/CXX_serial/ark_heat2D.out b/examples/arkode/CXX_serial/ark_heat2D.out index c7146f1b2b..f4c83a6cef 100644 --- a/examples/arkode/CXX_serial/ark_heat2D.out +++ b/examples/arkode/CXX_serial/ark_heat2D.out @@ -31,45 +31,45 @@ t ||u||_rms max error ----------------------------------------------------------------------- 0.000000000000000e+00 3.632812500000000e-01 0.000000000000000e+00 - 5.000000000000000e-02 3.551988422792973e-01 2.455482048598578e-03 - 1.000000000000000e-01 3.296234292110422e-01 2.897895995286115e-03 - 1.500000000000000e-01 2.894441909307264e-01 2.832303876386777e-03 - 2.000000000000000e-01 2.387114783346062e-01 2.525802281702627e-03 - 2.500000000000000e-01 1.824256479329715e-01 2.078269451951664e-03 - 3.000000000000000e-01 1.261168083582418e-01 1.580109388325313e-03 - 3.500000000000000e-01 7.529981276644941e-02 1.084790361132459e-03 - 4.000000000000000e-01 3.495180902493194e-02 6.472682865382440e-04 - 4.500000000000000e-01 9.023693953952201e-03 3.135810269774553e-04 - 4.999999999999999e-01 5.528701564976438e-05 1.158664424579011e-04 - 5.499999999999999e-01 8.918915918150624e-03 7.372606719366695e-05 - 6.000000000000000e-01 3.475275193254342e-02 1.914158656317888e-04 - 6.500000000000000e-01 7.502609250596767e-02 4.577116486274846e-04 - 7.000000000000001e-01 1.257965751168525e-01 8.461653407310088e-04 - 7.500000000000001e-01 1.820941861476670e-01 1.318095319222168e-03 - 8.000000000000002e-01 2.384093995816105e-01 1.830603307639511e-03 - 8.500000000000002e-01 2.892274536103360e-01 2.327914403585929e-03 - 9.000000000000002e-01 3.295751199825840e-01 2.764242586895782e-03 - 9.500000000000003e-01 3.555039203016255e-01 3.099492598853892e-03 - 1.000000000000000e+00 3.644737419736066e-01 3.296010432179086e-03 + 5.000000000000000e-02 3.551975186501967e-01 2.451401730770408e-03 + 1.000000000000000e-01 3.296193245621059e-01 2.886719892297940e-03 + 1.500000000000000e-01 2.894394995211842e-01 2.819561263145864e-03 + 2.000000000000000e-01 2.387051235998365e-01 2.508727890789042e-03 + 2.500000000000000e-01 1.824192500944068e-01 2.061018727842312e-03 + 3.000000000000000e-01 1.261114731253589e-01 1.565744264899693e-03 + 3.500000000000000e-01 7.529670540740070e-02 1.076502323511613e-03 + 4.000000000000000e-01 3.495085382501724e-02 6.448405075650393e-04 + 4.500000000000000e-01 9.023288112317590e-03 3.126107683404655e-04 + 4.999999999999999e-01 5.510794361957854e-05 1.154822781157859e-04 + 5.499999999999999e-01 8.918945621209672e-03 7.385136918056437e-05 + 6.000000000000000e-01 3.475329657926329e-02 1.929567721377229e-04 + 6.500000000000000e-01 7.502673188280035e-02 4.594930299586242e-04 + 7.000000000000001e-01 1.257972362861438e-01 8.479937554011774e-04 + 7.500000000000001e-01 1.820950537193692e-01 1.320468028305877e-03 + 8.000000000000002e-01 2.384122561794825e-01 1.838591556463820e-03 + 8.500000000000002e-01 2.892284300604713e-01 2.330589494148771e-03 + 9.000000000000002e-01 3.295763778665232e-01 2.767574678415818e-03 + 9.500000000000003e-01 3.555075594185851e-01 3.109526022467723e-03 + 1.000000000000000e+00 3.644743080820197e-01 3.297333552827242e-03 ----------------------------------------------------------------------- Final integrator statistics: - Steps = 124 - Step attempts = 125 + Steps = 84 + Step attempts = 85 Error test fails = 1 - RHS evals = 753 - NLS iters = 375 + RHS evals = 683 + NLS iters = 340 NLS fails = 0 - LS iters = 12927 - LS fails = 36 - LS setups = 56 - LS RHS evals = 12927 - Jv products = 12927 + LS iters = 10957 + LS fails = 3 + LS setups = 37 + LS RHS evals = 10957 + Jv products = 10957 - Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 34.472000 + Avg NLS iters per step attempt = 4.000000 + Avg LS iters per NLS iter = 32.226471 - Preconditioner setups = 4 - Preconditioner solves = 12927 + Preconditioner setups = 2 + Preconditioner solves = 10957 - Max error = 3.296010432179086e-03 + Max error = 3.297333552827242e-03 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out index 8a2bebd177..b97f6efdd1 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_-4.out @@ -11,13 +11,13 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: Fixed-step runs: ----------------------------------------------------- - h = 5.000e-01, error = 7.947e-05 - h = 2.500e-01, error = 3.984e-05, order = 1.00 - h = 1.250e-01, error = 1.367e-05, order = 1.54 - h = 6.250e-02, error = 3.085e-06, order = 2.15 - h = 3.125e-02, error = 4.714e-07, order = 2.71 - h = 1.562e-02, error = 5.337e-08, order = 3.14 - h = 7.812e-03, error = 4.828e-09, order = 3.47 - h = 3.906e-03, error = 3.726e-10, order = 3.70 + h = 5.000e-01, error = 3.413e-04 + h = 2.500e-01, error = 8.325e-05, order = 2.04 + h = 1.250e-01, error = 2.270e-05, order = 1.87 + h = 6.250e-02, error = 3.679e-06, order = 2.63 + h = 3.125e-02, error = 3.525e-07, order = 3.38 + h = 1.562e-02, error = 2.499e-08, order = 3.82 + h = 7.812e-03, error = 1.597e-09, order = 3.97 + h = 3.906e-03, error = 9.844e-11, order = 4.02 ----------------------------------------------------- - Order: max = 3.70, avg = 2.53, overall = 2.57 [SUCCESS] + Order: max = 4.02, avg = 3.10, overall = 3.13 [SUCCESS] diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out index 25d972ace0..45f23d1702 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_0_10_1.out @@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: t u v uerr verr ------------------------------------------------------ -3.000000 0.710636 1.363407 0.00e+00 0.00e+00 - -2.900000 0.717301 1.326933 2.70e-07 3.73e-08 - -2.800000 0.727249 1.290351 1.13e-06 1.93e-06 - -2.700000 0.740247 1.254036 1.07e-06 5.17e-06 - -2.600000 0.756014 1.218395 7.58e-07 4.79e-06 - -2.500000 0.774228 1.183857 4.73e-07 4.46e-06 - -2.400000 0.794546 1.150881 3.10e-07 4.15e-06 - -2.300000 0.816616 1.119949 1.90e-07 3.86e-06 - -2.200000 0.840089 1.091557 7.29e-08 3.57e-06 - -2.100000 0.864625 1.066201 5.01e-08 3.31e-06 - -2.000000 0.889902 1.044364 2.51e-07 2.98e-06 - -1.900000 0.915617 1.026496 7.41e-07 2.44e-06 - -1.800000 0.941484 1.012992 3.21e-06 4.66e-07 - -1.700000 0.967244 1.004159 8.82e-06 3.48e-08 - -1.600000 0.992667 1.000213 5.91e-06 1.67e-07 - -1.500000 1.017525 1.001250 6.01e-06 1.73e-06 - -1.400000 1.041618 1.007250 7.55e-06 6.60e-07 - -1.300000 1.064770 1.018056 7.07e-06 1.39e-06 - -1.200000 1.086812 1.033423 8.15e-06 1.14e-06 - -1.100000 1.107603 1.052993 6.37e-06 1.16e-06 - -1.000000 1.127003 1.076350 6.54e-06 5.97e-07 - -0.900000 1.144897 1.103030 7.12e-06 1.12e-06 - -0.800000 1.161181 1.132540 5.65e-06 1.73e-06 - -0.700000 1.175759 1.164384 5.09e-06 3.04e-06 - -0.600000 1.188551 1.198067 6.35e-06 3.20e-06 - -0.500000 1.199490 1.233118 5.85e-06 1.93e-06 - -0.400000 1.208519 1.269088 5.00e-06 5.89e-07 - -0.300000 1.215588 1.305555 6.04e-06 2.25e-06 - -0.200000 1.220662 1.342131 6.84e-06 5.78e-06 - -0.100000 1.223719 1.378457 6.01e-06 7.95e-06 - 0.000000 1.224739 1.414204 5.62e-06 9.85e-06 - 0.100000 1.223718 1.449068 7.07e-06 1.25e-05 - 0.200000 1.220662 1.482778 6.74e-06 1.28e-05 - 0.300000 1.215588 1.515084 5.72e-06 1.31e-05 - 0.400000 1.208518 1.545760 5.96e-06 1.46e-05 - 0.500000 1.199489 1.574603 6.91e-06 1.62e-05 - 0.600000 1.188551 1.601433 6.09e-06 1.67e-05 - 0.700000 1.175759 1.626088 5.28e-06 1.69e-05 - 0.800000 1.161180 1.648423 5.98e-06 1.75e-05 - 0.900000 1.144898 1.668313 5.87e-06 1.77e-05 - 1.000000 1.127005 1.685649 4.85e-06 1.72e-05 - 1.100000 1.107605 1.700338 4.37e-06 1.67e-05 - 1.200000 1.086816 1.712303 4.71e-06 1.64e-05 - 1.300000 1.064773 1.721483 3.98e-06 1.56e-05 - 1.400000 1.041622 1.727831 3.10e-06 1.45e-05 - 1.500000 1.017528 1.731314 2.71e-06 1.35e-05 - 1.600000 0.992671 1.731915 2.16e-06 1.23e-05 - 1.700000 0.967251 1.729632 1.35e-06 1.10e-05 - 1.800000 0.941487 1.724475 4.26e-07 9.77e-06 - 1.900000 0.915622 1.716469 5.05e-06 1.00e-05 - 2.000000 0.889909 1.705658 6.21e-06 8.62e-06 - 2.100000 0.864636 1.692092 1.05e-05 1.02e-05 - 2.200000 0.840099 1.675847 1.03e-05 9.88e-06 - 2.300000 0.816629 1.657008 1.24e-05 9.44e-06 - 2.400000 0.794555 1.635676 9.06e-06 8.49e-06 - 2.500000 0.774235 1.611970 7.64e-06 7.70e-06 - 2.600000 0.756021 1.586026 7.63e-06 7.67e-06 - 2.700000 0.740253 1.557998 6.87e-06 7.15e-06 - 2.800000 0.727253 1.528060 5.82e-06 7.10e-06 - 2.900000 0.717306 1.496405 4.89e-06 7.26e-06 - 3.000000 0.710640 1.463249 4.17e-06 7.32e-06 - 3.100000 0.707416 1.428831 3.60e-06 7.55e-06 - 3.200000 0.707712 1.393413 3.07e-06 8.92e-06 - 3.300000 0.711522 1.357287 2.62e-06 9.53e-06 - 3.400000 0.718752 1.320772 2.24e-06 7.95e-06 - 3.500000 0.729229 1.284212 1.93e-06 6.49e-06 - 3.600000 0.742713 1.247985 1.62e-06 5.13e-06 - 3.700000 0.758915 1.212499 1.32e-06 3.88e-06 - 3.800000 0.777507 1.178192 1.01e-06 2.73e-06 - 3.900000 0.798145 1.145526 7.18e-07 1.69e-06 - 4.000000 0.820475 1.114987 4.41e-07 7.68e-07 - 4.100000 0.844149 1.087071 1.85e-07 3.81e-08 - 4.200000 0.868832 1.062274 5.04e-08 7.17e-07 - 4.300000 0.894204 1.041075 2.64e-07 1.26e-06 - 4.400000 0.919963 1.023915 9.20e-07 2.28e-06 - 4.500000 0.945828 1.011177 6.19e-06 4.81e-06 - 4.600000 0.971553 1.003152 4.72e-06 1.97e-06 - 4.700000 0.996891 1.000041 7.14e-06 2.29e-06 - 4.800000 1.021634 1.001919 6.39e-06 3.05e-06 - 4.900000 1.045581 1.008736 7.54e-06 9.35e-07 - 5.000000 1.068557 1.020334 7.55e-06 2.47e-06 - 5.100000 1.090402 1.036431 5.68e-06 1.83e-06 - 5.200000 1.110965 1.056670 7.01e-06 2.46e-06 - 5.300000 1.130120 1.080619 6.62e-06 2.63e-06 - 5.400000 1.147752 1.107809 5.22e-06 2.51e-06 - 5.500000 1.163753 1.137747 5.96e-06 3.76e-06 - 5.600000 1.178036 1.169935 6.19e-06 6.46e-06 - 5.700000 1.190523 1.203881 5.11e-06 5.99e-06 - 5.800000 1.201144 1.239116 4.94e-06 4.32e-06 - 5.900000 1.209845 1.275199 6.25e-06 3.31e-06 - 6.000000 1.216582 1.311713 5.78e-06 2.19e-06 - 6.100000 1.221320 1.348274 4.88e-06 1.47e-06 - 6.200000 1.224033 1.384526 5.58e-06 8.06e-07 - 6.300000 1.224710 1.420146 6.33e-06 9.33e-08 - 6.400000 1.223348 1.454836 5.45e-06 7.00e-07 - 6.500000 1.219952 1.488327 4.87e-06 1.03e-06 - 6.600000 1.214538 1.520374 6.04e-06 1.49e-06 - 6.700000 1.207136 1.550752 6.18e-06 5.85e-06 - 6.800000 1.197784 1.579267 5.34e-06 8.88e-06 - 6.900000 1.186528 1.605740 5.46e-06 1.20e-05 - 7.000000 1.173429 1.630011 6.48e-06 1.55e-05 + -2.900000 0.717302 1.326933 6.11e-07 3.32e-08 + -2.800000 0.727253 1.290352 5.34e-06 1.02e-06 + -2.700000 0.740279 1.254037 3.29e-05 4.05e-06 + -2.600000 0.756043 1.218398 3.04e-05 1.70e-06 + -2.500000 0.774246 1.183859 1.90e-05 1.94e-06 + -2.400000 0.794560 1.150884 1.39e-05 8.79e-07 + -2.300000 0.816638 1.119952 2.16e-05 1.14e-06 + -2.200000 0.840132 1.091558 4.27e-05 2.21e-06 + -2.100000 0.864656 1.066202 3.06e-05 2.05e-06 + -2.000000 0.889915 1.044371 1.20e-05 4.24e-06 + -1.900000 0.915629 1.026496 1.19e-05 2.37e-06 + -1.800000 0.941492 1.012991 4.11e-06 6.73e-07 + -1.700000 0.967246 1.004169 6.69e-06 1.04e-05 + -1.600000 0.992667 1.000210 6.59e-06 2.93e-06 + -1.500000 1.017521 1.001259 1.01e-05 7.11e-06 + -1.400000 1.041604 1.007259 2.13e-05 9.77e-06 + -1.300000 1.064761 1.018056 1.53e-05 2.16e-06 + -1.200000 1.086799 1.033429 2.15e-05 6.70e-06 + -1.100000 1.107578 1.052996 3.15e-05 3.36e-06 + -1.000000 1.126990 1.076350 1.95e-05 3.16e-07 + -0.900000 1.144872 1.103030 3.18e-05 1.34e-06 + -0.800000 1.161151 1.132540 3.56e-05 1.01e-06 + -0.700000 1.175739 1.164379 2.51e-05 1.43e-06 + -0.600000 1.188515 1.198063 4.19e-05 1.17e-06 + -0.500000 1.199463 1.233117 3.29e-05 9.88e-07 + -0.400000 1.208487 1.269084 3.72e-05 2.82e-06 + -0.300000 1.215537 1.305557 5.68e-05 4.97e-07 + -0.200000 1.220635 1.342136 3.42e-05 5.64e-07 + -0.100000 1.223683 1.378462 4.20e-05 3.45e-06 + 0.000000 1.224697 1.414213 4.78e-05 1.09e-07 + 0.100000 1.223697 1.449078 2.76e-05 2.53e-06 + 0.200000 1.220632 1.482788 3.68e-05 3.15e-06 + 0.300000 1.215564 1.515097 2.98e-05 6.63e-07 + 0.400000 1.208504 1.545771 2.02e-05 3.64e-06 + 0.500000 1.199472 1.574617 2.42e-05 2.57e-06 + 0.600000 1.188542 1.601448 1.51e-05 1.80e-06 + 0.700000 1.175741 1.626102 2.29e-05 3.22e-06 + 0.800000 1.161159 1.648440 2.74e-05 8.89e-07 + 0.900000 1.144886 1.668329 1.75e-05 1.96e-06 + 1.000000 1.126983 1.685664 2.66e-05 2.15e-06 + 1.100000 1.107586 1.700355 2.27e-05 2.46e-07 + 1.200000 1.086803 1.712318 1.75e-05 2.21e-06 + 1.300000 1.064754 1.721497 2.29e-05 1.33e-06 + 1.400000 1.041612 1.727845 1.39e-05 7.19e-07 + 1.500000 1.017516 1.731325 1.46e-05 2.39e-06 + 1.600000 0.992659 1.731927 1.47e-05 7.75e-07 + 1.700000 0.967244 1.729641 8.20e-06 1.53e-06 + 1.800000 0.941480 1.724482 7.98e-06 2.44e-06 + 1.900000 0.915613 1.716478 4.45e-06 6.32e-07 + 2.000000 0.889901 1.705664 1.50e-06 2.49e-06 + 2.100000 0.864629 1.692100 3.46e-06 2.42e-06 + 2.200000 0.840093 1.675856 4.10e-06 1.15e-06 + 2.300000 0.816627 1.657013 1.08e-05 3.55e-06 + 2.400000 0.794564 1.635682 1.84e-05 2.38e-06 + 2.500000 0.774251 1.611974 2.31e-05 4.18e-06 + 2.600000 0.756096 1.586019 8.33e-05 1.39e-05 + 2.700000 0.740378 1.557990 1.32e-04 1.49e-05 + 2.800000 0.727354 1.528060 1.07e-04 7.15e-06 + 2.900000 0.717378 1.496404 7.71e-05 8.36e-06 + 3.000000 0.710757 1.463244 1.21e-04 1.28e-05 + 3.100000 0.707527 1.428831 1.15e-04 8.20e-06 + 3.200000 0.707777 1.393416 6.75e-05 6.81e-06 + 3.300000 0.711614 1.357286 9.41e-05 1.03e-05 + 3.400000 0.718834 1.320774 8.44e-05 6.00e-06 + 3.500000 0.729281 1.284212 5.38e-05 6.50e-06 + 3.600000 0.742788 1.247983 7.64e-05 7.63e-06 + 3.700000 0.758972 1.212500 5.85e-05 2.65e-06 + 3.800000 0.777545 1.178189 3.88e-05 5.57e-06 + 3.900000 0.798193 1.145520 4.91e-05 7.88e-06 + 4.000000 0.820501 1.114982 2.68e-05 5.68e-06 + 4.100000 0.844165 1.087068 1.53e-05 3.10e-06 + 4.200000 0.868849 1.062269 1.63e-05 4.55e-06 + 4.300000 0.894208 1.041075 3.74e-06 1.41e-06 + 4.400000 0.919960 1.023918 3.50e-06 4.92e-06 + 4.500000 0.945832 1.011169 1.82e-06 3.42e-06 + 4.600000 0.971548 1.003161 9.24e-06 1.12e-05 + 4.700000 0.996883 1.000044 1.48e-05 5.98e-06 + 4.800000 1.021627 1.001922 1.40e-05 6.15e-06 + 4.900000 1.045520 1.008796 6.88e-05 6.00e-05 + 5.000000 1.068431 1.020406 1.34e-04 7.52e-05 + 5.100000 1.090257 1.036463 1.50e-04 3.43e-05 + 5.200000 1.110889 1.056673 8.32e-05 6.19e-06 + 5.300000 1.130046 1.080629 8.11e-05 1.18e-05 + 5.400000 1.147620 1.107823 1.37e-04 1.65e-05 + 5.500000 1.163599 1.137759 1.60e-04 1.58e-05 + 5.600000 1.177954 1.169938 8.79e-05 9.27e-06 + 5.700000 1.190428 1.203872 1.00e-04 3.09e-06 + 5.800000 1.200979 1.239109 1.70e-04 2.93e-06 + 5.900000 1.209660 1.275204 1.91e-04 8.84e-06 + 6.000000 1.216488 1.311716 9.91e-05 5.63e-06 + 6.100000 1.221227 1.348266 9.81e-05 6.18e-06 + 6.200000 1.223887 1.384523 1.51e-04 2.78e-06 + 6.300000 1.224559 1.420155 1.57e-04 9.73e-06 + 6.400000 1.223274 1.454841 7.92e-05 4.29e-06 + 6.500000 1.219860 1.488324 9.67e-05 4.35e-06 + 6.600000 1.214400 1.520375 1.43e-04 4.82e-07 + 6.700000 1.207015 1.550765 1.27e-04 6.78e-06 + 6.800000 1.197721 1.579276 6.79e-05 1.60e-07 + 6.900000 1.186439 1.605749 9.46e-05 3.21e-06 + 7.000000 1.173309 1.630030 1.26e-04 3.39e-06 ------------------------------------------------------ Final Solver Statistics: - Internal solver steps = 80 (attempted = 82) + Internal solver steps = 37 (attempted = 39) Total number of error test failures = 2 - Total RHS evals: Fe = 493, Fi = 1082 - Total mass matrix setups = 413 - Total mass matrix solves = 574 - Total mass times evals = 1079 - Total number of Jacobian evaluations = 12 - Total linear solver setups = 21 - Total number of Nonlinear iterations = 999 - Total number of Nonlinear convergence failures = 11 - Errors: u = 5.44891e-06, v = 7.96021e-06, total = 6.82113e-06 + Total RHS evals: Fe = 274, Fi = 638 + Total mass matrix setups = 237 + Total mass matrix solves = 312 + Total mass times evals = 635 + Total number of Jacobian evaluations = 7 + Total linear solver setups = 15 + Total number of Nonlinear iterations = 598 + Total number of Nonlinear convergence failures = 6 + Errors: u = 6.90737e-05, v = 1.16531e-05, total = 4.95327e-05 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out index e28c955d6b..645abfd1ea 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_0_-10_1_10_1.out @@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: t u v uerr verr ------------------------------------------------------ -3.000000 0.710636 1.363407 0.00e+00 0.00e+00 - -2.900000 0.717302 1.326933 5.18e-07 6.29e-08 - -2.800000 0.727249 1.290354 1.76e-06 3.00e-07 - -2.700000 0.740248 1.254042 1.77e-06 6.52e-07 - -2.600000 0.756015 1.218401 2.05e-06 1.18e-06 - -2.500000 0.774229 1.183863 1.80e-06 1.67e-06 - -2.400000 0.794548 1.150887 1.78e-06 2.26e-06 - -2.300000 0.816618 1.119956 1.73e-06 2.88e-06 - -2.200000 0.840091 1.091561 2.35e-06 9.16e-07 - -2.100000 0.864627 1.066206 1.41e-06 1.78e-06 - -2.000000 0.889903 1.044369 7.08e-07 1.83e-06 - -1.900000 0.915617 1.026506 8.72e-08 7.10e-06 - -1.800000 0.941487 1.013000 3.27e-07 8.36e-06 - -1.700000 0.967250 1.004167 2.68e-06 8.25e-06 - -1.600000 0.992670 1.000223 3.57e-06 9.84e-06 - -1.500000 1.017527 1.001259 3.97e-06 7.51e-06 - -1.400000 1.041619 1.007259 6.46e-06 9.78e-06 - -1.300000 1.064772 1.018066 5.08e-06 8.29e-06 - -1.200000 1.086813 1.033430 7.23e-06 8.10e-06 - -1.100000 1.107603 1.053000 6.59e-06 8.19e-06 - -1.000000 1.127004 1.076357 5.43e-06 7.25e-06 - -0.900000 1.144897 1.103036 7.08e-06 7.19e-06 - -0.800000 1.161180 1.132545 6.46e-06 6.66e-06 - -0.700000 1.175759 1.164387 5.27e-06 6.15e-06 - -0.600000 1.188551 1.198070 6.33e-06 6.04e-06 - -0.500000 1.199489 1.233121 6.80e-06 5.48e-06 - -0.400000 1.208518 1.269092 5.71e-06 4.92e-06 - -0.300000 1.215588 1.305562 5.38e-06 4.74e-06 - -0.200000 1.220662 1.342141 6.93e-06 4.44e-06 - -0.100000 1.223718 1.378469 6.52e-06 3.81e-06 - 0.000000 1.224739 1.414217 5.45e-06 3.44e-06 - 0.100000 1.223719 1.449083 6.01e-06 3.25e-06 - 0.200000 1.220662 1.482794 6.90e-06 2.72e-06 - 0.300000 1.215588 1.515100 5.89e-06 2.20e-06 - 0.400000 1.208519 1.545776 5.12e-06 1.91e-06 - 0.500000 1.199490 1.574621 6.23e-06 1.56e-06 - 0.600000 1.188551 1.601451 5.98e-06 9.90e-07 - 0.700000 1.175759 1.626106 4.83e-06 5.92e-07 - 0.800000 1.161182 1.648441 4.59e-06 3.18e-07 - 0.900000 1.144899 1.668330 5.22e-06 1.80e-07 - 1.000000 1.127005 1.685666 4.37e-06 6.52e-07 - 1.100000 1.107606 1.700354 3.45e-06 9.25e-07 - 1.200000 1.086817 1.712319 3.52e-06 1.26e-06 - 1.300000 1.064774 1.721497 3.17e-06 1.75e-06 - 1.400000 1.041623 1.727843 2.27e-06 2.05e-06 - 1.500000 1.017529 1.731325 1.62e-06 2.23e-06 - 1.600000 0.992672 1.731925 1.09e-06 2.62e-06 - 1.700000 0.967252 1.729640 2.98e-07 2.96e-06 - 1.800000 0.941488 1.724482 3.06e-07 3.07e-06 - 1.900000 0.915619 1.716476 1.21e-06 3.20e-06 - 2.000000 0.889905 1.705663 2.67e-06 3.54e-06 - 2.100000 0.864629 1.692098 3.20e-06 3.66e-06 - 2.200000 0.840092 1.675853 3.55e-06 3.60e-06 - 2.300000 0.816622 1.657013 5.76e-06 3.73e-06 - 2.400000 0.794553 1.635680 7.17e-06 3.89e-06 - 2.500000 0.774234 1.611974 6.62e-06 3.74e-06 - 2.600000 0.756019 1.586030 6.45e-06 3.52e-06 - 2.700000 0.740253 1.558002 7.30e-06 3.40e-06 - 2.800000 0.727255 1.528064 7.08e-06 3.25e-06 - 2.900000 0.717306 1.496410 4.96e-06 2.49e-06 - 3.000000 0.710640 1.463255 3.65e-06 1.95e-06 - 3.100000 0.707417 1.428837 4.78e-06 1.61e-06 - 3.200000 0.707713 1.393421 3.79e-06 1.41e-06 - 3.300000 0.711524 1.357296 4.13e-06 1.09e-06 - 3.400000 0.718753 1.320779 3.08e-06 9.90e-07 - 3.500000 0.729230 1.284218 3.50e-06 7.02e-07 - 3.600000 0.742714 1.247989 2.37e-06 7.15e-07 - 3.700000 0.758915 1.212502 9.93e-07 1.30e-06 - 3.800000 0.777507 1.178192 2.56e-07 1.98e-06 - 3.900000 0.798144 1.145525 2.27e-07 2.69e-06 - 4.000000 0.820474 1.114984 5.91e-07 3.44e-06 - 4.100000 0.844148 1.087067 8.85e-07 4.17e-06 - 4.200000 0.868831 1.062268 1.12e-06 4.90e-06 - 4.300000 0.894202 1.041068 1.31e-06 5.58e-06 - 4.400000 0.919963 1.023910 1.35e-06 3.31e-06 - 4.500000 0.945833 1.011171 9.17e-07 1.79e-06 - 4.600000 0.971554 1.003150 2.99e-06 5.83e-07 - 4.700000 0.996895 1.000039 2.92e-06 8.52e-07 - 4.800000 1.021636 1.001916 4.52e-06 5.99e-07 - 4.900000 1.045583 1.008738 5.49e-06 2.78e-06 - 5.000000 1.068560 1.020333 4.65e-06 1.94e-06 - 5.100000 1.090401 1.036432 6.80e-06 2.61e-06 - 5.200000 1.110966 1.056670 6.28e-06 3.13e-06 - 5.300000 1.130122 1.080620 5.31e-06 2.82e-06 - 5.400000 1.147750 1.107810 6.97e-06 3.23e-06 - 5.500000 1.163752 1.137746 6.56e-06 3.16e-06 - 5.600000 1.178037 1.169932 5.39e-06 3.04e-06 - 5.700000 1.190522 1.203878 6.25e-06 3.28e-06 - 5.800000 1.201142 1.239115 6.96e-06 3.08e-06 - 5.900000 1.209845 1.275198 5.92e-06 2.78e-06 - 6.000000 1.216582 1.311713 5.43e-06 2.82e-06 - 6.100000 1.221318 1.348275 6.97e-06 2.77e-06 - 6.200000 1.224032 1.384528 6.70e-06 2.33e-06 - 6.300000 1.224710 1.420148 5.59e-06 2.09e-06 - 6.400000 1.223347 1.454839 5.89e-06 2.04e-06 - 6.500000 1.219950 1.488330 6.96e-06 1.68e-06 - 6.600000 1.214538 1.520377 6.02e-06 1.24e-06 - 6.700000 1.207137 1.550759 5.14e-06 1.04e-06 - 6.800000 1.197783 1.579277 6.12e-06 7.99e-07 - 6.900000 1.186528 1.605752 6.04e-06 3.04e-07 - 7.000000 1.173431 1.630027 4.89e-06 4.45e-08 + -2.900000 0.717304 1.326933 3.33e-06 2.07e-07 + -2.800000 0.727254 1.290354 6.10e-06 1.90e-07 + -2.700000 0.740252 1.254042 6.43e-06 6.84e-07 + -2.600000 0.756035 1.218398 2.24e-05 1.71e-06 + -2.500000 0.774251 1.183861 2.38e-05 6.05e-08 + -2.400000 0.794564 1.150885 1.77e-05 5.83e-07 + -2.300000 0.816638 1.119953 2.17e-05 1.23e-07 + -2.200000 0.840100 1.091562 1.10e-05 1.50e-06 + -2.100000 0.864638 1.066205 1.28e-05 1.33e-06 + -2.000000 0.889909 1.044370 6.55e-06 2.53e-06 + -1.900000 0.915621 1.026504 3.45e-06 5.07e-06 + -1.800000 0.941490 1.012993 2.62e-06 1.54e-06 + -1.700000 0.967250 1.004168 3.17e-06 8.91e-06 + -1.600000 0.992670 1.000215 3.12e-06 1.33e-06 + -1.500000 1.017529 1.001256 1.68e-06 4.32e-06 + -1.400000 1.041625 1.007256 6.18e-07 6.82e-06 + -1.300000 1.064766 1.018072 1.05e-05 1.44e-05 + -1.200000 1.086804 1.033431 1.68e-05 8.80e-06 + -1.100000 1.107597 1.053000 1.25e-05 7.98e-06 + -1.000000 1.126988 1.076358 2.20e-05 8.42e-06 + -0.900000 1.144889 1.103034 1.51e-05 5.42e-06 + -0.800000 1.161165 1.132543 2.11e-05 4.73e-06 + -0.700000 1.175741 1.164386 2.34e-05 5.16e-06 + -0.600000 1.188539 1.198067 1.80e-05 2.63e-06 + -0.500000 1.199469 1.233119 2.70e-05 3.35e-06 + -0.400000 1.208507 1.269090 1.70e-05 2.95e-06 + -0.300000 1.215569 1.305559 2.49e-05 1.31e-06 + -0.200000 1.220647 1.342140 2.23e-05 3.47e-06 + -0.100000 1.223704 1.378466 2.05e-05 6.89e-07 + 0.000000 1.224718 1.414216 2.72e-05 2.34e-06 + 0.100000 1.223707 1.449081 1.72e-05 1.22e-06 + 0.200000 1.220644 1.482792 2.56e-05 8.16e-07 + 0.300000 1.215575 1.515099 1.85e-05 1.90e-06 + 0.400000 1.208503 1.545774 2.09e-05 5.60e-08 + 0.500000 1.199472 1.574621 2.38e-05 1.66e-06 + 0.600000 1.188541 1.601450 1.63e-05 1.21e-07 + 0.700000 1.175741 1.626106 2.32e-05 4.93e-07 + 0.800000 1.161171 1.648441 1.50e-05 2.87e-07 + 0.900000 1.144882 1.668327 2.17e-05 3.75e-06 + 1.000000 1.126989 1.685662 2.09e-05 4.63e-06 + 1.100000 1.107594 1.700349 1.53e-05 5.74e-06 + 1.200000 1.086802 1.712315 1.81e-05 4.56e-06 + 1.300000 1.064766 1.721494 1.10e-05 4.61e-06 + 1.400000 1.041612 1.727841 1.39e-05 4.78e-06 + 1.500000 1.017521 1.731324 9.77e-06 3.57e-06 + 1.600000 0.992664 1.731923 9.16e-06 4.71e-06 + 1.700000 0.967244 1.729639 8.50e-06 3.52e-06 + 1.800000 0.941482 1.724481 5.17e-06 4.15e-06 + 1.900000 0.915613 1.716475 4.24e-06 4.18e-06 + 2.000000 0.889901 1.705663 1.75e-06 3.40e-06 + 2.100000 0.864626 1.692097 7.95e-07 4.68e-06 + 2.200000 0.840093 1.675854 3.68e-06 3.38e-06 + 2.300000 0.816619 1.657013 2.63e-06 3.81e-06 + 2.400000 0.794547 1.635680 1.61e-06 4.01e-06 + 2.500000 0.774234 1.611973 6.15e-06 4.83e-06 + 2.600000 0.756021 1.586029 8.35e-06 3.99e-06 + 2.700000 0.740258 1.558001 1.17e-05 4.03e-06 + 2.800000 0.727261 1.528065 1.32e-05 2.27e-06 + 2.900000 0.717318 1.496409 1.64e-05 2.78e-06 + 3.000000 0.710654 1.463255 1.78e-05 1.53e-06 + 3.100000 0.707432 1.428837 1.96e-05 2.42e-06 + 3.200000 0.707731 1.393421 2.17e-05 1.71e-06 + 3.300000 0.711540 1.357294 2.03e-05 2.83e-06 + 3.400000 0.718773 1.320777 2.35e-05 2.69e-06 + 3.500000 0.729246 1.284215 1.89e-05 3.26e-06 + 3.600000 0.742735 1.247988 2.32e-05 2.56e-06 + 3.700000 0.758931 1.212501 1.70e-05 2.02e-06 + 3.800000 0.777529 1.178195 2.30e-05 8.60e-08 + 3.900000 0.798158 1.145529 1.43e-05 1.47e-06 + 4.000000 0.820493 1.114991 1.82e-05 3.60e-06 + 4.100000 0.844160 1.087077 1.02e-05 5.73e-06 + 4.200000 0.868845 1.062281 1.22e-05 7.62e-06 + 4.300000 0.894210 1.041084 6.23e-06 1.02e-05 + 4.400000 0.919970 1.023925 6.18e-06 1.19e-05 + 4.500000 0.945837 1.011187 2.54e-06 1.42e-05 + 4.600000 0.971558 1.003165 6.07e-07 1.59e-05 + 4.700000 0.996899 1.000053 5.05e-07 1.45e-05 + 4.800000 1.021641 1.001932 6.10e-07 1.58e-05 + 4.900000 1.045583 1.008757 5.50e-06 2.15e-05 + 5.000000 1.068550 1.020350 1.49e-05 1.93e-05 + 5.100000 1.090398 1.036443 9.92e-06 1.39e-05 + 5.200000 1.110953 1.056683 1.84e-05 1.58e-05 + 5.300000 1.130110 1.080628 1.68e-05 1.10e-05 + 5.400000 1.147715 1.107817 4.17e-05 1.01e-05 + 5.500000 1.163658 1.137754 1.01e-04 1.13e-05 + 5.600000 1.177918 1.169943 1.24e-04 1.42e-05 + 5.700000 1.190461 1.203885 6.68e-05 1.02e-05 + 5.800000 1.201073 1.239112 7.62e-05 6.63e-07 + 5.900000 1.209734 1.275199 1.17e-04 3.67e-06 + 6.000000 1.216485 1.311722 1.03e-04 1.13e-05 + 6.100000 1.221263 1.348274 6.16e-05 2.39e-06 + 6.200000 1.223942 1.384524 9.73e-05 1.79e-06 + 6.300000 1.224594 1.420152 1.22e-04 5.98e-06 + 6.400000 1.223284 1.454842 6.88e-05 5.92e-06 + 6.500000 1.219885 1.488326 7.19e-05 1.85e-06 + 6.600000 1.214434 1.520376 1.10e-04 2.74e-07 + 6.700000 1.207042 1.550764 1.00e-04 6.33e-06 + 6.800000 1.197733 1.579276 5.66e-05 1.63e-07 + 6.900000 1.186451 1.605749 8.30e-05 2.89e-06 + 7.000000 1.173331 1.630029 1.05e-04 2.11e-06 ------------------------------------------------------ Final Solver Statistics: - Internal solver steps = 83 (attempted = 83) + Internal solver steps = 48 (attempted = 51) Total number of error test failures = 0 - Total RHS evals: Fe = 501, Fi = 1738 - Total mass matrix setups = 418 - Total mass matrix solves = 585 - Total mass times evals = 1735 - Total number of Jacobian evaluations = 145 - Total linear solver setups = 150 - Total number of Nonlinear iterations = 1652 - Total number of Nonlinear convergence failures = 144 - Errors: u = 4.76925e-06, v = 3.83012e-06, total = 4.32525e-06 + Total RHS evals: Fe = 353, Fi = 1469 + Total mass matrix setups = 308 + Total mass matrix solves = 402 + Total mass times evals = 1466 + Total number of Jacobian evaluations = 190 + Total linear solver setups = 201 + Total number of Nonlinear iterations = 1418 + Total number of Nonlinear convergence failures = 189 + Errors: u = 4.0374e-05, v = 6.80345e-06, total = 2.89512e-05 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out index a662ca0306..3a3e5327ca 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_4_1.out @@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: t u v uerr verr ------------------------------------------------------ -3.000000 0.710636 1.363407 0.00e+00 0.00e+00 - -2.900000 0.717301 1.326933 4.49e-10 2.27e-12 - -2.800000 0.727247 1.290353 4.71e-10 2.40e-12 - -2.700000 0.740246 1.254042 4.75e-10 2.42e-12 - -2.600000 0.756013 1.218400 4.81e-10 2.45e-12 - -2.500000 0.774227 1.183861 4.86e-10 2.53e-12 - -2.400000 0.794546 1.150885 4.63e-10 2.35e-12 - -2.300000 0.816616 1.119953 4.77e-10 2.40e-12 - -2.200000 0.840089 1.091560 4.63e-10 2.29e-12 - -2.100000 0.864625 1.066204 4.49e-10 1.91e-12 - -2.000000 0.889903 1.044367 4.35e-10 2.22e-12 - -1.900000 0.915617 1.026499 1.65e-10 5.44e-12 - -1.800000 0.941488 1.012992 2.06e-09 3.81e-11 - -1.700000 0.967253 1.004159 8.28e-10 5.15e-12 - -1.600000 0.992673 1.000213 2.51e-08 1.04e-10 - -1.500000 1.017531 1.001252 7.18e-08 1.15e-09 - -1.400000 1.041625 1.007249 7.22e-10 3.60e-11 - -1.300000 1.064777 1.018058 7.17e-10 3.30e-11 - -1.200000 1.086821 1.033422 6.98e-10 2.85e-11 - -1.100000 1.107609 1.052992 7.02e-10 2.53e-11 - -1.000000 1.127010 1.076350 7.44e-10 2.17e-11 - -0.900000 1.144904 1.103029 7.25e-10 1.91e-11 - -0.800000 1.161186 1.132539 7.50e-10 1.63e-11 - -0.700000 1.175764 1.164381 7.38e-10 1.40e-11 - -0.600000 1.188557 1.198064 7.71e-10 1.19e-11 - -0.500000 1.199496 1.233116 8.00e-10 9.72e-12 - -0.400000 1.208524 1.269087 7.82e-10 8.43e-12 - -0.300000 1.215594 1.305557 7.61e-10 6.91e-12 - -0.200000 1.220669 1.342137 8.22e-10 5.38e-12 - -0.100000 1.223725 1.378465 1.64e-07 8.46e-10 - 0.000000 1.224745 1.414214 7.74e-08 3.69e-10 - 0.100000 1.223724 1.449080 1.98e-07 9.71e-10 - 0.200000 1.220669 1.482791 2.35e-07 1.13e-09 - 0.300000 1.215594 1.515097 2.41e-07 1.12e-09 - 0.400000 1.208524 1.545774 8.88e-10 9.81e-11 - 0.500000 1.199496 1.574619 7.62e-10 8.75e-11 - 0.600000 1.188557 1.601450 8.07e-10 7.72e-11 - 0.700000 1.175764 1.626105 7.70e-10 6.85e-11 - 0.800000 1.161186 1.648441 7.48e-10 6.09e-11 - 0.900000 1.144904 1.668331 7.79e-10 5.39e-11 - 1.000000 1.127010 1.685666 7.17e-10 4.84e-11 - 1.100000 1.107609 1.700355 7.31e-10 4.30e-11 - 1.200000 1.086821 1.712320 6.79e-10 3.86e-11 - 1.300000 1.064777 1.721499 6.92e-10 3.44e-11 - 1.400000 1.041625 1.727845 2.04e-08 6.72e-11 - 1.500000 1.017530 1.731328 1.59e-07 7.12e-10 - 1.600000 0.992673 1.731928 6.88e-08 2.91e-10 - 1.700000 0.967253 1.729643 8.70e-08 3.76e-10 - 1.800000 0.941488 1.724485 5.13e-10 5.69e-11 - 1.900000 0.915617 1.716479 8.67e-10 5.85e-11 - 2.000000 0.889903 1.705666 6.33e-10 5.28e-11 - 2.100000 0.864625 1.692102 6.31e-10 4.83e-11 - 2.200000 0.840089 1.675857 5.82e-10 4.42e-11 - 2.300000 0.816616 1.657017 5.51e-10 4.05e-11 - 2.400000 0.794546 1.635684 5.15e-10 3.71e-11 - 2.500000 0.774227 1.611978 5.14e-10 3.44e-11 - 2.600000 0.756013 1.586033 4.88e-10 3.16e-11 - 2.700000 0.740246 1.558005 4.89e-10 2.93e-11 - 2.800000 0.727247 1.528067 4.90e-10 2.73e-11 - 2.900000 0.717301 1.496412 4.79e-10 2.54e-11 - 3.000000 0.710636 1.463257 4.70e-10 2.36e-11 - 3.100000 0.707412 1.428839 9.20e-08 4.46e-10 - 3.200000 0.707710 1.393422 1.09e-07 5.62e-10 - 3.300000 0.711520 1.357297 5.27e-10 1.53e-11 - 3.400000 0.718750 1.320780 4.47e-10 1.41e-11 - 3.500000 0.729227 1.284218 4.49e-10 1.32e-11 - 3.600000 0.742712 1.247990 4.72e-10 1.26e-11 - 3.700000 0.758914 1.212503 4.83e-10 1.20e-11 - 3.800000 0.777506 1.178194 4.61e-10 1.13e-11 - 3.900000 0.798144 1.145528 4.83e-10 1.07e-11 - 4.000000 0.820474 1.114988 4.63e-10 9.99e-12 - 4.100000 0.844149 1.087071 4.86e-10 9.55e-12 - 4.200000 0.868832 1.062273 4.87e-10 8.65e-12 - 4.300000 0.894204 1.041074 4.18e-10 8.17e-12 - 4.400000 0.919964 1.023913 7.04e-12 4.12e-12 - 4.500000 0.945834 1.011173 1.24e-09 1.30e-11 - 4.600000 0.971557 1.003150 2.19e-08 6.19e-10 - 4.700000 0.996898 1.000038 1.43e-07 2.28e-09 - 4.800000 1.021640 1.001916 1.99e-07 1.27e-09 - 4.900000 1.045589 1.008736 6.84e-10 3.85e-11 - 5.000000 1.068565 1.020331 7.31e-10 3.42e-11 - 5.100000 1.090408 1.036429 7.07e-10 2.95e-11 - 5.200000 1.110972 1.056667 7.11e-10 2.61e-11 - 5.300000 1.130127 1.080617 7.73e-10 2.25e-11 - 5.400000 1.147757 1.107807 7.36e-10 1.98e-11 - 5.500000 1.163759 1.137743 7.37e-10 1.71e-11 - 5.600000 1.178042 1.169929 7.67e-10 1.46e-11 - 5.700000 1.190528 1.203875 8.07e-10 1.21e-11 - 5.800000 1.201149 1.239112 7.52e-10 1.06e-11 - 5.900000 1.209851 1.275195 8.14e-10 8.47e-12 - 6.000000 1.216587 1.311711 7.93e-10 7.30e-12 - 6.100000 1.221325 1.348272 7.60e-10 6.05e-12 - 6.200000 1.224039 1.384525 2.32e-07 1.19e-09 - 6.300000 1.224716 1.420146 1.87e-07 9.24e-10 - 6.400000 1.223353 1.454836 2.45e-07 1.21e-09 - 6.500000 1.219956 1.488328 2.34e-07 1.12e-09 - 6.600000 1.214543 1.520375 2.43e-07 1.12e-09 - 6.700000 1.207142 1.550758 8.17e-10 9.47e-11 - 6.800000 1.197789 1.579276 7.68e-10 8.41e-11 - 6.900000 1.186534 1.605752 8.06e-10 7.42e-11 - 7.000000 1.173436 1.630027 7.70e-10 6.59e-11 + -2.900000 0.717301 1.326933 7.76e-09 4.26e-11 + -2.800000 0.727247 1.290353 1.65e-08 8.18e-11 + -2.700000 0.740246 1.254042 9.89e-10 8.16e-12 + -2.600000 0.756013 1.218400 1.21e-08 5.55e-11 + -2.500000 0.774227 1.183861 4.55e-09 1.75e-11 + -2.400000 0.794546 1.150885 1.12e-08 4.63e-11 + -2.300000 0.816616 1.119953 1.21e-08 4.62e-11 + -2.200000 0.840089 1.091560 2.93e-09 1.05e-12 + -2.100000 0.864625 1.066204 1.94e-09 5.82e-12 + -2.000000 0.889903 1.044367 1.69e-09 7.44e-12 + -1.900000 0.915617 1.026499 6.00e-10 1.37e-11 + -1.800000 0.941488 1.012992 5.51e-10 2.78e-11 + -1.700000 0.967253 1.004159 2.20e-08 1.38e-10 + -1.600000 0.992673 1.000213 1.46e-08 2.30e-10 + -1.500000 1.017530 1.001252 4.06e-07 1.24e-08 + -1.400000 1.041625 1.007249 7.20e-08 5.78e-10 + -1.300000 1.064777 1.018058 1.23e-08 2.54e-10 + -1.200000 1.086821 1.033422 5.24e-11 1.01e-10 + -1.100000 1.107609 1.052992 2.60e-09 1.01e-10 + -1.000000 1.127010 1.076350 2.38e-09 9.05e-11 + -0.900000 1.144904 1.103029 1.63e-09 6.96e-11 + -0.800000 1.161186 1.132539 1.32e-08 1.89e-11 + -0.700000 1.175764 1.164381 1.39e-08 3.98e-11 + -0.600000 1.188557 1.198064 3.04e-08 1.40e-10 + -0.500000 1.199496 1.233116 3.12e-08 1.58e-10 + -0.400000 1.208524 1.269087 4.15e-08 2.20e-10 + -0.300000 1.215594 1.305557 7.02e-09 2.30e-11 + -0.200000 1.220669 1.342137 3.29e-08 1.86e-10 + -0.100000 1.223725 1.378465 5.47e-09 3.55e-12 + 0.000000 1.224745 1.414214 2.27e-08 1.65e-10 + 0.100000 1.223725 1.449080 4.32e-08 1.88e-10 + 0.200000 1.220669 1.482791 1.08e-07 4.97e-10 + 0.300000 1.215594 1.515097 4.28e-08 1.67e-10 + 0.400000 1.208524 1.545774 1.45e-08 2.11e-11 + 0.500000 1.199496 1.574619 8.81e-09 1.03e-11 + 0.600000 1.188557 1.601450 4.60e-08 1.72e-10 + 0.700000 1.175764 1.626105 5.44e-09 3.09e-11 + 0.800000 1.161186 1.648441 1.10e-08 9.68e-12 + 0.900000 1.144904 1.668331 7.27e-09 2.74e-11 + 1.000000 1.127010 1.685666 1.14e-08 1.57e-13 + 1.100000 1.107609 1.700355 1.08e-08 2.42e-12 + 1.200000 1.086821 1.712320 1.19e-08 1.38e-11 + 1.300000 1.064777 1.721499 1.20e-08 1.00e-11 + 1.400000 1.041625 1.727845 9.29e-09 4.86e-12 + 1.500000 1.017531 1.731328 9.57e-09 6.11e-13 + 1.600000 0.992673 1.731928 8.44e-09 3.90e-12 + 1.700000 0.967253 1.729643 9.39e-09 1.01e-11 + 1.800000 0.941488 1.724485 6.49e-09 3.06e-11 + 1.900000 0.915617 1.716479 2.13e-10 2.60e-11 + 2.000000 0.889903 1.705666 2.45e-09 4.30e-11 + 2.100000 0.864625 1.692102 4.20e-10 1.91e-11 + 2.200000 0.840089 1.675857 1.21e-09 2.40e-11 + 2.300000 0.816616 1.657017 3.27e-10 1.01e-11 + 2.400000 0.794546 1.635684 2.95e-10 8.21e-12 + 2.500000 0.774227 1.611978 3.89e-11 8.38e-12 + 2.600000 0.756013 1.586033 3.71e-09 1.31e-11 + 2.700000 0.740246 1.558005 1.96e-09 9.41e-12 + 2.800000 0.727247 1.528067 3.31e-09 1.80e-11 + 2.900000 0.717301 1.496412 7.94e-09 4.39e-11 + 3.000000 0.710636 1.463257 7.48e-09 4.15e-11 + 3.100000 0.707412 1.428839 2.63e-08 1.36e-10 + 3.200000 0.707709 1.393422 3.55e-08 1.77e-10 + 3.300000 0.711520 1.357297 1.32e-08 6.14e-11 + 3.400000 0.718750 1.320780 7.73e-09 3.54e-11 + 3.500000 0.729227 1.284218 2.21e-08 1.04e-10 + 3.600000 0.742712 1.247990 1.99e-08 9.05e-11 + 3.700000 0.758914 1.212503 4.46e-09 1.20e-11 + 3.800000 0.777506 1.178194 1.06e-08 4.06e-11 + 3.900000 0.798144 1.145528 1.05e-08 3.66e-11 + 4.000000 0.820474 1.114988 1.11e-08 3.60e-11 + 4.100000 0.844149 1.087071 1.86e-09 1.30e-11 + 4.200000 0.868832 1.062273 1.67e-09 1.57e-11 + 4.300000 0.894204 1.041074 5.13e-09 5.08e-12 + 4.400000 0.919964 1.023913 1.46e-09 4.02e-11 + 4.500000 0.945834 1.011173 2.20e-09 3.11e-11 + 4.600000 0.971557 1.003150 1.88e-08 5.81e-10 + 4.700000 0.996898 1.000038 1.61e-08 1.00e-10 + 4.800000 1.021639 1.001916 1.76e-06 4.16e-08 + 4.900000 1.045589 1.008736 3.18e-08 3.05e-10 + 5.000000 1.068565 1.020331 1.20e-08 2.48e-10 + 5.100000 1.090408 1.036429 3.09e-09 1.23e-10 + 5.200000 1.110972 1.056667 4.07e-10 8.89e-11 + 5.300000 1.130127 1.080617 1.64e-09 7.00e-11 + 5.400000 1.147757 1.107807 4.57e-09 8.55e-11 + 5.500000 1.163759 1.137743 9.61e-09 4.34e-13 + 5.600000 1.178042 1.169929 6.59e-09 6.71e-11 + 5.700000 1.190528 1.203875 3.54e-08 1.66e-10 + 5.800000 1.201149 1.239112 2.60e-08 1.37e-10 + 5.900000 1.209851 1.275195 7.50e-09 4.71e-11 + 6.000000 1.216588 1.311711 2.38e-08 1.33e-10 + 6.100000 1.221325 1.348272 7.36e-09 1.84e-11 + 6.200000 1.224039 1.384525 1.56e-07 8.08e-10 + 6.300000 1.224716 1.420146 1.21e-07 5.27e-10 + 6.400000 1.223353 1.454836 8.10e-08 3.72e-10 + 6.500000 1.219956 1.488328 1.18e-07 5.42e-10 + 6.600000 1.214544 1.520375 4.93e-08 1.93e-10 + 6.700000 1.207142 1.550758 1.77e-08 3.25e-11 + 6.800000 1.197789 1.579276 2.56e-08 7.39e-11 + 6.900000 1.186534 1.605752 9.58e-09 1.74e-11 + 7.000000 1.173436 1.630027 2.82e-08 7.92e-11 ------------------------------------------------------ Final Solver Statistics: - Internal solver steps = 2271 (attempted = 3401) + Internal solver steps = 1418 (attempted = 2285) Total number of error test failures = 0 - Total RHS evals: Fe = 13787, Fi = 50499 - Total mass matrix setups = 12646 - Total mass matrix solves = 64284 - Total mass times evals = 2271 + Total RHS evals: Fe = 10790, Fi = 40122 + Total mass matrix setups = 10239 + Total mass matrix solves = 50910 + Total mass times evals = 1418 Total number of Jacobian evaluations = 0 Total linear solver setups = 0 - Total number of Nonlinear iterations = 36712 - Total number of Nonlinear convergence failures = 1130 - Errors: u = 7.56688e-08, v = 4.5239e-10, total = 5.35069e-08 + Total number of Nonlinear iterations = 29332 + Total number of Nonlinear convergence failures = 867 + Errors: u = 1.8333e-07, v = 4.34764e-09, total = 1.2967e-07 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out b/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out index 7f9417757d..35b0606cfa 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_0_5.out @@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: t u v uerr verr ------------------------------------------------------ -3.000000 0.710636 1.363407 0.00e+00 0.00e+00 - -2.900000 0.717299 1.326933 2.17e-06 2.61e-08 - -2.800000 0.727242 1.290353 5.02e-06 4.87e-08 - -2.700000 0.740244 1.254041 2.34e-06 1.64e-08 - -2.600000 0.756012 1.218400 1.45e-06 5.75e-08 - -2.500000 0.774224 1.183861 3.66e-06 4.59e-08 - -2.400000 0.794544 1.150885 1.97e-06 5.84e-08 - -2.300000 0.816613 1.119953 3.48e-06 1.01e-07 - -2.200000 0.840087 1.091560 2.43e-06 1.14e-09 - -2.100000 0.864618 1.066204 7.08e-06 2.30e-09 - -2.000000 0.889895 1.044367 7.59e-06 3.97e-08 - -1.900000 0.915607 1.026499 1.06e-05 1.44e-07 - -1.800000 0.941492 1.012991 4.02e-06 4.95e-07 - -1.700000 0.967257 1.004158 4.11e-06 4.82e-07 - -1.600000 0.992683 1.000213 9.89e-06 6.54e-07 - -1.500000 1.017558 1.001251 2.75e-05 1.04e-06 - -1.400000 1.041689 1.007247 6.33e-05 1.54e-06 - -1.300000 1.064815 1.018056 3.81e-05 1.54e-06 - -1.200000 1.086836 1.033420 1.52e-05 1.52e-06 - -1.100000 1.107689 1.052990 8.03e-05 2.09e-06 - -1.000000 1.127096 1.076348 8.61e-05 2.22e-06 - -0.900000 1.144923 1.103027 1.91e-05 1.84e-06 - -0.800000 1.161242 1.132537 5.54e-05 2.09e-06 - -0.700000 1.175875 1.164378 1.11e-04 2.44e-06 - -0.600000 1.188617 1.198062 5.95e-05 2.11e-06 - -0.500000 1.199513 1.233114 1.68e-05 1.88e-06 - -0.400000 1.208606 1.269084 8.23e-05 2.98e-06 - -0.300000 1.215709 1.305554 1.16e-04 3.26e-06 - -0.200000 1.220692 1.342134 2.30e-05 2.71e-06 - -0.100000 1.223796 1.378462 7.12e-05 3.08e-06 - 0.000000 1.224877 1.414210 1.32e-04 3.54e-06 - 0.100000 1.223793 1.449077 6.82e-05 3.15e-06 - 0.200000 1.220698 1.482788 2.92e-05 3.17e-06 - 0.300000 1.215709 1.515093 1.16e-04 4.03e-06 - 0.400000 1.208659 1.545770 1.35e-04 4.24e-06 - 0.500000 1.199523 1.574616 2.67e-05 3.55e-06 - 0.600000 1.188625 1.601447 6.77e-05 3.55e-06 - 0.700000 1.175888 1.626102 1.24e-04 3.24e-06 - 0.800000 1.161245 1.648438 5.90e-05 2.46e-06 - 0.900000 1.144927 1.668329 2.33e-05 1.85e-06 - 1.000000 1.127103 1.685665 9.32e-05 1.66e-06 - 1.100000 1.107692 1.700354 8.25e-05 1.18e-06 - 1.200000 1.086835 1.712319 1.40e-05 5.65e-07 - 1.300000 1.064818 1.721499 4.17e-05 2.90e-07 - 1.400000 1.041691 1.727845 6.55e-05 2.56e-09 - 1.500000 1.017558 1.731328 2.73e-05 4.16e-07 - 1.600000 0.992682 1.731928 8.66e-06 7.34e-07 - 1.700000 0.967276 1.729644 2.38e-05 1.04e-06 - 1.800000 0.941500 1.724486 1.27e-05 1.33e-06 - 1.900000 0.915618 1.716480 6.40e-07 1.48e-06 - 2.000000 0.889865 1.705668 3.74e-05 1.97e-06 - 2.100000 0.864463 1.692105 1.63e-04 2.89e-06 - 2.200000 0.839771 1.675861 3.18e-04 3.84e-06 - 2.300000 0.816292 1.657021 3.24e-04 3.84e-06 - 2.400000 0.794423 1.635687 1.23e-04 2.71e-06 - 2.500000 0.774078 1.611980 1.50e-04 2.70e-06 - 2.600000 0.755825 1.586036 1.88e-04 3.00e-06 - 2.700000 0.740043 1.558009 2.03e-04 3.71e-06 - 2.800000 0.727119 1.528070 1.28e-04 3.62e-06 - 2.900000 0.717266 1.496415 3.55e-05 3.11e-06 - 3.000000 0.710497 1.463260 1.40e-04 3.72e-06 - 3.100000 0.707393 1.428842 1.94e-05 3.00e-06 - 3.200000 0.707605 1.393426 1.04e-04 3.48e-06 - 3.300000 0.711478 1.357300 4.12e-05 3.10e-06 - 3.400000 0.718691 1.320783 5.83e-05 3.23e-06 - 3.500000 0.729151 1.284222 7.60e-05 3.36e-06 - 3.600000 0.742697 1.247993 1.45e-05 2.83e-06 - 3.700000 0.758850 1.212506 6.40e-05 2.82e-06 - 3.800000 0.777488 1.178197 1.79e-05 2.37e-06 - 3.900000 0.798113 1.145530 3.15e-05 2.20e-06 - 4.000000 0.820445 1.114990 2.97e-05 1.96e-06 - 4.100000 0.844142 1.087072 7.54e-06 1.64e-06 - 4.200000 0.868812 1.062275 1.99e-05 1.45e-06 - 4.300000 0.894201 1.041075 2.88e-06 1.19e-06 - 4.400000 0.919960 1.023914 3.54e-06 9.65e-07 - 4.500000 0.945847 1.011173 1.29e-05 6.70e-07 - 4.600000 0.971568 1.003150 1.10e-05 4.18e-07 - 4.700000 0.996908 1.000039 9.91e-06 1.68e-07 - 4.800000 1.021690 1.001916 4.99e-05 3.06e-07 - 4.900000 1.045717 1.008735 1.28e-04 9.66e-07 - 5.000000 1.068798 1.020329 2.33e-04 1.82e-06 - 5.100000 1.090687 1.036427 2.79e-04 2.26e-06 - 5.200000 1.111265 1.056665 2.93e-04 2.47e-06 - 5.300000 1.130409 1.080614 2.82e-04 2.48e-06 - 5.400000 1.148027 1.107804 2.70e-04 2.45e-06 - 5.500000 1.164021 1.137741 2.62e-04 2.42e-06 - 5.600000 1.178250 1.169926 2.08e-04 2.55e-06 - 5.700000 1.190798 1.203872 2.71e-04 2.75e-06 - 5.800000 1.201390 1.239109 2.40e-04 2.93e-06 - 5.900000 1.210030 1.275192 1.79e-04 2.93e-06 - 6.000000 1.216691 1.311708 1.03e-04 2.78e-06 - 6.100000 1.221360 1.348269 3.51e-05 2.63e-06 - 6.200000 1.224072 1.384523 3.32e-05 2.86e-06 - 6.300000 1.224817 1.420142 1.01e-04 3.52e-06 - 6.400000 1.223526 1.454832 1.73e-04 4.16e-06 - 6.500000 1.220166 1.488323 2.09e-04 4.52e-06 - 6.600000 1.214751 1.520371 2.07e-04 4.43e-06 - 6.700000 1.207326 1.550753 1.84e-04 4.55e-06 - 6.800000 1.197850 1.579273 6.10e-05 3.22e-06 - 6.900000 1.186555 1.605750 2.16e-05 2.46e-06 - 7.000000 1.173507 1.630024 7.15e-05 2.08e-06 + -2.900000 0.717299 1.326933 2.10e-06 2.97e-08 + -2.800000 0.727246 1.290353 1.45e-06 3.40e-08 + -2.700000 0.740245 1.254042 9.57e-07 4.41e-08 + -2.600000 0.756012 1.218400 1.22e-06 4.78e-08 + -2.500000 0.774227 1.183861 8.12e-07 5.76e-08 + -2.400000 0.794545 1.150885 9.58e-07 5.69e-08 + -2.300000 0.816616 1.119953 6.53e-07 6.31e-08 + -2.200000 0.840088 1.091560 7.00e-07 5.82e-08 + -2.100000 0.864625 1.066204 5.09e-07 6.06e-08 + -2.000000 0.889900 1.044367 2.74e-06 5.72e-08 + -1.900000 0.915612 1.026499 4.90e-06 8.64e-09 + -1.800000 0.941483 1.012992 4.88e-06 9.51e-09 + -1.700000 0.967252 1.004159 4.56e-07 1.66e-08 + -1.600000 0.992674 1.000213 3.78e-07 1.80e-08 + -1.500000 1.017534 1.001252 3.41e-06 1.36e-10 + -1.400000 1.041636 1.007249 1.02e-05 3.11e-08 + -1.300000 1.064794 1.018058 1.74e-05 8.55e-08 + -1.200000 1.086855 1.033422 3.42e-05 1.62e-07 + -1.100000 1.107635 1.052992 2.57e-05 1.13e-07 + -1.000000 1.127022 1.076350 1.17e-05 3.82e-08 + -0.900000 1.144907 1.103029 3.53e-06 6.18e-09 + -0.800000 1.161202 1.132539 1.61e-05 5.48e-08 + -0.700000 1.175792 1.164381 2.75e-05 1.13e-07 + -0.600000 1.188574 1.198064 1.70e-05 4.79e-08 + -0.500000 1.199500 1.233116 3.26e-06 1.57e-08 + -0.400000 1.208541 1.269087 1.66e-05 1.30e-07 + -0.300000 1.215617 1.305557 2.29e-05 2.46e-07 + -0.200000 1.220679 1.342137 1.01e-05 3.84e-08 + -0.100000 1.223732 1.378465 7.28e-06 1.23e-07 + 0.000000 1.224767 1.414213 2.24e-05 5.92e-07 + 0.100000 1.223738 1.449080 1.36e-05 5.64e-07 + 0.200000 1.220675 1.482790 6.01e-06 7.21e-07 + 0.300000 1.215618 1.515097 2.38e-05 7.14e-07 + 0.400000 1.208537 1.545774 1.27e-05 6.01e-07 + 0.500000 1.199502 1.574619 5.68e-06 5.19e-07 + 0.600000 1.188578 1.601450 2.08e-05 5.67e-07 + 0.700000 1.175776 1.626105 1.21e-05 4.90e-07 + 0.800000 1.161190 1.648440 4.26e-06 4.23e-07 + 0.900000 1.144921 1.668330 1.67e-05 4.78e-07 + 1.000000 1.127020 1.685666 1.01e-05 4.28e-07 + 1.100000 1.107612 1.700355 2.69e-06 3.74e-07 + 1.200000 1.086831 1.712319 1.06e-05 4.21e-07 + 1.300000 1.064783 1.721498 6.36e-06 3.94e-07 + 1.400000 1.041627 1.727845 1.09e-06 3.57e-07 + 1.500000 1.017534 1.731327 2.97e-06 3.83e-07 + 1.600000 0.992674 1.731927 7.68e-07 3.72e-07 + 1.700000 0.967252 1.729643 3.93e-07 3.58e-07 + 1.800000 0.941482 1.724484 5.43e-06 3.53e-07 + 1.900000 0.915611 1.716479 6.11e-06 3.53e-07 + 2.000000 0.889903 1.705666 3.55e-07 5.61e-07 + 2.100000 0.864614 1.692102 1.10e-05 3.18e-07 + 2.200000 0.840064 1.675857 2.53e-05 1.37e-07 + 2.300000 0.816591 1.657017 2.56e-05 1.25e-07 + 2.400000 0.794516 1.635684 3.01e-05 6.15e-08 + 2.500000 0.774209 1.611978 1.80e-05 1.44e-07 + 2.600000 0.756010 1.586033 3.38e-06 2.12e-07 + 2.700000 0.740223 1.558005 2.24e-05 4.78e-08 + 2.800000 0.727243 1.528067 4.02e-06 1.09e-07 + 2.900000 0.717284 1.496412 1.66e-05 4.95e-09 + 3.000000 0.710625 1.463257 1.07e-05 1.90e-08 + 3.100000 0.707408 1.428839 4.00e-06 6.81e-08 + 3.200000 0.707707 1.393422 2.67e-06 9.65e-08 + 3.300000 0.711514 1.357297 5.82e-06 1.03e-07 + 3.400000 0.718740 1.320780 9.40e-06 8.77e-08 + 3.500000 0.729216 1.284218 1.09e-05 6.80e-08 + 3.600000 0.742702 1.247990 9.76e-06 6.26e-08 + 3.700000 0.758907 1.212503 6.75e-06 6.76e-08 + 3.800000 0.777503 1.178194 3.42e-06 7.51e-08 + 3.900000 0.798143 1.145528 1.33e-06 7.70e-08 + 4.000000 0.820473 1.114988 1.24e-06 6.93e-08 + 4.100000 0.844147 1.087071 1.84e-06 5.85e-08 + 4.200000 0.868831 1.062273 1.72e-06 5.20e-08 + 4.300000 0.894203 1.041073 8.22e-07 5.00e-08 + 4.400000 0.919958 1.023913 6.02e-06 8.59e-08 + 4.500000 0.945832 1.011172 2.30e-06 1.74e-07 + 4.600000 0.971559 1.003149 1.24e-06 1.84e-07 + 4.700000 0.996925 1.000038 2.70e-05 2.99e-07 + 4.800000 1.021651 1.001916 1.01e-05 2.00e-07 + 4.900000 1.045596 1.008735 7.01e-06 1.51e-07 + 5.000000 1.068580 1.020331 1.47e-05 2.56e-07 + 5.100000 1.090437 1.036429 2.93e-05 4.17e-07 + 5.200000 1.111002 1.056667 2.97e-05 2.92e-07 + 5.300000 1.130151 1.080616 2.40e-05 3.11e-07 + 5.400000 1.147774 1.107806 1.70e-05 2.37e-07 + 5.500000 1.163762 1.137743 3.25e-06 1.19e-07 + 5.600000 1.178052 1.169929 9.91e-06 1.31e-07 + 5.700000 1.190554 1.203875 2.64e-05 1.95e-07 + 5.800000 1.201170 1.239111 2.11e-05 2.57e-07 + 5.900000 1.209855 1.275195 4.00e-06 1.40e-07 + 6.000000 1.216603 1.311710 1.54e-05 2.59e-07 + 6.100000 1.221350 1.348272 2.49e-05 3.61e-07 + 6.200000 1.224048 1.384525 9.24e-06 1.33e-07 + 6.300000 1.224727 1.420145 1.09e-05 4.75e-07 + 6.400000 1.223386 1.454836 3.35e-05 9.28e-07 + 6.500000 1.219966 1.488327 9.50e-06 5.96e-07 + 6.600000 1.214551 1.520375 7.82e-06 5.77e-07 + 6.700000 1.207165 1.550757 2.28e-05 6.12e-07 + 6.800000 1.197800 1.579276 1.14e-05 5.12e-07 + 6.900000 1.186540 1.605752 6.03e-06 4.51e-07 + 7.000000 1.173455 1.630026 1.98e-05 5.05e-07 ------------------------------------------------------ Final Solver Statistics: - Internal solver steps = 144 (attempted = 146) + Internal solver steps = 153 (attempted = 154) Total number of error test failures = 1 - Total RHS evals: Fe = 1265, Fi = 4680 - Total mass matrix setups = 1121 - Total mass matrix solves = 2428 - Total mass times evals = 3559 - Total number of Jacobian evaluations = 204 - Total linear solver setups = 214 - Total number of Nonlinear iterations = 3415 - Total number of Nonlinear convergence failures = 203 - Errors: u = 0.000119634, v = 2.45689e-06, total = 8.46118e-05 + Total RHS evals: Fe = 1334, Fi = 4801 + Total mass matrix setups = 1180 + Total mass matrix solves = 2566 + Total mass times evals = 3620 + Total number of Jacobian evaluations = 174 + Total linear solver setups = 182 + Total number of Nonlinear iterations = 3467 + Total number of Nonlinear convergence failures = 173 + Errors: u = 1.40896e-05, v = 3.07883e-07, total = 9.96525e-06 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out index 848d98ebc4..41a1941d23 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-3_0_-10_0.out @@ -11,13 +11,13 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: Fixed-step runs: ----------------------------------------------------- - h = 5.000e-01, error = 3.856e-04 - h = 2.500e-01, error = 5.666e-05, order = 2.77 - h = 1.250e-01, error = 8.050e-06, order = 2.82 - h = 6.250e-02, error = 1.109e-06, order = 2.86 - h = 3.125e-02, error = 1.482e-07, order = 2.90 - h = 1.562e-02, error = 1.929e-08, order = 2.94 - h = 7.812e-03, error = 2.467e-09, order = 2.97 - h = 3.906e-03, error = 3.124e-10, order = 2.98 + h = 5.000e-01, error = 2.029e-05 + h = 2.500e-01, error = 1.538e-06, order = 3.72 + h = 1.250e-01, error = 1.684e-07, order = 3.19 + h = 6.250e-02, error = 2.306e-08, order = 2.87 + h = 3.125e-02, error = 3.176e-09, order = 2.86 + h = 1.562e-02, error = 4.197e-10, order = 2.92 + h = 7.812e-03, error = 5.433e-11, order = 2.95 + h = 3.906e-03, error = 6.917e-12, order = 2.97 ----------------------------------------------------- - Order: max = 2.98, avg = 2.89, overall = 2.89 [SUCCESS] + Order: max = 3.72, avg = 3.07, overall = 3.01 [SUCCESS] diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out index 5c1b0cbb31..bdc69cf240 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_1_-5.out @@ -11,13 +11,13 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: Fixed-step runs: ----------------------------------------------------- - h = 5.000e-01, error = 1.725e-05 - h = 2.500e-01, error = 2.900e-06, order = 2.57 - h = 1.250e-01, error = 3.629e-07, order = 3.00 - h = 6.250e-02, error = 2.782e-08, order = 3.71 - h = 3.125e-02, error = 1.209e-09, order = 4.52 - h = 1.562e-02, error = 3.841e-11, order = 4.98 - h = 7.812e-03, error = 5.907e-11, order = -0.62 - h = 3.906e-03, error = 5.812e-10, order = -3.30 + h = 5.000e-01, error = 6.863e-05 + h = 2.500e-01, error = 1.152e-05, order = 2.57 + h = 1.250e-01, error = 1.556e-06, order = 2.89 + h = 6.250e-02, error = 1.414e-07, order = 3.46 + h = 3.125e-02, error = 8.082e-09, order = 4.13 + h = 1.562e-02, error = 3.441e-10, order = 4.55 + h = 7.812e-03, error = 7.851e-11, order = 2.13 + h = 3.906e-03, error = 4.074e-10, order = -2.38 ----------------------------------------------------- - Order: max = 4.98, avg = 2.12, overall = 2.69 [SUCCESS] + Order: max = 4.55, avg = 2.48, overall = 2.95 [SUCCESS] diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out b/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out index c652708cf1..5a052564bc 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_1_4.out @@ -12,117 +12,117 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: t u v uerr verr ------------------------------------------------------ -3.000000 0.710636 1.363407 0.00e+00 0.00e+00 - -2.900000 0.717303 1.326933 1.41e-06 9.00e-08 - -2.800000 0.727250 1.290353 3.05e-06 3.67e-07 - -2.700000 0.740247 1.254042 1.58e-06 3.07e-07 - -2.600000 0.756016 1.218400 3.34e-06 3.18e-07 - -2.500000 0.774229 1.183863 1.87e-06 1.42e-06 - -2.400000 0.794549 1.150887 2.92e-06 1.67e-06 - -2.300000 0.816618 1.119956 2.05e-06 3.01e-06 - -2.200000 0.840090 1.091564 8.04e-07 3.49e-06 - -2.100000 0.864626 1.066208 5.07e-07 4.62e-06 - -2.000000 0.889905 1.044373 2.49e-06 5.91e-06 - -1.900000 0.915619 1.026506 1.67e-06 6.92e-06 - -1.800000 0.941488 1.013000 1.28e-07 8.31e-06 - -1.700000 0.967252 1.004167 7.11e-07 7.62e-06 - -1.600000 0.992671 1.000220 1.97e-06 6.97e-06 - -1.500000 1.017528 1.001258 2.21e-06 6.34e-06 - -1.400000 1.041624 1.007259 1.57e-06 1.01e-05 - -1.300000 1.064775 1.018068 1.63e-06 1.00e-05 - -1.200000 1.086819 1.033433 1.64e-06 1.08e-05 - -1.100000 1.107607 1.053004 1.91e-06 1.16e-05 - -1.000000 1.127008 1.076363 2.23e-06 1.36e-05 - -0.900000 1.144902 1.103043 1.90e-06 1.35e-05 - -0.800000 1.161180 1.132551 6.58e-06 1.21e-05 - -0.700000 1.175761 1.164391 2.88e-06 1.06e-05 - -0.600000 1.188555 1.198075 1.66e-06 1.09e-05 - -0.500000 1.199494 1.233127 2.39e-06 1.14e-05 - -0.400000 1.208523 1.269100 1.54e-06 1.29e-05 - -0.300000 1.215593 1.305570 2.94e-07 1.28e-05 - -0.200000 1.220668 1.342149 8.50e-07 1.20e-05 - -0.100000 1.223723 1.378476 2.01e-06 1.09e-05 - 0.000000 1.224741 1.414224 3.73e-06 1.05e-05 - 0.100000 1.223723 1.449092 1.20e-06 1.21e-05 - 0.200000 1.220668 1.482803 1.21e-06 1.17e-05 - 0.300000 1.215591 1.515108 2.74e-06 1.08e-05 - 0.400000 1.208522 1.545785 1.90e-06 1.03e-05 - 0.500000 1.199492 1.574629 3.97e-06 1.02e-05 - 0.600000 1.188555 1.601458 1.74e-06 8.35e-06 - 0.700000 1.175761 1.626112 2.87e-06 7.30e-06 - 0.800000 1.161184 1.648447 2.00e-06 6.59e-06 - 0.900000 1.144903 1.668335 8.98e-07 4.56e-06 - 1.000000 1.127005 1.685670 5.32e-06 4.04e-06 - 1.100000 1.107608 1.700357 8.68e-07 2.08e-06 - 1.200000 1.086818 1.712321 2.45e-06 1.14e-06 - 1.300000 1.064776 1.721498 4.33e-07 5.31e-07 - 1.400000 1.041624 1.727843 1.76e-06 1.91e-06 - 1.500000 1.017530 1.731324 3.22e-07 3.31e-06 - 1.600000 0.992672 1.731923 7.91e-07 5.08e-06 - 1.700000 0.967252 1.729637 7.00e-07 6.26e-06 - 1.800000 0.941487 1.724472 2.93e-07 1.28e-05 - 1.900000 0.915617 1.716467 4.48e-08 1.16e-05 - 2.000000 0.889904 1.705655 1.90e-06 1.08e-05 - 2.100000 0.864611 1.692092 1.40e-05 9.99e-06 - 2.200000 0.840090 1.675847 1.09e-06 9.68e-06 - 2.300000 0.816618 1.657006 2.22e-06 1.06e-05 - 2.400000 0.794547 1.635674 1.39e-06 1.03e-05 - 2.500000 0.774228 1.611967 3.25e-07 1.09e-05 - 2.600000 0.756014 1.586021 1.04e-06 1.22e-05 - 2.700000 0.740245 1.557992 7.23e-07 1.32e-05 - 2.800000 0.727249 1.528053 1.66e-06 1.38e-05 - 2.900000 0.717302 1.496399 8.11e-07 1.32e-05 - 3.000000 0.710637 1.463243 6.86e-07 1.39e-05 - 3.100000 0.707415 1.428826 2.59e-06 1.25e-05 - 3.200000 0.707710 1.393410 6.94e-07 1.21e-05 - 3.300000 0.711521 1.357285 1.53e-06 1.14e-05 - 3.400000 0.718751 1.320770 1.60e-06 1.01e-05 - 3.500000 0.729226 1.284209 5.55e-07 9.40e-06 - 3.600000 0.742716 1.247982 3.92e-06 8.60e-06 - 3.700000 0.758914 1.212497 4.97e-07 5.99e-06 - 3.800000 0.777505 1.178189 1.74e-06 5.19e-06 - 3.900000 0.798150 1.145523 5.73e-06 4.63e-06 - 4.000000 0.820475 1.114985 1.79e-07 2.61e-06 - 4.100000 0.844150 1.087070 2.82e-07 1.21e-06 - 4.200000 0.868833 1.062273 5.41e-07 1.95e-07 - 4.300000 0.894211 1.041074 7.05e-06 7.71e-07 - 4.400000 0.919971 1.023914 6.81e-06 1.43e-06 - 4.500000 0.945834 1.011175 5.80e-08 2.53e-06 - 4.600000 0.971556 1.003152 1.08e-06 2.89e-06 - 4.700000 0.996895 1.000042 2.64e-06 3.95e-06 - 4.800000 1.021638 1.001920 2.63e-06 4.28e-06 - 4.900000 1.045585 1.008740 3.46e-06 4.07e-06 - 5.000000 1.068562 1.020337 3.07e-06 5.68e-06 - 5.100000 1.090405 1.036435 2.52e-06 6.24e-06 - 5.200000 1.110969 1.056675 2.42e-06 7.46e-06 - 5.300000 1.130132 1.080627 4.44e-06 1.01e-05 - 5.400000 1.147758 1.107819 5.47e-07 1.21e-05 - 5.500000 1.163763 1.137757 3.73e-06 1.39e-05 - 5.600000 1.178041 1.169944 1.24e-06 1.55e-05 - 5.700000 1.190526 1.203890 2.00e-06 1.57e-05 - 5.800000 1.201147 1.239128 1.86e-06 1.64e-05 - 5.900000 1.209851 1.275211 1.54e-07 1.56e-05 - 6.000000 1.216587 1.311725 4.24e-07 1.49e-05 - 6.100000 1.221324 1.348286 9.63e-07 1.37e-05 - 6.200000 1.224037 1.384538 2.29e-06 1.25e-05 - 6.300000 1.224713 1.420159 3.01e-06 1.36e-05 - 6.400000 1.223352 1.454851 1.10e-06 1.45e-05 - 6.500000 1.219953 1.488343 3.87e-06 1.52e-05 - 6.600000 1.214543 1.520390 4.21e-07 1.50e-05 - 6.700000 1.207142 1.550771 1.08e-07 1.28e-05 - 6.800000 1.197791 1.579287 1.50e-06 1.09e-05 - 6.900000 1.186533 1.605761 3.49e-07 9.24e-06 - 7.000000 1.173440 1.630034 3.90e-06 7.57e-06 + -2.900000 0.717301 1.326933 4.83e-07 1.36e-07 + -2.800000 0.727254 1.290353 6.49e-06 3.69e-07 + -2.700000 0.740246 1.254041 1.98e-07 6.56e-08 + -2.600000 0.756018 1.218400 4.68e-06 3.40e-07 + -2.500000 0.774227 1.183862 6.93e-07 5.96e-07 + -2.400000 0.794547 1.150886 9.55e-07 5.31e-07 + -2.300000 0.816618 1.119954 1.43e-06 5.82e-07 + -2.200000 0.840088 1.091561 1.27e-06 8.61e-07 + -2.100000 0.864626 1.066205 3.55e-07 8.43e-07 + -2.000000 0.889904 1.044368 1.15e-06 9.97e-07 + -1.900000 0.915617 1.026500 5.81e-07 1.08e-06 + -1.800000 0.941487 1.012993 5.39e-07 1.37e-06 + -1.700000 0.967254 1.004161 9.88e-07 1.57e-06 + -1.600000 0.992673 1.000214 3.58e-07 1.30e-06 + -1.500000 1.017530 1.001253 1.56e-07 1.60e-06 + -1.400000 1.041626 1.007250 3.52e-07 1.21e-06 + -1.300000 1.064777 1.018059 3.73e-08 1.02e-06 + -1.200000 1.086820 1.033423 5.67e-08 1.15e-06 + -1.100000 1.107609 1.052993 5.44e-08 9.71e-07 + -1.000000 1.127012 1.076352 2.42e-06 1.87e-06 + -0.900000 1.144903 1.103030 6.58e-07 1.27e-06 + -0.800000 1.161188 1.132540 2.25e-06 1.37e-06 + -0.700000 1.175763 1.164381 1.25e-06 1.51e-07 + -0.600000 1.188561 1.198062 3.96e-06 1.69e-06 + -0.500000 1.199501 1.233117 4.30e-06 1.38e-06 + -0.400000 1.208520 1.269086 4.05e-06 1.39e-06 + -0.300000 1.215596 1.305556 2.38e-06 1.28e-06 + -0.200000 1.220669 1.342139 1.37e-07 1.94e-06 + -0.100000 1.223721 1.378464 3.92e-06 1.69e-06 + 0.000000 1.224746 1.414214 7.74e-07 2.82e-07 + 0.100000 1.223723 1.449081 1.72e-06 1.03e-06 + 0.200000 1.220665 1.482790 4.06e-06 1.40e-06 + 0.300000 1.215593 1.515099 1.18e-06 1.37e-06 + 0.400000 1.208522 1.545774 1.96e-06 3.86e-08 + 0.500000 1.199490 1.574618 6.32e-06 9.30e-07 + 0.600000 1.188556 1.601451 1.11e-06 1.29e-06 + 0.700000 1.175760 1.626104 4.35e-06 1.30e-06 + 0.800000 1.161175 1.648439 1.15e-05 1.22e-06 + 0.900000 1.144905 1.668330 1.41e-06 6.05e-07 + 1.000000 1.127011 1.685664 1.12e-06 2.51e-06 + 1.100000 1.107608 1.700353 1.62e-06 2.41e-06 + 1.200000 1.086819 1.712317 1.16e-06 2.32e-06 + 1.300000 1.064778 1.721496 9.42e-07 2.67e-06 + 1.400000 1.041626 1.727842 2.38e-07 3.00e-06 + 1.500000 1.017531 1.731321 1.24e-07 6.13e-06 + 1.600000 0.992669 1.731920 3.85e-06 7.63e-06 + 1.700000 0.967253 1.729636 4.78e-08 7.10e-06 + 1.800000 0.941488 1.724477 1.80e-08 8.11e-06 + 1.900000 0.915616 1.716471 1.81e-06 7.56e-06 + 2.000000 0.889900 1.705659 2.80e-06 7.07e-06 + 2.100000 0.864625 1.692095 2.97e-07 6.59e-06 + 2.200000 0.840087 1.675851 1.49e-06 5.98e-06 + 2.300000 0.816616 1.657009 3.12e-07 8.14e-06 + 2.400000 0.794546 1.635676 2.16e-07 8.20e-06 + 2.500000 0.774224 1.611970 3.63e-06 7.99e-06 + 2.600000 0.756012 1.586026 7.00e-07 7.37e-06 + 2.700000 0.740245 1.557998 6.34e-07 6.82e-06 + 2.800000 0.727247 1.528060 4.00e-07 6.32e-06 + 2.900000 0.717300 1.496406 7.25e-07 5.85e-06 + 3.000000 0.710637 1.463251 6.50e-07 5.72e-06 + 3.100000 0.707411 1.428834 1.90e-06 4.96e-06 + 3.200000 0.707712 1.393417 2.68e-06 5.11e-06 + 3.300000 0.711522 1.357292 2.30e-06 4.77e-06 + 3.400000 0.718772 1.320772 2.28e-05 7.72e-06 + 3.500000 0.729243 1.284214 1.62e-05 4.42e-06 + 3.600000 0.742712 1.247987 3.36e-07 2.74e-06 + 3.700000 0.758914 1.212501 5.26e-07 2.14e-06 + 3.800000 0.777507 1.178192 6.69e-07 1.99e-06 + 3.900000 0.798144 1.145526 3.21e-07 1.68e-06 + 4.000000 0.820475 1.114986 1.03e-06 1.56e-06 + 4.100000 0.844150 1.087069 1.09e-06 1.34e-06 + 4.200000 0.868831 1.062272 1.05e-06 9.65e-07 + 4.300000 0.894204 1.041073 2.44e-07 7.89e-07 + 4.400000 0.919965 1.023913 9.59e-07 5.05e-07 + 4.500000 0.945834 1.011172 4.41e-07 3.59e-07 + 4.600000 0.971557 1.003150 4.47e-07 4.03e-08 + 4.700000 0.996899 1.000039 8.94e-07 3.08e-07 + 4.800000 1.021640 1.001916 3.15e-07 1.57e-07 + 4.900000 1.045589 1.008736 2.11e-07 4.62e-07 + 5.000000 1.068565 1.020331 3.45e-07 2.01e-07 + 5.100000 1.090408 1.036430 2.76e-08 4.24e-07 + 5.200000 1.110972 1.056668 6.31e-07 7.63e-07 + 5.300000 1.130129 1.080617 2.01e-06 7.23e-07 + 5.400000 1.147757 1.107807 2.75e-07 7.31e-07 + 5.500000 1.163759 1.137744 4.59e-07 7.85e-07 + 5.600000 1.178043 1.169928 1.04e-06 9.15e-07 + 5.700000 1.190534 1.203876 6.04e-06 1.04e-06 + 5.800000 1.201146 1.239113 3.04e-06 1.17e-06 + 5.900000 1.209851 1.275194 2.84e-07 1.03e-06 + 6.000000 1.216591 1.311713 3.09e-06 2.43e-06 + 6.100000 1.221321 1.348272 3.72e-06 1.91e-07 + 6.200000 1.224039 1.384525 4.73e-07 7.21e-08 + 6.300000 1.224715 1.420148 7.97e-07 1.98e-06 + 6.400000 1.223350 1.454836 3.35e-06 7.80e-07 + 6.500000 1.219956 1.488329 7.09e-07 1.42e-06 + 6.600000 1.214539 1.520374 4.31e-06 1.87e-06 + 6.700000 1.207124 1.550747 1.81e-05 1.05e-05 + 6.800000 1.197766 1.579268 2.35e-05 8.68e-06 + 6.900000 1.186523 1.605752 1.10e-05 1.71e-07 + 7.000000 1.173436 1.630028 1.77e-07 1.12e-06 ------------------------------------------------------ Final Solver Statistics: - Internal solver steps = 284 (attempted = 287) - Total number of error test failures = 3 - Total RHS evals: Fe = 0, Fi = 5758 - Total mass matrix setups = 1438 - Total mass matrix solves = 1438 - Total mass times evals = 4604 - Total number of Jacobian evaluations = 152 - Total linear solver setups = 166 - Total number of Nonlinear iterations = 4320 - Total number of Nonlinear convergence failures = 151 - Errors: u = 2.75875e-06, v = 9.68052e-06, total = 7.1177e-06 + Internal solver steps = 92 (attempted = 110) + Total number of error test failures = 0 + Total RHS evals: Fe = 0, Fi = 2657 + Total mass matrix setups = 535 + Total mass matrix solves = 517 + Total mass times evals = 2232 + Total number of Jacobian evaluations = 223 + Total linear solver setups = 264 + Total number of Nonlinear iterations = 2140 + Total number of Nonlinear convergence failures = 222 + Errors: u = 4.83796e-06, v = 3.57142e-06, total = 4.25211e-06 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_2_-5_0_-10.out b/examples/arkode/CXX_serial/ark_kpr_Mt_2_-5_0_-10.out index eaa71c0abd..e47c46b727 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_2_-5_0_-10.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_2_-5_0_-10.out @@ -10,13 +10,13 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: Fixed-step runs: ----------------------------------------------------- - h = 1.000e-01, error = 2.677e-07 - h = 5.000e-02, error = 3.387e-09, order = 6.30 - h = 2.500e-02, error = 4.832e-11, order = 6.13 - h = 1.250e-02, error = 7.523e-13, order = 6.01 - h = 6.250e-03, error = 1.326e-14, order = 5.83 - h = 3.125e-03, error = 6.999e-15, order = 0.92 - h = 1.563e-03, error = 1.539e-14, order = -1.14 - h = 7.813e-04, error = 2.720e-14, order = -0.82 + h = 1.000e-01, error = 3.326e-07 + h = 5.000e-02, error = 5.227e-09, order = 5.99 + h = 2.500e-02, error = 1.028e-10, order = 5.67 + h = 1.250e-02, error = 2.405e-12, order = 5.42 + h = 6.250e-03, error = 6.356e-14, order = 5.24 + h = 3.125e-03, error = 6.933e-15, order = 3.20 + h = 1.563e-03, error = 1.453e-14, order = -1.07 + h = 7.813e-04, error = 2.683e-14, order = -0.88 ----------------------------------------------------- - Order: max = 6.30, avg = 3.32, overall = 3.52 [SUCCESS] + Order: max = 5.99, avg = 3.37, overall = 3.62 [SUCCESS] diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out b/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out index 54a56620ba..31b001fe70 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_2_4_0_-10_0.out @@ -11,113 +11,113 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: t u v uerr verr ------------------------------------------------------ -3.000000 0.710636 1.363407 0.00e+00 0.00e+00 - -2.900000 0.717302 1.326933 7.09e-07 3.80e-08 - -2.800000 0.727248 1.290353 8.19e-07 4.40e-08 - -2.700000 0.740247 1.254041 8.79e-07 4.56e-08 - -2.600000 0.756014 1.218400 7.89e-07 4.19e-08 - -2.500000 0.774228 1.183861 7.00e-07 3.54e-08 - -2.400000 0.794546 1.150885 6.04e-07 3.08e-08 - -2.300000 0.816617 1.119953 4.92e-07 2.38e-08 - -2.200000 0.840090 1.091560 1.42e-06 6.87e-08 - -2.100000 0.864627 1.066204 1.20e-06 4.56e-08 - -2.000000 0.889903 1.044367 7.76e-07 2.25e-08 - -1.900000 0.915617 1.026499 4.55e-08 1.78e-07 - -1.800000 0.941485 1.012992 2.28e-06 3.37e-07 - -1.700000 0.967249 1.004159 3.53e-06 3.11e-07 - -1.600000 0.992669 1.000214 4.20e-06 3.33e-07 - -1.500000 1.017526 1.001252 4.27e-06 4.27e-07 - -1.400000 1.041621 1.007249 4.51e-06 3.79e-07 - -1.300000 1.064773 1.018058 4.08e-06 3.79e-07 - -1.200000 1.086816 1.033422 4.62e-06 3.91e-07 - -1.100000 1.107605 1.052993 4.16e-06 3.67e-07 - -1.000000 1.127005 1.076350 4.74e-06 3.85e-07 - -0.900000 1.144900 1.103029 4.41e-06 3.61e-07 - -0.800000 1.161181 1.132539 4.83e-06 3.77e-07 - -0.700000 1.175759 1.164381 4.69e-06 3.53e-07 - -0.600000 1.188552 1.198064 4.70e-06 3.54e-07 - -0.500000 1.199491 1.233116 4.96e-06 3.48e-07 - -0.400000 1.208519 1.269087 4.61e-06 3.28e-07 - -0.300000 1.215589 1.305558 5.17e-06 3.43e-07 - -0.200000 1.220665 1.342137 4.62e-06 3.06e-07 - -0.100000 1.223719 1.378466 5.22e-06 3.32e-07 - 0.000000 1.224740 1.414214 4.66e-06 2.88e-07 - 0.100000 1.223720 1.449081 5.07e-06 3.12e-07 - 0.200000 1.220665 1.482791 4.68e-06 2.74e-07 - 0.300000 1.215589 1.515098 4.69e-06 2.78e-07 - 0.400000 1.208519 1.545775 4.63e-06 2.59e-07 - 0.500000 1.199492 1.574619 4.23e-06 2.39e-07 - 0.600000 1.188553 1.601450 4.45e-06 2.40e-07 - 0.700000 1.175760 1.626105 3.86e-06 2.06e-07 - 0.800000 1.161182 1.648441 4.12e-06 2.16e-07 - 0.900000 1.144900 1.668331 3.49e-06 1.76e-07 - 1.000000 1.127006 1.685667 3.60e-06 1.83e-07 - 1.100000 1.107606 1.700355 3.06e-06 1.45e-07 - 1.200000 1.086818 1.712320 2.90e-06 1.40e-07 - 1.300000 1.064774 1.721499 2.52e-06 1.10e-07 - 1.400000 1.041623 1.727845 2.09e-06 9.17e-08 - 1.500000 1.017529 1.731328 1.80e-06 6.82e-08 - 1.600000 0.992672 1.731928 1.28e-06 4.21e-08 - 1.700000 0.967252 1.729643 8.76e-07 1.68e-08 - 1.800000 0.941487 1.724485 2.49e-07 2.94e-08 - 1.900000 0.915619 1.716479 1.32e-06 1.26e-07 - 2.000000 0.889906 1.705666 3.18e-06 2.37e-07 - 2.100000 0.864630 1.692102 4.43e-06 3.13e-07 - 2.200000 0.840094 1.675857 4.92e-06 3.24e-07 - 2.300000 0.816621 1.657017 4.45e-06 2.97e-07 - 2.400000 0.794551 1.635684 4.77e-06 3.10e-07 - 2.500000 0.774232 1.611977 4.18e-06 2.76e-07 - 2.600000 0.756017 1.586033 4.01e-06 2.57e-07 - 2.700000 0.740250 1.558005 4.25e-06 2.68e-07 - 2.800000 0.727251 1.528067 4.06e-06 2.57e-07 - 2.900000 0.717305 1.496412 3.81e-06 2.39e-07 - 3.000000 0.710640 1.463256 3.62e-06 2.25e-07 - 3.100000 0.707416 1.428839 3.49e-06 2.14e-07 - 3.200000 0.707713 1.393422 3.41e-06 2.05e-07 - 3.300000 0.711523 1.357296 3.38e-06 2.00e-07 - 3.400000 0.718753 1.320779 3.35e-06 1.95e-07 - 3.500000 0.729230 1.284218 3.28e-06 1.89e-07 - 3.600000 0.742715 1.247990 3.08e-06 1.76e-07 - 3.700000 0.758916 1.212503 2.77e-06 1.59e-07 - 3.800000 0.777509 1.178194 2.40e-06 1.38e-07 - 3.900000 0.798146 1.145528 2.00e-06 1.15e-07 - 4.000000 0.820476 1.114988 1.58e-06 8.91e-08 - 4.100000 0.844150 1.087071 1.18e-06 6.29e-08 - 4.200000 0.868833 1.062273 8.01e-07 3.72e-08 - 4.300000 0.894204 1.041074 4.96e-07 1.30e-08 - 4.400000 0.919964 1.023913 8.07e-08 1.12e-07 - 4.500000 0.945832 1.011173 1.59e-06 2.22e-07 - 4.600000 0.971554 1.003150 3.36e-06 2.66e-07 - 4.700000 0.996894 1.000039 3.70e-06 3.06e-07 - 4.800000 1.021636 1.001916 4.34e-06 4.07e-07 - 4.900000 1.045585 1.008736 4.41e-06 3.42e-07 - 5.000000 1.068561 1.020332 4.18e-06 3.77e-07 - 5.100000 1.090403 1.036429 4.51e-06 3.59e-07 - 5.200000 1.110967 1.056667 4.32e-06 3.65e-07 - 5.300000 1.130122 1.080617 4.60e-06 3.62e-07 - 5.400000 1.147753 1.107807 4.59e-06 3.59e-07 - 5.500000 1.163754 1.137744 4.55e-06 3.50e-07 - 5.600000 1.178037 1.169929 4.87e-06 3.54e-07 - 5.700000 1.190523 1.203875 4.52e-06 3.32e-07 - 5.800000 1.201144 1.239112 5.11e-06 3.51e-07 - 5.900000 1.209846 1.275196 4.59e-06 3.15e-07 - 6.000000 1.216582 1.311711 5.23e-06 3.44e-07 - 6.100000 1.221320 1.348272 4.71e-06 3.01e-07 - 6.200000 1.224034 1.384526 5.15e-06 3.27e-07 - 6.300000 1.224711 1.420146 4.81e-06 2.90e-07 - 6.400000 1.223348 1.454837 4.82e-06 2.95e-07 - 6.500000 1.219952 1.488328 4.84e-06 2.78e-07 - 6.600000 1.214539 1.520376 4.44e-06 2.59e-07 - 6.700000 1.207137 1.550758 4.74e-06 2.64e-07 - 6.800000 1.197785 1.579276 4.14e-06 2.29e-07 - 6.900000 1.186529 1.605752 4.49e-06 2.43e-07 - 7.000000 1.173432 1.630027 3.87e-06 2.02e-07 + -2.900000 0.717302 1.326933 1.31e-06 7.11e-08 + -2.800000 0.727249 1.290353 1.25e-06 6.56e-08 + -2.700000 0.740247 1.254041 1.17e-06 6.27e-08 + -2.600000 0.756014 1.218400 1.11e-06 5.96e-08 + -2.500000 0.774228 1.183861 9.85e-07 5.04e-08 + -2.400000 0.794547 1.150885 7.87e-07 4.01e-08 + -2.300000 0.816617 1.119953 6.62e-07 3.29e-08 + -2.200000 0.840089 1.091560 5.33e-07 2.49e-08 + -2.100000 0.864626 1.066204 3.70e-07 1.64e-08 + -2.000000 0.889903 1.044367 6.34e-07 1.88e-08 + -1.900000 0.915618 1.026499 2.32e-07 1.02e-07 + -1.800000 0.941487 1.012992 1.04e-06 2.31e-07 + -1.700000 0.967249 1.004159 3.55e-06 4.01e-07 + -1.600000 0.992668 1.000214 5.27e-06 5.57e-07 + -1.500000 1.017525 1.001252 6.02e-06 6.13e-07 + -1.400000 1.041620 1.007249 5.93e-06 5.44e-07 + -1.300000 1.064772 1.018058 4.73e-06 4.32e-07 + -1.200000 1.086816 1.033422 4.65e-06 4.67e-07 + -1.100000 1.107605 1.052993 4.64e-06 4.23e-07 + -1.000000 1.127006 1.076350 4.27e-06 4.07e-07 + -0.900000 1.144899 1.103029 4.68e-06 4.15e-07 + -0.800000 1.161182 1.132539 4.22e-06 3.75e-07 + -0.700000 1.175759 1.164381 4.74e-06 3.97e-07 + -0.600000 1.188553 1.198064 4.25e-06 3.51e-07 + -0.500000 1.199491 1.233116 4.80e-06 3.78e-07 + -0.400000 1.208520 1.269087 4.29e-06 3.31e-07 + -0.300000 1.215589 1.305558 4.85e-06 3.58e-07 + -0.200000 1.220665 1.342137 4.32e-06 3.12e-07 + -0.100000 1.223720 1.378466 4.86e-06 3.38e-07 + 0.000000 1.224741 1.414214 4.30e-06 2.92e-07 + 0.100000 1.223720 1.449081 4.79e-06 3.15e-07 + 0.200000 1.220665 1.482791 4.20e-06 2.70e-07 + 0.300000 1.215589 1.515098 4.63e-06 2.91e-07 + 0.400000 1.208520 1.545775 4.03e-06 2.47e-07 + 0.500000 1.199492 1.574619 4.40e-06 2.65e-07 + 0.600000 1.188553 1.601450 3.79e-06 2.22e-07 + 0.700000 1.175760 1.626105 4.07e-06 2.36e-07 + 0.800000 1.161183 1.648441 3.46e-06 1.94e-07 + 0.900000 1.144900 1.668331 3.66e-06 2.04e-07 + 1.000000 1.127007 1.685666 3.06e-06 1.64e-07 + 1.100000 1.107606 1.700355 3.15e-06 1.68e-07 + 1.200000 1.086818 1.712320 2.57e-06 1.31e-07 + 1.300000 1.064774 1.721499 2.54e-06 1.29e-07 + 1.400000 1.041623 1.727845 1.98e-06 9.34e-08 + 1.500000 1.017529 1.731328 1.80e-06 8.37e-08 + 1.600000 0.992672 1.731928 1.27e-06 5.08e-08 + 1.700000 0.967252 1.729643 9.30e-07 3.21e-08 + 1.800000 0.941487 1.724485 3.94e-07 1.17e-08 + 1.900000 0.915618 1.716479 6.27e-07 7.75e-08 + 2.000000 0.889905 1.705666 2.79e-06 2.04e-07 + 2.100000 0.864630 1.692102 4.65e-06 3.10e-07 + 2.200000 0.840094 1.675857 4.96e-06 3.32e-07 + 2.300000 0.816621 1.657017 4.98e-06 3.17e-07 + 2.400000 0.794550 1.635684 4.19e-06 2.72e-07 + 2.500000 0.774232 1.611977 4.24e-06 2.69e-07 + 2.600000 0.756017 1.586033 3.68e-06 2.38e-07 + 2.700000 0.740249 1.558005 3.29e-06 2.10e-07 + 2.800000 0.727251 1.528067 3.32e-06 2.07e-07 + 2.900000 0.717304 1.496412 3.27e-06 2.03e-07 + 3.000000 0.710639 1.463256 3.11e-06 1.93e-07 + 3.100000 0.707415 1.428839 2.96e-06 1.83e-07 + 3.200000 0.707712 1.393422 2.83e-06 1.74e-07 + 3.300000 0.711522 1.357297 2.72e-06 1.66e-07 + 3.400000 0.718752 1.320779 2.60e-06 1.57e-07 + 3.500000 0.729229 1.284218 2.44e-06 1.46e-07 + 3.600000 0.742714 1.247990 2.24e-06 1.33e-07 + 3.700000 0.758916 1.212503 2.01e-06 1.19e-07 + 3.800000 0.777508 1.178194 1.76e-06 1.03e-07 + 3.900000 0.798146 1.145528 1.50e-06 8.72e-08 + 4.000000 0.820476 1.114988 1.24e-06 7.13e-08 + 4.100000 0.844150 1.087071 9.70e-07 5.57e-08 + 4.200000 0.868833 1.062273 6.99e-07 3.98e-08 + 4.300000 0.894204 1.041073 4.24e-07 2.25e-08 + 4.400000 0.919964 1.023913 3.19e-07 3.19e-08 + 4.500000 0.945833 1.011173 7.39e-07 1.75e-07 + 4.600000 0.971555 1.003150 2.20e-06 2.51e-07 + 4.700000 0.996895 1.000039 3.29e-06 2.47e-07 + 4.800000 1.021637 1.001916 3.79e-06 3.37e-07 + 4.900000 1.045584 1.008736 4.59e-06 4.36e-07 + 5.000000 1.068560 1.020332 4.81e-06 3.83e-07 + 5.100000 1.090403 1.036429 4.24e-06 3.75e-07 + 5.200000 1.110967 1.056667 4.73e-06 3.96e-07 + 5.300000 1.130123 1.080617 4.12e-06 3.49e-07 + 5.400000 1.147752 1.107807 4.65e-06 3.76e-07 + 5.500000 1.163755 1.137744 4.17e-06 3.41e-07 + 5.600000 1.178037 1.169929 4.66e-06 3.57e-07 + 5.700000 1.190524 1.203875 4.24e-06 3.32e-07 + 5.800000 1.201145 1.239112 4.70e-06 3.40e-07 + 5.900000 1.209847 1.275196 4.29e-06 3.19e-07 + 6.000000 1.216583 1.311711 4.74e-06 3.25e-07 + 6.100000 1.221320 1.348272 4.32e-06 3.04e-07 + 6.200000 1.224034 1.384526 4.74e-06 3.08e-07 + 6.300000 1.224712 1.420146 4.30e-06 2.87e-07 + 6.400000 1.223348 1.454837 4.66e-06 2.90e-07 + 6.500000 1.219952 1.488328 4.20e-06 2.67e-07 + 6.600000 1.214539 1.520376 4.50e-06 2.68e-07 + 6.700000 1.207138 1.550758 4.03e-06 2.45e-07 + 6.800000 1.197785 1.579276 4.26e-06 2.44e-07 + 6.900000 1.186530 1.605752 3.78e-06 2.20e-07 + 7.000000 1.173432 1.630027 3.93e-06 2.17e-07 ------------------------------------------------------ Final Solver Statistics: - Internal solver steps = 165 (attempted = 168) - Total number of error test failures = 3 - Total RHS evals: Fe = 840, Fi = 0 - Total mass matrix setups = 672 - Total mass matrix solves = 840 - Total mass times evals = 165 - Errors: u = 3.7533e-06, v = 2.61601e-07, total = 2.66042e-06 + Internal solver steps = 160 (attempted = 161) + Total number of error test failures = 1 + Total RHS evals: Fe = 647, Fi = 0 + Total mass matrix setups = 486 + Total mass matrix solves = 647 + Total mass times evals = 160 + Errors: u = 3.59079e-06, v = 2.72131e-07, total = 2.54635e-06 diff --git a/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out b/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out index 09b1fd9f98..875d56e4ad 100644 --- a/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out +++ b/examples/arkode/CXX_serial/ark_kpr_Mt_2_8_0_-10.out @@ -11,113 +11,113 @@ Nonlinear Kvaerno-Prothero-Robinson test problem with mass matrix: t u v uerr verr ------------------------------------------------------ -3.000000 0.710636 1.363407 0.00e+00 0.00e+00 - -2.900000 0.717301 1.326933 4.07e-08 3.12e-09 - -2.800000 0.727247 1.290353 3.42e-08 2.79e-09 - -2.700000 0.740246 1.254042 2.54e-08 2.29e-09 - -2.600000 0.756013 1.218400 1.63e-08 1.73e-09 - -2.500000 0.774227 1.183861 8.20e-09 1.12e-09 - -2.400000 0.794546 1.150885 1.46e-09 4.54e-10 - -2.300000 0.816616 1.119953 3.85e-09 2.91e-10 - -2.200000 0.840089 1.091560 7.86e-09 1.15e-09 - -2.100000 0.864625 1.066204 1.08e-08 2.15e-09 - -2.000000 0.889903 1.044367 1.29e-08 3.28e-09 - -1.900000 0.915617 1.026499 1.44e-08 4.47e-09 - -1.800000 0.941488 1.012992 1.53e-08 5.61e-09 - -1.700000 0.967253 1.004159 1.58e-08 6.53e-09 - -1.600000 0.992673 1.000213 1.58e-08 7.07e-09 - -1.500000 1.017531 1.001252 1.55e-08 7.11e-09 - -1.400000 1.041625 1.007249 1.48e-08 6.62e-09 - -1.300000 1.064777 1.018058 1.40e-08 5.67e-09 - -1.200000 1.086821 1.033422 1.30e-08 4.42e-09 - -1.100000 1.107609 1.052992 1.21e-08 3.06e-09 - -1.000000 1.127010 1.076350 1.13e-08 1.77e-09 - -0.900000 1.144904 1.103029 1.06e-08 6.58e-10 - -0.800000 1.161186 1.132539 1.00e-08 2.11e-10 - -0.700000 1.175764 1.164381 9.60e-09 8.29e-10 - -0.600000 1.188557 1.198064 9.28e-09 1.22e-09 - -0.500000 1.199496 1.233116 9.06e-09 1.44e-09 - -0.400000 1.208524 1.269087 8.91e-09 1.52e-09 - -0.300000 1.215594 1.305557 8.81e-09 1.51e-09 - -0.200000 1.220669 1.342137 8.75e-09 1.43e-09 - -0.100000 1.223725 1.378465 8.72e-09 1.33e-09 - 0.000000 1.224745 1.414214 8.70e-09 1.21e-09 - 0.100000 1.223725 1.449080 8.70e-09 1.09e-09 - 0.200000 1.220669 1.482791 8.71e-09 9.72e-10 - 0.300000 1.215594 1.515097 8.74e-09 8.62e-10 - 0.400000 1.208524 1.545774 8.78e-09 7.62e-10 - 0.500000 1.199496 1.574619 8.83e-09 6.73e-10 - 0.600000 1.188557 1.601450 8.91e-09 5.94e-10 - 0.700000 1.175764 1.626105 9.01e-09 5.23e-10 - 0.800000 1.161186 1.648441 9.14e-09 4.60e-10 - 0.900000 1.144904 1.668331 9.30e-09 4.04e-10 - 1.000000 1.127010 1.685666 9.50e-09 3.53e-10 - 1.100000 1.107609 1.700355 9.75e-09 3.06e-10 - 1.200000 1.086821 1.712320 1.00e-08 2.63e-10 - 1.300000 1.064777 1.721499 1.04e-08 2.23e-10 - 1.400000 1.041625 1.727845 1.07e-08 1.85e-10 - 1.500000 1.017531 1.731328 1.11e-08 1.52e-10 - 1.600000 0.992673 1.731928 1.14e-08 1.24e-10 - 1.700000 0.967253 1.729643 1.16e-08 1.06e-10 - 1.800000 0.941488 1.724485 1.16e-08 1.01e-10 - 1.900000 0.915617 1.716479 1.13e-08 1.16e-10 - 2.000000 0.889903 1.705666 1.05e-08 1.63e-10 - 2.100000 0.864625 1.692102 8.92e-09 2.52e-10 - 2.200000 0.840089 1.675857 6.33e-09 3.98e-10 - 2.300000 0.816616 1.657017 2.42e-09 6.17e-10 - 2.400000 0.794546 1.635684 3.04e-09 9.19e-10 - 2.500000 0.774227 1.611978 1.02e-08 1.31e-09 - 2.600000 0.756013 1.586033 1.88e-08 1.79e-09 - 2.700000 0.740246 1.558005 2.85e-08 2.31e-09 - 2.800000 0.727247 1.528067 3.83e-08 2.85e-09 - 2.900000 0.717301 1.496412 4.71e-08 3.33e-09 - 3.000000 0.710636 1.463257 5.36e-08 3.70e-09 - 3.100000 0.707413 1.428839 5.66e-08 3.88e-09 - 3.200000 0.707709 1.393422 5.57e-08 3.86e-09 - 3.300000 0.711520 1.357297 5.10e-08 3.64e-09 - 3.400000 0.718750 1.320780 4.34e-08 3.27e-09 - 3.500000 0.729227 1.284218 3.41e-08 2.78e-09 - 3.600000 0.742712 1.247990 2.43e-08 2.23e-09 - 3.700000 0.758914 1.212503 1.50e-08 1.64e-09 - 3.800000 0.777506 1.178194 7.03e-09 1.01e-09 - 3.900000 0.798144 1.145528 4.85e-10 3.38e-10 - 4.000000 0.820474 1.114988 4.60e-09 4.26e-10 - 4.100000 0.844149 1.087071 8.42e-09 1.31e-09 - 4.200000 0.868832 1.062273 1.12e-08 2.33e-09 - 4.300000 0.894204 1.041074 1.32e-08 3.48e-09 - 4.400000 0.919964 1.023913 1.46e-08 4.67e-09 - 4.500000 0.945834 1.011173 1.54e-08 5.78e-09 - 4.600000 0.971557 1.003150 1.58e-08 6.65e-09 - 4.700000 0.996898 1.000038 1.58e-08 7.12e-09 - 4.800000 1.021641 1.001916 1.54e-08 7.06e-09 - 4.900000 1.045589 1.008736 1.47e-08 6.49e-09 - 5.000000 1.068565 1.020331 1.38e-08 5.47e-09 - 5.100000 1.090408 1.036429 1.29e-08 4.19e-09 - 5.200000 1.110972 1.056667 1.20e-08 2.84e-09 - 5.300000 1.130127 1.080617 1.12e-08 1.57e-09 - 5.400000 1.147757 1.107807 1.05e-08 4.94e-10 - 5.500000 1.163759 1.137743 9.95e-09 3.32e-10 - 5.600000 1.178042 1.169929 9.54e-09 9.10e-10 - 5.700000 1.190528 1.203875 9.24e-09 1.27e-09 - 5.800000 1.201149 1.239112 9.03e-09 1.46e-09 - 5.900000 1.209851 1.275195 8.89e-09 1.52e-09 - 6.000000 1.216587 1.311711 8.80e-09 1.50e-09 - 6.100000 1.221325 1.348272 8.75e-09 1.42e-09 - 6.200000 1.224039 1.384525 8.72e-09 1.31e-09 - 6.300000 1.224716 1.420146 8.70e-09 1.19e-09 - 6.400000 1.223353 1.454836 8.70e-09 1.07e-09 - 6.500000 1.219956 1.488328 8.72e-09 9.53e-10 - 6.600000 1.214544 1.520375 8.74e-09 8.44e-10 - 6.700000 1.207142 1.550758 8.78e-09 7.47e-10 - 6.800000 1.197789 1.579276 8.84e-09 6.59e-10 - 6.900000 1.186534 1.605752 8.92e-09 5.81e-10 - 7.000000 1.173436 1.630027 9.03e-09 5.12e-10 + -2.900000 0.717301 1.326933 1.67e-08 1.31e-09 + -2.800000 0.727247 1.290353 1.26e-08 1.09e-09 + -2.700000 0.740246 1.254042 8.34e-09 8.55e-10 + -2.600000 0.756013 1.218400 4.39e-09 6.04e-10 + -2.500000 0.774227 1.183861 1.03e-09 3.43e-10 + -2.400000 0.794546 1.150885 1.62e-09 6.25e-11 + -2.300000 0.816616 1.119953 3.60e-09 2.52e-10 + -2.200000 0.840089 1.091560 4.99e-09 6.17e-10 + -2.100000 0.864625 1.066204 5.91e-09 1.04e-09 + -2.000000 0.889903 1.044367 6.48e-09 1.52e-09 + -1.900000 0.915617 1.026499 6.78e-09 2.02e-09 + -1.800000 0.941488 1.012992 6.87e-09 2.50e-09 + -1.700000 0.967253 1.004159 6.78e-09 2.87e-09 + -1.600000 0.992673 1.000213 6.52e-09 3.07e-09 + -1.500000 1.017531 1.001252 6.13e-09 3.06e-09 + -1.400000 1.041625 1.007249 5.64e-09 2.81e-09 + -1.300000 1.064777 1.018058 5.10e-09 2.37e-09 + -1.200000 1.086821 1.033422 4.54e-09 1.81e-09 + -1.100000 1.107609 1.052992 4.02e-09 1.21e-09 + -1.000000 1.127010 1.076350 3.56e-09 6.48e-10 + -0.900000 1.144904 1.103029 3.17e-09 1.68e-10 + -0.800000 1.161186 1.132539 2.87e-09 2.05e-10 + -0.700000 1.175764 1.164381 2.64e-09 4.68e-10 + -0.600000 1.188557 1.198064 2.47e-09 6.35e-10 + -0.500000 1.199496 1.233116 2.35e-09 7.24e-10 + -0.400000 1.208524 1.269087 2.28e-09 7.55e-10 + -0.300000 1.215594 1.305557 2.24e-09 7.47e-10 + -0.200000 1.220669 1.342137 2.22e-09 7.14e-10 + -0.100000 1.223725 1.378465 2.22e-09 6.67e-10 + 0.000000 1.224745 1.414214 2.23e-09 6.13e-10 + 0.100000 1.223725 1.449080 2.26e-09 5.59e-10 + 0.200000 1.220669 1.482791 2.30e-09 5.05e-10 + 0.300000 1.215594 1.515097 2.35e-09 4.56e-10 + 0.400000 1.208524 1.545774 2.42e-09 4.10e-10 + 0.500000 1.199496 1.574619 2.50e-09 3.68e-10 + 0.600000 1.188557 1.601450 2.60e-09 3.30e-10 + 0.700000 1.175764 1.626105 2.71e-09 2.96e-10 + 0.800000 1.161186 1.648441 2.84e-09 2.64e-10 + 0.900000 1.144904 1.668331 3.00e-09 2.35e-10 + 1.000000 1.127010 1.685666 3.18e-09 2.08e-10 + 1.100000 1.107609 1.700355 3.39e-09 1.82e-10 + 1.200000 1.086821 1.712320 3.62e-09 1.57e-10 + 1.300000 1.064777 1.721499 3.87e-09 1.33e-10 + 1.400000 1.041625 1.727845 4.15e-09 1.10e-10 + 1.500000 1.017531 1.731328 4.43e-09 8.85e-11 + 1.600000 0.992673 1.731928 4.71e-09 6.89e-11 + 1.700000 0.967253 1.729643 4.94e-09 5.29e-11 + 1.800000 0.941488 1.724485 5.09e-09 4.26e-11 + 1.900000 0.915617 1.716479 5.10e-09 4.14e-11 + 2.000000 0.889903 1.705666 4.88e-09 5.37e-11 + 2.100000 0.864625 1.692102 4.33e-09 8.51e-11 + 2.200000 0.840089 1.675857 3.32e-09 1.42e-10 + 2.300000 0.816616 1.657017 1.72e-09 2.31e-10 + 2.400000 0.794546 1.635684 5.61e-10 3.58e-10 + 2.500000 0.774227 1.611978 3.58e-09 5.24e-10 + 2.600000 0.756013 1.586033 7.25e-09 7.26e-10 + 2.700000 0.740246 1.558005 1.14e-08 9.50e-10 + 2.800000 0.727247 1.528067 1.55e-08 1.18e-09 + 2.900000 0.717301 1.496412 1.91e-08 1.37e-09 + 3.000000 0.710636 1.463257 2.16e-08 1.52e-09 + 3.100000 0.707413 1.428839 2.26e-08 1.58e-09 + 3.200000 0.707709 1.393422 2.19e-08 1.56e-09 + 3.300000 0.711520 1.357297 1.95e-08 1.45e-09 + 3.400000 0.718750 1.320780 1.60e-08 1.27e-09 + 3.500000 0.729227 1.284218 1.19e-08 1.05e-09 + 3.600000 0.742712 1.247990 7.64e-09 8.13e-10 + 3.700000 0.758914 1.212503 3.78e-09 5.61e-10 + 3.800000 0.777506 1.178194 5.36e-10 2.97e-10 + 3.900000 0.798144 1.145528 2.00e-09 1.25e-11 + 4.000000 0.820474 1.114988 3.87e-09 3.10e-10 + 4.100000 0.844149 1.087071 5.17e-09 6.84e-10 + 4.200000 0.868832 1.062273 6.02e-09 1.12e-09 + 4.300000 0.894204 1.041074 6.54e-09 1.60e-09 + 4.400000 0.919964 1.023913 6.81e-09 2.10e-09 + 4.500000 0.945834 1.011173 6.87e-09 2.57e-09 + 4.600000 0.971557 1.003150 6.75e-09 2.92e-09 + 4.700000 0.996898 1.000038 6.47e-09 3.09e-09 + 4.800000 1.021641 1.001916 6.06e-09 3.03e-09 + 4.900000 1.045589 1.008736 5.55e-09 2.75e-09 + 5.000000 1.068565 1.020331 5.00e-09 2.28e-09 + 5.100000 1.090408 1.036429 4.45e-09 1.71e-09 + 5.200000 1.110972 1.056667 3.94e-09 1.11e-09 + 5.300000 1.130127 1.080617 3.49e-09 5.60e-10 + 5.400000 1.147757 1.107807 3.12e-09 9.71e-11 + 5.500000 1.163759 1.137743 2.82e-09 2.57e-10 + 5.600000 1.178042 1.169929 2.61e-09 5.03e-10 + 5.700000 1.190528 1.203875 2.45e-09 6.55e-10 + 5.800000 1.201149 1.239112 2.34e-09 7.32e-10 + 5.900000 1.209851 1.275195 2.27e-09 7.56e-10 + 6.000000 1.216587 1.311711 2.23e-09 7.43e-10 + 6.100000 1.221325 1.348272 2.21e-09 7.07e-10 + 6.200000 1.224039 1.384525 2.22e-09 6.58e-10 + 6.300000 1.224716 1.420146 2.24e-09 6.04e-10 + 6.400000 1.223353 1.454836 2.27e-09 5.49e-10 + 6.500000 1.219956 1.488328 2.31e-09 4.97e-10 + 6.600000 1.214544 1.520375 2.36e-09 4.48e-10 + 6.700000 1.207142 1.550758 2.43e-09 4.02e-10 + 6.800000 1.197789 1.579276 2.52e-09 3.61e-10 + 6.900000 1.186534 1.605752 2.61e-09 3.24e-10 + 7.000000 1.173436 1.630027 2.73e-09 2.90e-10 ------------------------------------------------------ Final Solver Statistics: Internal solver steps = 103 (attempted = 103) Total number of error test failures = 0 Total RHS evals: Fe = 1742, Fi = 0 - Total mass matrix setups = 1439 + Total mass matrix setups = 1336 Total mass matrix solves = 1742 Total mass times evals = 103 - Errors: u = 1.83418e-08, v = 2.86413e-09, total = 1.31268e-08 + Errors: u = 7.06475e-09, v = 1.23412e-09, total = 5.07118e-09 diff --git a/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out b/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out index 61563dca16..c6e6c8ca6a 100644 --- a/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out +++ b/examples/arkode/CXX_superludist/ark_brusselator1D_FEM_sludist.out @@ -9,114 +9,114 @@ ---------------------------------------------- 0.100000 0.637854 3.356025 1.999989 0.200000 0.643035 3.345751 1.999989 - 0.300000 0.648532 3.334867 1.999989 - 0.400000 0.654362 3.323350 1.999989 - 0.500000 0.660542 3.311172 1.999988 - 0.600000 0.667093 3.298309 1.999988 - 0.700000 0.674031 3.284739 1.999989 + 0.300000 0.648532 3.334868 1.999989 + 0.400000 0.654362 3.323350 1.999988 + 0.500000 0.660543 3.311172 1.999988 + 0.600000 0.667094 3.298309 1.999988 + 0.700000 0.674031 3.284739 1.999988 0.800000 0.681370 3.270442 1.999988 - 0.900000 0.689121 3.255404 1.999988 - 1.000000 0.697284 3.239620 1.999988 - 1.100000 0.705853 3.223093 1.999987 - 1.200000 0.714805 3.205842 1.999987 - 1.300000 0.724098 3.187903 1.999987 - 1.400000 0.733670 3.169332 1.999987 - 1.500000 0.743428 3.150212 1.999987 - 1.600000 0.753248 3.130655 1.999987 - 1.700000 0.762974 3.110801 1.999986 - 1.800000 0.772411 3.090829 1.999986 - 1.900000 0.781336 3.070946 1.999986 - 2.000000 0.789499 3.051390 1.999986 - 2.100000 0.796638 3.032422 1.999986 - 2.200000 0.802489 3.014319 1.999986 - 2.300000 0.806808 2.997360 1.999986 - 2.400000 0.809386 2.981819 1.999986 - 2.500000 0.810059 2.967951 1.999986 - 2.600000 0.808728 2.955979 1.999986 - 2.700000 0.805361 2.946086 1.999986 - 2.800000 0.799988 2.938411 1.999986 - 2.900000 0.792711 2.933041 1.999986 - 3.000000 0.783681 2.930010 1.999986 - 3.100000 0.773096 2.929307 1.999986 - 3.200000 0.761187 2.930874 1.999986 - 3.300000 0.748207 2.934613 1.999987 + 0.900000 0.689123 3.255402 1.999988 + 1.000000 0.697286 3.239618 1.999988 + 1.100000 0.705855 3.223091 1.999988 + 1.200000 0.714809 3.205838 1.999987 + 1.300000 0.724100 3.187901 1.999987 + 1.400000 0.733673 3.169328 1.999987 + 1.500000 0.743433 3.150206 1.999987 + 1.600000 0.753250 3.130652 1.999987 + 1.700000 0.762975 3.110798 1.999986 + 1.800000 0.772413 3.090825 1.999986 + 1.900000 0.781338 3.070943 1.999986 + 2.000000 0.789502 3.051386 1.999986 + 2.100000 0.796640 3.032419 1.999986 + 2.200000 0.802491 3.014315 1.999986 + 2.300000 0.806810 2.997356 1.999986 + 2.400000 0.809388 2.981816 1.999986 + 2.500000 0.810060 2.967948 1.999986 + 2.600000 0.808729 2.955976 1.999986 + 2.700000 0.805361 2.946083 1.999986 + 2.800000 0.799988 2.938409 1.999986 + 2.900000 0.792711 2.933038 1.999986 + 3.000000 0.783680 2.930008 1.999986 + 3.100000 0.773094 2.929308 1.999986 + 3.200000 0.761186 2.930875 1.999986 + 3.300000 0.748207 2.934611 1.999987 3.400000 0.734416 2.940394 1.999987 - 3.500000 0.720074 2.948062 1.999987 - 3.600000 0.705429 2.957444 1.999987 - 3.700000 0.690715 2.968354 1.999988 - 3.800000 0.676141 2.980600 1.999988 - 3.900000 0.661892 2.993989 1.999988 - 4.000000 0.648123 3.008331 1.999989 - 4.100000 0.634962 3.023445 1.999989 + 3.500000 0.720073 2.948061 1.999987 + 3.600000 0.705429 2.957443 1.999987 + 3.700000 0.690715 2.968353 1.999988 + 3.800000 0.676140 2.980599 1.999988 + 3.900000 0.661892 2.993988 1.999988 + 4.000000 0.648121 3.008331 1.999989 + 4.100000 0.634962 3.023444 1.999989 4.200000 0.622506 3.039157 1.999989 - 4.300000 0.610828 3.055308 1.999989 + 4.300000 0.610827 3.055308 1.999989 4.400000 0.599972 3.071751 1.999989 - 4.500000 0.589962 3.088356 1.999990 - 4.600000 0.580801 3.105007 1.999990 - 4.700000 0.572477 3.121602 1.999990 - 4.800000 0.564964 3.138058 1.999990 - 4.900000 0.558227 3.154303 1.999990 - 5.000000 0.552224 3.170277 1.999990 + 4.500000 0.589960 3.088357 1.999990 + 4.600000 0.580801 3.105006 1.999990 + 4.700000 0.572476 3.121603 1.999990 + 4.800000 0.564963 3.138059 1.999990 + 4.900000 0.558226 3.154303 1.999990 + 5.000000 0.552223 3.170279 1.999990 5.100000 0.546907 3.185935 1.999991 - 5.200000 0.542229 3.201239 1.999991 - 5.300000 0.538138 3.216162 1.999991 - 5.400000 0.534586 3.230682 1.999991 - 5.500000 0.531525 3.244788 1.999991 - 5.600000 0.528910 3.258468 1.999991 - 5.700000 0.526699 3.271719 1.999991 - 5.800000 0.524852 3.284539 1.999991 - 5.900000 0.523334 3.296928 1.999991 - 6.000000 0.522112 3.308889 1.999991 - 6.100000 0.521154 3.320426 1.999991 - 6.200000 0.520436 3.331545 1.999991 - 6.300000 0.519932 3.342250 1.999991 - 6.400000 0.519621 3.352549 1.999991 - 6.500000 0.519484 3.362446 1.999991 - 6.600000 0.519503 3.371949 1.999991 - 6.700000 0.519664 3.381064 1.999991 - 6.800000 0.519953 3.389797 1.999991 - 6.900000 0.520358 3.398153 1.999991 - 7.000000 0.520869 3.406139 1.999991 - 7.100000 0.521477 3.413759 1.999991 - 7.200000 0.522174 3.421020 1.999991 - 7.300000 0.522953 3.427926 1.999991 - 7.400000 0.523807 3.434482 1.999991 - 7.500000 0.524732 3.440692 1.999991 - 7.600000 0.525723 3.446560 1.999991 - 7.700000 0.526775 3.452091 1.999991 - 7.800000 0.527887 3.457288 1.999991 - 7.900000 0.529055 3.462154 1.999991 - 8.000000 0.530276 3.466692 1.999991 - 8.100000 0.531549 3.470906 1.999991 - 8.200000 0.532872 3.474798 1.999991 - 8.300000 0.534244 3.478370 1.999991 + 5.200000 0.542228 3.201240 1.999991 + 5.300000 0.538137 3.216163 1.999991 + 5.400000 0.534585 3.230684 1.999991 + 5.500000 0.531524 3.244789 1.999991 + 5.600000 0.528909 3.258469 1.999991 + 5.700000 0.526698 3.271720 1.999991 + 5.800000 0.524852 3.284540 1.999991 + 5.900000 0.523334 3.296929 1.999991 + 6.000000 0.522111 3.308890 1.999991 + 6.100000 0.521152 3.320427 1.999991 + 6.200000 0.520433 3.331546 1.999991 + 6.300000 0.519931 3.342252 1.999991 + 6.400000 0.519621 3.352550 1.999991 + 6.500000 0.519483 3.362448 1.999991 + 6.600000 0.519502 3.371951 1.999991 + 6.700000 0.519663 3.381066 1.999991 + 6.800000 0.519953 3.389798 1.999991 + 6.900000 0.520358 3.398154 1.999991 + 7.000000 0.520869 3.406140 1.999991 + 7.100000 0.521477 3.413761 1.999991 + 7.200000 0.522174 3.421021 1.999991 + 7.300000 0.522953 3.427927 1.999991 + 7.400000 0.523807 3.434483 1.999991 + 7.500000 0.524731 3.440693 1.999991 + 7.600000 0.525722 3.446561 1.999991 + 7.700000 0.526776 3.452092 1.999991 + 7.800000 0.527887 3.457289 1.999991 + 7.900000 0.529055 3.462155 1.999991 + 8.000000 0.530276 3.466693 1.999991 + 8.100000 0.531549 3.470907 1.999991 + 8.200000 0.532872 3.474799 1.999991 + 8.300000 0.534244 3.478371 1.999991 8.400000 0.535665 3.481625 1.999991 8.500000 0.537133 3.484564 1.999991 - 8.600000 0.538649 3.487188 1.999991 + 8.600000 0.538649 3.487189 1.999991 8.700000 0.540213 3.489499 1.999991 8.800000 0.541825 3.491498 1.999991 8.900000 0.543486 3.493185 1.999991 9.000000 0.545196 3.494560 1.999991 - 9.100000 0.546957 3.495624 1.999991 - 9.200000 0.548771 3.496375 1.999991 - 9.300000 0.550638 3.496814 1.999990 - 9.400000 0.552561 3.496938 1.999990 - 9.500000 0.554543 3.496746 1.999990 + 9.100000 0.546958 3.495624 1.999991 + 9.200000 0.548771 3.496376 1.999991 + 9.300000 0.550639 3.496814 1.999990 + 9.400000 0.552562 3.496938 1.999990 + 9.500000 0.554543 3.496747 1.999990 9.600000 0.556585 3.496236 1.999990 - 9.700000 0.558691 3.495404 1.999990 - 9.800000 0.560864 3.494248 1.999990 + 9.700000 0.558692 3.495404 1.999990 + 9.800000 0.560865 3.494247 1.999990 9.900000 0.563108 3.492763 1.999990 10.000000 0.565426 3.490945 1.999990 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 95 (attempted = 95) - Total RHS evals: Fe = 0, Fi = 1596 + Internal solver steps = 57 (attempted = 59) + Total RHS evals: Fe = 0, Fi = 1079 Total mass matrix setups = 1 - Total mass matrix solves = 193 - Total mass times evals = 1688 - Total linear solver setups = 31 - Total number of Jacobian evaluations = 11 - Total number of Newton iterations = 1118 - Total number of nonlinear solver convergence failures = 10 + Total mass matrix solves = 117 + Total mass times evals = 1135 + Total linear solver setups = 39 + Total number of Jacobian evaluations = 20 + Total number of Newton iterations = 785 + Total number of nonlinear solver convergence failures = 19 Total number of error test failures = 0 diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out index e8bf3bb4cf..a5f5b76dd5 100644 --- a/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out +++ b/examples/arkode/CXX_xbraid/ark_heat2D_hypre_pfmg_xbraid_--np_2_1_2_--x_print_level_0.out @@ -45,25 +45,25 @@ output = 1 --------------------------------- - Max error = 3.297223495728918e-03 + Max error = 3.297249636368682e-03 Final max integrator statistics: Steps = 1780 Step attempts = 1780 - Error test fails = 450 - RHS evals = 12460 - NLS iters = 5340 + Error test fails = 285 + RHS evals = 16020 + NLS iters = 7120 NLS fails = 0 - LS iters = 30510 + LS iters = 38065 LS fails = 0 LS setups = 1780 - LS RHS evals = 30510 - Jv products = 30510 + LS RHS evals = 38065 + Jv products = 38065 - Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 5.713483 + Avg NLS iters per step attempt = 4.000000 + Avg LS iters per NLS iter = 5.346208 Preconditioner setups = 1780 - Preconditioner solves = 30510 - PFMG iters = 30510 + Preconditioner solves = 38065 + PFMG iters = 38065 diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out index b9a01b542f..90e7deb864 100644 --- a/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out +++ b/examples/arkode/CXX_xbraid/ark_heat2D_p_xbraid_--np_2_1_2_--x_print_level_0.out @@ -42,24 +42,24 @@ output = 1 --------------------------------- - Max error = 3.297223209148270e-03 + Max error = 3.297249605082264e-03 Final max integrator statistics: Steps = 1780 Step attempts = 1780 - Error test fails = 450 - RHS evals = 12460 - NLS iters = 5340 + Error test fails = 285 + RHS evals = 16020 + NLS iters = 7120 NLS fails = 0 - LS iters = 188490 + LS iters = 200710 LS fails = 0 LS setups = 1780 - LS RHS evals = 188490 - Jv products = 188490 + LS RHS evals = 200710 + Jv products = 200710 - Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 35.297753 + Avg NLS iters per step attempt = 4.000000 + Avg LS iters per NLS iter = 28.189607 Preconditioner setups = 1780 - Preconditioner solves = 188490 + Preconditioner solves = 200710 diff --git a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out index 2f66e11ae8..7bdd970ee7 100644 --- a/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out +++ b/examples/arkode/CXX_xbraid/ark_heat2D_xbraid_--x_print_level_0.out @@ -37,24 +37,24 @@ output = 1 --------------------------------- - Max error = 3.297223554637685e-03 + Max error = 3.297249506762578e-03 Final max integrator statistics: Steps = 895 Step attempts = 895 - Error test fails = 324 - RHS evals = 6265 - NLS iters = 2685 + Error test fails = 190 + RHS evals = 8055 + NLS iters = 3580 NLS fails = 0 - LS iters = 97791 + LS iters = 105193 LS fails = 0 LS setups = 895 - LS RHS evals = 97791 - Jv products = 97791 + LS RHS evals = 105193 + Jv products = 105193 - Avg NLS iters per step attempt = 3.000000 - Avg LS iters per NLS iter = 36.421229 + Avg NLS iters per step attempt = 4.000000 + Avg LS iters per NLS iter = 29.383520 Preconditioner setups = 895 - Preconditioner solves = 97791 + Preconditioner solves = 105193 diff --git a/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out b/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out index 6366fd534c..5fb630c7a8 100644 --- a/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out +++ b/examples/arkode/C_manyvector/ark_brusselator1D_manyvec.out @@ -7,7 +7,7 @@ t ||u||_rms ||v||_rms ||w||_rms ---------------------------------------------- - 0.100000 0.675721 3.378375 1.999987 + 0.100000 0.675720 3.378375 1.999987 0.200000 0.688547 3.357685 1.999986 0.300000 0.702697 3.334521 1.999986 0.400000 0.718341 3.308630 1.999986 @@ -17,22 +17,22 @@ 0.800000 0.800119 3.171899 1.999984 0.900000 0.826591 3.127813 1.999984 1.000000 0.855960 3.079155 1.999983 - 1.100000 0.888376 3.025731 1.999983 + 1.100000 0.888377 3.025731 1.999983 1.200000 0.923836 2.967503 1.999982 1.300000 0.962071 2.904676 1.999981 1.400000 1.002422 2.837798 1.999981 1.500000 1.043712 2.767829 1.999980 1.600000 1.084197 2.696154 1.999979 - 1.700000 1.121655 2.624496 1.999978 + 1.700000 1.121655 2.624496 1.999979 1.800000 1.153660 2.554719 1.999978 1.900000 1.177994 2.488583 1.999977 2.000000 1.193046 2.427526 1.999977 2.100000 1.198054 2.372559 1.999977 - 2.200000 1.193110 2.324271 1.999977 + 2.200000 1.193110 2.324272 1.999977 2.300000 1.178983 2.282911 1.999977 2.400000 1.156873 2.248486 1.999978 2.500000 1.128176 2.220852 1.999978 - 2.600000 1.094311 2.199774 1.999978 + 2.600000 1.094311 2.199774 1.999979 2.700000 1.056614 2.184957 1.999979 2.800000 1.016284 2.176069 1.999980 2.900000 0.974366 2.172745 1.999981 @@ -53,10 +53,10 @@ 4.400000 0.480453 2.510036 1.999991 4.500000 0.462246 2.542923 1.999991 4.600000 0.445653 2.575948 1.999992 - 4.700000 0.430589 2.609023 1.999992 + 4.700000 0.430589 2.609024 1.999992 4.800000 0.416966 2.642078 1.999992 4.900000 0.404698 2.675052 1.999992 - 5.000000 0.393698 2.707899 1.999993 + 5.000000 0.393698 2.707899 1.999992 5.100000 0.383879 2.740577 1.999993 5.200000 0.375159 2.773058 1.999993 5.300000 0.367454 2.805314 1.999993 @@ -82,10 +82,10 @@ 7.300000 0.331130 3.392178 1.999994 7.400000 0.332202 3.418486 1.999994 7.500000 0.333401 3.444494 1.999994 - 7.600000 0.334721 3.470197 1.999993 - 7.700000 0.336154 3.495592 1.999993 - 7.800000 0.337695 3.520673 1.999993 - 7.900000 0.339341 3.545436 1.999993 + 7.600000 0.334721 3.470197 1.999994 + 7.700000 0.336154 3.495592 1.999994 + 7.800000 0.337695 3.520673 1.999994 + 7.900000 0.339341 3.545436 1.999994 8.000000 0.341088 3.569873 1.999993 8.100000 0.342934 3.593980 1.999993 8.200000 0.344876 3.617748 1.999993 @@ -101,23 +101,23 @@ 9.200000 0.369812 3.834729 1.999993 9.300000 0.372919 3.854085 1.999993 9.400000 0.376159 3.872952 1.999992 - 9.500000 0.379540 3.891308 1.999992 + 9.500000 0.379540 3.891308 1.999993 9.600000 0.383069 3.909132 1.999992 - 9.700000 0.386758 3.926398 1.999992 - 9.800000 0.390617 3.943079 1.999993 - 9.900000 0.394659 3.959146 1.999993 - 10.000000 0.398900 3.974566 1.999993 + 9.700000 0.386758 3.926398 1.999993 + 9.800000 0.390617 3.943079 1.999992 + 9.900000 0.394659 3.959146 1.999992 + 10.000000 0.398900 3.974566 1.999992 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 395 (attempted = 422) - Total RHS evals: Fe = 2508, Fi = 7138 + Internal solver steps = 306 (attempted = 318) + Total RHS evals: Fe = 2216, Fi = 6255 Total linear solver setups = 0 - Total linear iterations = 15143 + Total linear iterations = 12165 Total linear convergence failures = 0 - Total J*v evaluations = 15143 + Total J*v evaluations = 12165 Total RHS evals in linear solver = 0 - Total number of Newton iterations = 4630 - Total number of nonlinear solver convergence failures = 0 - Total number of error test failures = 27 + Total number of Newton iterations = 4039 + Total number of nonlinear solver convergence failures = 1 + Total number of error test failures = 11 diff --git a/examples/arkode/C_openmp/ark_brusselator1D_omp.out b/examples/arkode/C_openmp/ark_brusselator1D_omp.out index 81af310e01..f6f0c13d1a 100644 --- a/examples/arkode/C_openmp/ark_brusselator1D_omp.out +++ b/examples/arkode/C_openmp/ark_brusselator1D_omp.out @@ -13,110 +13,110 @@ 0.300000 0.695306 3.334633 1.999986 0.400000 0.706918 3.311313 1.999986 0.500000 0.719185 3.286601 1.999986 - 0.600000 0.732137 3.260442 1.999986 - 0.700000 0.745798 3.232787 1.999985 - 0.800000 0.760185 3.203596 1.999985 - 0.900000 0.775302 3.172839 1.999985 + 0.600000 0.732138 3.260442 1.999986 + 0.700000 0.745798 3.232788 1.999985 + 0.800000 0.760187 3.203594 1.999985 + 0.900000 0.775303 3.172838 1.999985 1.000000 0.791135 3.140510 1.999984 - 1.100000 0.807648 3.106624 1.999984 - 1.200000 0.824771 3.071233 1.999984 - 1.300000 0.842402 3.034426 1.999983 - 1.400000 0.860384 2.996350 1.999983 - 1.500000 0.878514 2.957207 1.999983 - 1.600000 0.896525 2.917266 1.999982 - 1.700000 0.914089 2.876873 1.999982 - 1.800000 0.930823 2.836438 1.999982 - 1.900000 0.946292 2.796446 1.999982 - 2.000000 0.960034 2.757430 1.999981 - 2.100000 0.971577 2.719961 1.999981 - 2.200000 0.980476 2.684622 1.999981 - 2.300000 0.986338 2.651980 1.999981 - 2.400000 0.988853 2.622559 1.999981 - 2.500000 0.987816 2.596818 1.999981 - 2.600000 0.983141 2.575127 1.999981 - 2.700000 0.974859 2.557765 1.999981 - 2.800000 0.963115 2.544902 1.999981 - 2.900000 0.948155 2.536610 1.999981 - 3.000000 0.930300 2.532867 1.999982 - 3.100000 0.909931 2.533566 1.999982 - 3.200000 0.887464 2.538528 1.999983 - 3.300000 0.863335 2.547514 1.999983 - 3.400000 0.837978 2.560240 1.999983 - 3.500000 0.811818 2.576391 1.999984 - 3.600000 0.785255 2.595624 1.999984 - 3.700000 0.758658 2.617586 1.999985 - 3.800000 0.732363 2.641921 1.999986 - 3.900000 0.706662 2.668274 1.999986 - 4.000000 0.681809 2.696300 1.999986 - 4.100000 0.658011 2.725670 1.999987 - 4.200000 0.635435 2.756075 1.999987 - 4.300000 0.614204 2.787228 1.999988 + 1.100000 0.807651 3.106620 1.999984 + 1.200000 0.824772 3.071232 1.999984 + 1.300000 0.842404 3.034423 1.999983 + 1.400000 0.860386 2.996347 1.999983 + 1.500000 0.878514 2.957205 1.999983 + 1.600000 0.896528 2.917260 1.999982 + 1.700000 0.914089 2.876871 1.999982 + 1.800000 0.930823 2.836437 1.999982 + 1.900000 0.946293 2.796444 1.999982 + 2.000000 0.960034 2.757429 1.999981 + 2.100000 0.971577 2.719960 1.999981 + 2.200000 0.980475 2.684622 1.999981 + 2.300000 0.986336 2.651980 1.999981 + 2.400000 0.988853 2.622558 1.999981 + 2.500000 0.987814 2.596819 1.999981 + 2.600000 0.983140 2.575127 1.999981 + 2.700000 0.974856 2.557766 1.999981 + 2.800000 0.963114 2.544903 1.999981 + 2.900000 0.948154 2.536611 1.999981 + 3.000000 0.930298 2.532870 1.999982 + 3.100000 0.909929 2.533567 1.999982 + 3.200000 0.887463 2.538530 1.999983 + 3.300000 0.863334 2.547515 1.999983 + 3.400000 0.837978 2.560242 1.999983 + 3.500000 0.811818 2.576392 1.999984 + 3.600000 0.785254 2.595625 1.999984 + 3.700000 0.758658 2.617588 1.999985 + 3.800000 0.732362 2.641923 1.999986 + 3.900000 0.706662 2.668275 1.999986 + 4.000000 0.681808 2.696301 1.999986 + 4.100000 0.658011 2.725672 1.999987 + 4.200000 0.635435 2.756076 1.999987 + 4.300000 0.614204 2.787229 1.999988 4.400000 0.594404 2.818869 1.999988 - 4.500000 0.576082 2.850764 1.999989 - 4.600000 0.559254 2.882710 1.999989 - 4.700000 0.543909 2.914529 1.999989 - 4.800000 0.530011 2.946071 1.999990 + 4.500000 0.576082 2.850766 1.999989 + 4.600000 0.559254 2.882711 1.999989 + 4.700000 0.543909 2.914530 1.999989 + 4.800000 0.530011 2.946072 1.999990 4.900000 0.517506 2.977210 1.999990 - 5.000000 0.506326 3.007843 1.999990 - 5.100000 0.496393 3.037889 1.999990 - 5.200000 0.487625 3.067283 1.999990 - 5.300000 0.479935 3.095976 1.999991 - 5.400000 0.473237 3.123932 1.999991 - 5.500000 0.467445 3.151126 1.999991 - 5.600000 0.462480 3.177540 1.999991 - 5.700000 0.458264 3.203165 1.999991 - 5.800000 0.454726 3.227997 1.999991 - 5.900000 0.451799 3.252035 1.999991 - 6.000000 0.449425 3.275283 1.999991 + 5.000000 0.506325 3.007844 1.999990 + 5.100000 0.496393 3.037890 1.999990 + 5.200000 0.487625 3.067284 1.999990 + 5.300000 0.479935 3.095977 1.999991 + 5.400000 0.473237 3.123933 1.999991 + 5.500000 0.467445 3.151127 1.999991 + 5.600000 0.462480 3.177541 1.999991 + 5.700000 0.458264 3.203166 1.999991 + 5.800000 0.454725 3.227998 1.999991 + 5.900000 0.451799 3.252036 1.999991 + 6.000000 0.449425 3.275284 1.999991 6.100000 0.447546 3.297745 1.999991 - 6.200000 0.446115 3.319428 1.999991 + 6.200000 0.446115 3.319429 1.999991 6.300000 0.445085 3.340341 1.999991 - 6.400000 0.444419 3.360492 1.999991 + 6.400000 0.444418 3.360492 1.999991 6.500000 0.444079 3.379891 1.999991 6.600000 0.444034 3.398547 1.999991 - 6.700000 0.444257 3.416470 1.999991 - 6.800000 0.444722 3.433669 1.999991 - 6.900000 0.445409 3.450154 1.999991 + 6.700000 0.444257 3.416471 1.999991 + 6.800000 0.444722 3.433670 1.999991 + 6.900000 0.445408 3.450155 1.999991 7.000000 0.446297 3.465935 1.999991 - 7.100000 0.447370 3.481018 1.999991 + 7.100000 0.447370 3.481019 1.999991 7.200000 0.448614 3.495415 1.999991 - 7.300000 0.450016 3.509131 1.999991 - 7.400000 0.451564 3.522176 1.999991 + 7.300000 0.450016 3.509132 1.999991 + 7.400000 0.451564 3.522177 1.999991 7.500000 0.453249 3.534557 1.999991 - 7.600000 0.455064 3.546280 1.999991 + 7.600000 0.455064 3.546281 1.999991 7.700000 0.457000 3.557353 1.999991 - 7.800000 0.459052 3.567781 1.999991 - 7.900000 0.461215 3.577572 1.999991 + 7.800000 0.459052 3.567782 1.999991 + 7.900000 0.461216 3.577572 1.999991 8.000000 0.463486 3.586729 1.999991 8.100000 0.465860 3.595257 1.999991 8.200000 0.468335 3.603162 1.999991 8.300000 0.470909 3.610447 1.999991 8.400000 0.473582 3.617116 1.999991 - 8.500000 0.476352 3.623172 1.999991 + 8.500000 0.476352 3.623171 1.999991 8.600000 0.479220 3.628616 1.999991 8.700000 0.482186 3.633451 1.999991 - 8.800000 0.485250 3.637679 1.999990 + 8.800000 0.485251 3.637679 1.999990 8.900000 0.488416 3.641299 1.999990 - 9.000000 0.491684 3.644312 1.999990 - 9.100000 0.495058 3.646716 1.999990 - 9.200000 0.498539 3.648510 1.999990 - 9.300000 0.502133 3.649691 1.999990 - 9.400000 0.505843 3.650257 1.999990 - 9.500000 0.509674 3.650202 1.999990 - 9.600000 0.513632 3.649522 1.999990 - 9.700000 0.517722 3.648210 1.999990 + 9.000000 0.491684 3.644311 1.999990 + 9.100000 0.495058 3.646715 1.999990 + 9.200000 0.498540 3.648509 1.999990 + 9.300000 0.502134 3.649691 1.999990 + 9.400000 0.505844 3.650256 1.999990 + 9.500000 0.509675 3.650202 1.999990 + 9.600000 0.513632 3.649521 1.999990 + 9.700000 0.517722 3.648209 1.999990 9.800000 0.521951 3.646257 1.999990 - 9.900000 0.526326 3.643656 1.999990 + 9.900000 0.526327 3.643656 1.999990 10.000000 0.530857 3.640396 1.999990 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 99 (attempted = 99) - Total RHS evals: Fe = 0, Fi = 1186 - Total linear solver setups = 35 + Internal solver steps = 66 (attempted = 67) + Total RHS evals: Fe = 0, Fi = 887 + Total linear solver setups = 33 Total RHS evals for setting up the linear system = 0 - Total number of Jacobian evaluations = 14 - Total number of Newton iterations = 1196 - Total number of nonlinear solver convergence failures = 13 + Total number of Jacobian evaluations = 16 + Total number of Newton iterations = 899 + Total number of nonlinear solver convergence failures = 15 Total number of error test failures = 0 diff --git a/examples/arkode/C_openmp/ark_heat1D_omp.out b/examples/arkode/C_openmp/ark_heat1D_omp.out index 89e65575dd..0a45883971 100644 --- a/examples/arkode/C_openmp/ark_heat1D_omp.out +++ b/examples/arkode/C_openmp/ark_heat1D_omp.out @@ -18,12 +18,12 @@ ------------------------- Final Solver Statistics: - Internal solver steps = 191 (attempted = 191) - Total RHS evals: Fe = 0, Fi = 1913 + Internal solver steps = 81 (attempted = 81) + Total RHS evals: Fe = 0, Fi = 813 Total linear solver setups = 0 - Total linear iterations = 18388 - Total number of Jacobian-vector products = 18388 + Total linear iterations = 11184 + Total number of Jacobian-vector products = 11184 Total number of linear solver convergence failures = 0 - Total number of Newton iterations = 955 + Total number of Newton iterations = 405 Total number of nonlinear solver convergence failures = 0 Total number of error test failures = 0 diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out index 33fd09b78d..3cea4cd575 100644 --- a/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out +++ b/examples/arkode/C_parallel/ark_diurnal_kry_bbd_p.out @@ -7,68 +7,68 @@ Preconditioner type is: jpre = SUN_PREC_LEFT -t = 7.20e+03 no. steps = 980 stepsize = 3.07e+00 +t = 7.20e+03 no. steps = 92 stepsize = 6.85e+01 At bottom left: c1, c2 = 1.047e+04 2.527e+11 At top right: c1, c2 = 1.119e+04 2.700e+11 -t = 1.44e+04 no. steps = 2730 stepsize = 6.90e+00 +t = 1.44e+04 no. steps = 143 stepsize = 3.64e+02 At bottom left: c1, c2 = 6.659e+06 2.582e+11 At top right: c1, c2 = 7.301e+06 2.833e+11 -t = 2.16e+04 no. steps = 3533 stepsize = 1.04e+01 +t = 2.16e+04 no. steps = 166 stepsize = 4.85e+02 At bottom left: c1, c2 = 2.665e+07 2.993e+11 At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4686 stepsize = 4.31e+00 +t = 2.88e+04 no. steps = 184 stepsize = 1.80e+02 At bottom left: c1, c2 = 8.702e+06 3.380e+11 At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 5981 stepsize = 2.55e+00 +t = 3.60e+04 no. steps = 227 stepsize = 7.76e+01 At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7170 stepsize = 4.78e+02 -At bottom left: c1, c2 = -3.557e-10 3.382e+11 -At top right: c1, c2 = 1.033e-09 3.804e+11 +t = 4.32e+04 no. steps = 280 stepsize = 1.40e+03 +At bottom left: c1, c2 = -1.934e-07 3.382e+11 +At top right: c1, c2 = -2.013e-06 3.804e+11 -t = 5.04e+04 no. steps = 7187 stepsize = 4.82e+02 -At bottom left: c1, c2 = -4.936e-07 3.358e+11 -At top right: c1, c2 = -1.075e-12 3.864e+11 +t = 5.04e+04 no. steps = 285 stepsize = 1.40e+03 +At bottom left: c1, c2 = 8.880e-07 3.358e+11 +At top right: c1, c2 = -6.820e-07 3.864e+11 -t = 5.76e+04 no. steps = 7202 stepsize = 3.74e+02 -At bottom left: c1, c2 = -9.646e-07 3.320e+11 -At top right: c1, c2 = 1.101e-19 3.909e+11 +t = 5.76e+04 no. steps = 291 stepsize = 9.64e+02 +At bottom left: c1, c2 = 9.158e-07 3.320e+11 +At top right: c1, c2 = -8.659e-07 3.909e+11 -t = 6.48e+04 no. steps = 7216 stepsize = 5.82e+02 -At bottom left: c1, c2 = 1.665e-07 3.313e+11 -At top right: c1, c2 = 3.501e-19 3.963e+11 +t = 6.48e+04 no. steps = 296 stepsize = 1.55e+03 +At bottom left: c1, c2 = 2.544e-09 3.313e+11 +At top right: c1, c2 = 4.196e-07 3.963e+11 -t = 7.20e+04 no. steps = 7228 stepsize = 5.82e+02 -At bottom left: c1, c2 = -1.045e-08 3.330e+11 -At top right: c1, c2 = -6.502e-20 4.039e+11 +t = 7.20e+04 no. steps = 301 stepsize = 1.55e+03 +At bottom left: c1, c2 = 5.589e-08 3.330e+11 +At top right: c1, c2 = 1.820e-06 4.039e+11 -t = 7.92e+04 no. steps = 7241 stepsize = 5.82e+02 -At bottom left: c1, c2 = -1.269e-07 3.334e+11 -At top right: c1, c2 = 4.639e-19 4.120e+11 +t = 7.92e+04 no. steps = 305 stepsize = 1.55e+03 +At bottom left: c1, c2 = 7.317e-08 3.334e+11 +At top right: c1, c2 = -4.823e-07 4.120e+11 -t = 8.64e+04 no. steps = 7253 stepsize = 5.82e+02 -At bottom left: c1, c2 = -3.193e-07 3.352e+11 -At top right: c1, c2 = -7.979e-21 4.163e+11 +t = 8.64e+04 no. steps = 310 stepsize = 1.55e+03 +At bottom left: c1, c2 = 1.318e-06 3.352e+11 +At top right: c1, c2 = -2.642e-06 4.163e+11 Final Statistics: -lenrw = 3902 leniw = 279 +lenrw = 4118 leniw = 290 lenrwls = 2455 leniwls = 126 -nst = 7253 nfe = 0 -nfe = 76956 nfels = 102729 -nni = 40543 nli = 102729 -nsetups = 441 netf = 29 -npe = 122 nps = 140344 -ncfn = 0 ncfl = 0 +nst = 310 nfe = 0 +nfe = 3884 nfels = 7933 +nni = 2276 nli = 7933 +nsetups = 50 netf = 11 +npe = 5 nps = 10111 +ncfn = 0 ncfl = 464 In ARKBBDPRE: real/integer local work space sizes = 1300, 192 - no. flocal evals. = 2684 + no. flocal evals. = 110 ------------------------------------------------------------------- @@ -76,65 +76,65 @@ In ARKBBDPRE: real/integer local work space sizes = 1300, 192 Preconditioner type is: jpre = SUN_PREC_RIGHT -t = 7.20e+03 no. steps = 980 stepsize = 3.07e+00 +t = 7.20e+03 no. steps = 85 stepsize = 6.86e+01 At bottom left: c1, c2 = 1.047e+04 2.527e+11 At top right: c1, c2 = 1.119e+04 2.700e+11 -t = 1.44e+04 no. steps = 2730 stepsize = 6.90e+00 +t = 1.44e+04 no. steps = 136 stepsize = 3.62e+02 At bottom left: c1, c2 = 6.659e+06 2.582e+11 At top right: c1, c2 = 7.301e+06 2.833e+11 -t = 2.16e+04 no. steps = 3533 stepsize = 1.04e+01 +t = 2.16e+04 no. steps = 159 stepsize = 4.98e+02 At bottom left: c1, c2 = 2.665e+07 2.993e+11 At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4684 stepsize = 4.55e+00 +t = 2.88e+04 no. steps = 183 stepsize = 1.57e+02 At bottom left: c1, c2 = 8.702e+06 3.380e+11 At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 5947 stepsize = 2.56e+00 +t = 3.60e+04 no. steps = 224 stepsize = 6.21e+01 At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7133 stepsize = 4.36e+02 -At bottom left: c1, c2 = -1.512e-12 3.382e+11 -At top right: c1, c2 = -1.226e-11 3.804e+11 +t = 4.32e+04 no. steps = 281 stepsize = 1.31e+03 +At bottom left: c1, c2 = -3.798e-11 3.382e+11 +At top right: c1, c2 = -3.133e-11 3.804e+11 -t = 5.04e+04 no. steps = 7150 stepsize = 4.19e+02 -At bottom left: c1, c2 = 8.712e-16 3.358e+11 -At top right: c1, c2 = -1.011e-06 3.864e+11 +t = 5.04e+04 no. steps = 287 stepsize = 6.28e+02 +At bottom left: c1, c2 = 3.574e-09 3.358e+11 +At top right: c1, c2 = -4.513e-09 3.864e+11 -t = 5.76e+04 no. steps = 7168 stepsize = 2.29e+02 -At bottom left: c1, c2 = 8.678e-21 3.320e+11 -At top right: c1, c2 = 9.801e-10 3.909e+11 +t = 5.76e+04 no. steps = 294 stepsize = 9.87e+02 +At bottom left: c1, c2 = -7.829e-08 3.320e+11 +At top right: c1, c2 = 2.022e-08 3.909e+11 -t = 6.48e+04 no. steps = 7181 stepsize = 6.37e+02 -At bottom left: c1, c2 = -1.578e-24 3.313e+11 -At top right: c1, c2 = 1.788e-09 3.963e+11 +t = 6.48e+04 no. steps = 299 stepsize = 1.52e+03 +At bottom left: c1, c2 = 7.425e-08 3.313e+11 +At top right: c1, c2 = -5.031e-07 3.963e+11 -t = 7.20e+04 no. steps = 7193 stepsize = 6.37e+02 -At bottom left: c1, c2 = -1.410e-23 3.330e+11 -At top right: c1, c2 = -9.726e-07 4.039e+11 +t = 7.20e+04 no. steps = 304 stepsize = 1.52e+03 +At bottom left: c1, c2 = -2.810e-07 3.330e+11 +At top right: c1, c2 = -5.000e-07 4.039e+11 -t = 7.92e+04 no. steps = 7204 stepsize = 6.37e+02 -At bottom left: c1, c2 = -1.897e-24 3.334e+11 -At top right: c1, c2 = -1.322e-06 4.120e+11 +t = 7.92e+04 no. steps = 309 stepsize = 1.52e+03 +At bottom left: c1, c2 = -2.307e-08 3.334e+11 +At top right: c1, c2 = 1.855e-07 4.120e+11 -t = 8.64e+04 no. steps = 7215 stepsize = 6.37e+02 -At bottom left: c1, c2 = 3.801e-23 3.352e+11 -At top right: c1, c2 = 3.984e-11 4.163e+11 +t = 8.64e+04 no. steps = 313 stepsize = 1.52e+03 +At bottom left: c1, c2 = 1.326e-07 3.352e+11 +At top right: c1, c2 = -2.151e-07 4.163e+11 Final Statistics: -lenrw = 3902 leniw = 284 +lenrw = 4118 leniw = 296 lenrwls = 2455 leniwls = 126 -nst = 7215 nfe = 0 -nfe = 76537 nfels = 108364 -nni = 40314 nli = 108364 -nsetups = 438 netf = 29 -npe = 122 nps = 145149 -ncfn = 0 ncfl = 43 +nst = 313 nfe = 0 +nfe = 3930 nfels = 8740 +nni = 2287 nli = 8740 +nsetups = 62 netf = 15 +npe = 7 nps = 10922 +ncfn = 2 ncfl = 903 In ARKBBDPRE: real/integer local work space sizes = 1300, 192 - no. flocal evals. = 2684 + no. flocal evals. = 154 diff --git a/examples/arkode/C_parallel/ark_diurnal_kry_p.out b/examples/arkode/C_parallel/ark_diurnal_kry_p.out index 2fc4afceac..eeb5bc8b50 100644 --- a/examples/arkode/C_parallel/ark_diurnal_kry_p.out +++ b/examples/arkode/C_parallel/ark_diurnal_kry_p.out @@ -1,63 +1,63 @@ 2-species diurnal advection-diffusion problem -t = 7.20e+03 no. steps = 980 stepsize = 3.07e+00 +t = 7.20e+03 no. steps = 88 stepsize = 6.86e+01 At bottom left: c1, c2 = 1.047e+04 2.527e+11 At top right: c1, c2 = 1.119e+04 2.700e+11 -t = 1.44e+04 no. steps = 2730 stepsize = 6.90e+00 +t = 1.44e+04 no. steps = 139 stepsize = 3.62e+02 At bottom left: c1, c2 = 6.659e+06 2.582e+11 At top right: c1, c2 = 7.301e+06 2.833e+11 -t = 2.16e+04 no. steps = 3533 stepsize = 1.04e+01 +t = 2.16e+04 no. steps = 162 stepsize = 4.97e+02 At bottom left: c1, c2 = 2.665e+07 2.993e+11 At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4707 stepsize = 4.53e+00 +t = 2.88e+04 no. steps = 185 stepsize = 1.52e+02 At bottom left: c1, c2 = 8.702e+06 3.380e+11 At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 5973 stepsize = 2.55e+00 +t = 3.60e+04 no. steps = 223 stepsize = 7.59e+01 At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7161 stepsize = 4.81e+02 -At bottom left: c1, c2 = -5.680e-13 3.382e+11 -At top right: c1, c2 = 1.958e-12 3.804e+11 +t = 4.32e+04 no. steps = 277 stepsize = 1.38e+03 +At bottom left: c1, c2 = 3.855e-07 3.382e+11 +At top right: c1, c2 = -1.938e-06 3.804e+11 -t = 5.04e+04 no. steps = 7176 stepsize = 4.29e+02 -At bottom left: c1, c2 = -6.614e-11 3.358e+11 -At top right: c1, c2 = 9.416e-11 3.864e+11 +t = 5.04e+04 no. steps = 282 stepsize = 1.38e+03 +At bottom left: c1, c2 = -2.156e-19 3.358e+11 +At top right: c1, c2 = -3.573e-18 3.864e+11 -t = 5.76e+04 no. steps = 7196 stepsize = 2.18e+02 -At bottom left: c1, c2 = 4.884e-13 3.320e+11 -At top right: c1, c2 = 3.038e-13 3.909e+11 +t = 5.76e+04 no. steps = 288 stepsize = 1.04e+03 +At bottom left: c1, c2 = -1.943e-18 3.320e+11 +At top right: c1, c2 = -3.570e-17 3.909e+11 -t = 6.48e+04 no. steps = 7209 stepsize = 6.39e+02 -At bottom left: c1, c2 = 3.911e-12 3.313e+11 -At top right: c1, c2 = -1.118e-11 3.963e+11 +t = 6.48e+04 no. steps = 293 stepsize = 1.62e+03 +At bottom left: c1, c2 = 2.477e-18 3.313e+11 +At top right: c1, c2 = 2.501e-17 3.963e+11 -t = 7.20e+04 no. steps = 7220 stepsize = 6.39e+02 -At bottom left: c1, c2 = -2.160e-12 3.330e+11 -At top right: c1, c2 = -2.041e-11 4.039e+11 +t = 7.20e+04 no. steps = 297 stepsize = 1.62e+03 +At bottom left: c1, c2 = 2.039e-18 3.330e+11 +At top right: c1, c2 = -1.043e-16 4.039e+11 -t = 7.92e+04 no. steps = 7231 stepsize = 6.39e+02 -At bottom left: c1, c2 = -2.099e-26 3.334e+11 -At top right: c1, c2 = -4.407e-25 4.120e+11 +t = 7.92e+04 no. steps = 302 stepsize = 1.62e+03 +At bottom left: c1, c2 = -3.886e-18 3.334e+11 +At top right: c1, c2 = 5.869e-17 4.120e+11 -t = 8.64e+04 no. steps = 7243 stepsize = 6.39e+02 -At bottom left: c1, c2 = -5.876e-25 3.352e+11 -At top right: c1, c2 = -9.344e-24 4.163e+11 +t = 8.64e+04 no. steps = 306 stepsize = 1.62e+03 +At bottom left: c1, c2 = 2.010e-18 3.352e+11 +At top right: c1, c2 = -1.278e-17 4.163e+11 Final Statistics: -lenrw = 3302 leniw = 255 +lenrw = 3518 leniw = 266 lenrwls = 2455 leniwls = 126 -nst = 7243 nfe = 0 -nfi = 76825 nfels = 105271 -nni = 40467 nli = 105271 -nsetups = 439 netf = 28 -npe = 122 nps = 142747 -ncfn = 0 ncfl = 141 +nst = 306 nfe = 0 +nfi = 3871 nfels = 8115 +nni = 2278 nli = 8115 +nsetups = 55 netf = 12 +npe = 6 nps = 10299 +ncfn = 1 ncfl = 555 diff --git a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out index 1d0747bbf7..c70bcbfdc2 100644 --- a/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out +++ b/examples/arkode/C_parhyp/ark_diurnal_kry_ph.out @@ -1,63 +1,63 @@ 2-species diurnal advection-diffusion problem -t = 7.20e+03 no. steps = 979 stepsize = 3.07e+00 +t = 7.20e+03 no. steps = 91 stepsize = 6.86e+01 At bottom left: c1, c2 = 1.047e+04 2.527e+11 At top right: c1, c2 = 1.119e+04 2.700e+11 -t = 1.44e+04 no. steps = 2733 stepsize = 6.93e+00 +t = 1.44e+04 no. steps = 142 stepsize = 3.58e+02 At bottom left: c1, c2 = 6.659e+06 2.582e+11 At top right: c1, c2 = 7.301e+06 2.833e+11 -t = 2.16e+04 no. steps = 3532 stepsize = 1.04e+01 +t = 2.16e+04 no. steps = 165 stepsize = 4.84e+02 At bottom left: c1, c2 = 2.665e+07 2.993e+11 At top right: c1, c2 = 2.931e+07 3.313e+11 -t = 2.88e+04 no. steps = 4603 stepsize = 4.79e+00 +t = 2.88e+04 no. steps = 183 stepsize = 2.14e+02 At bottom left: c1, c2 = 8.702e+06 3.380e+11 At top right: c1, c2 = 9.650e+06 3.751e+11 -t = 3.60e+04 no. steps = 5841 stepsize = 2.56e+00 +t = 3.60e+04 no. steps = 221 stepsize = 7.88e+01 At bottom left: c1, c2 = 1.404e+04 3.387e+11 At top right: c1, c2 = 1.561e+04 3.765e+11 -t = 4.32e+04 no. steps = 7028 stepsize = 5.25e+02 -At bottom left: c1, c2 = -1.384e-10 3.382e+11 -At top right: c1, c2 = 4.912e-10 3.804e+11 +t = 4.32e+04 no. steps = 276 stepsize = 1.34e+03 +At bottom left: c1, c2 = -2.713e-07 3.382e+11 +At top right: c1, c2 = 3.593e-06 3.804e+11 -t = 5.04e+04 no. steps = 7045 stepsize = 4.32e+02 -At bottom left: c1, c2 = -1.726e-08 3.358e+11 -At top right: c1, c2 = 3.060e-08 3.864e+11 +t = 5.04e+04 no. steps = 282 stepsize = 7.75e+02 +At bottom left: c1, c2 = 4.554e-06 3.358e+11 +At top right: c1, c2 = 2.104e-05 3.864e+11 -t = 5.76e+04 no. steps = 7060 stepsize = 2.24e+02 -At bottom left: c1, c2 = -2.215e-10 3.320e+11 -At top right: c1, c2 = -3.625e-10 3.909e+11 +t = 5.76e+04 no. steps = 288 stepsize = 1.34e+03 +At bottom left: c1, c2 = 5.075e-07 3.320e+11 +At top right: c1, c2 = 4.743e-06 3.909e+11 -t = 6.48e+04 no. steps = 7074 stepsize = 6.21e+02 -At bottom left: c1, c2 = -1.004e-22 3.313e+11 -At top right: c1, c2 = -3.771e-23 3.963e+11 +t = 6.48e+04 no. steps = 295 stepsize = 1.66e+03 +At bottom left: c1, c2 = 1.140e-08 3.313e+11 +At top right: c1, c2 = -5.890e-08 3.963e+11 -t = 7.20e+04 no. steps = 7085 stepsize = 6.21e+02 -At bottom left: c1, c2 = -2.029e-23 3.330e+11 -At top right: c1, c2 = 2.084e-23 4.039e+11 +t = 7.20e+04 no. steps = 299 stepsize = 1.66e+03 +At bottom left: c1, c2 = 7.622e-18 3.330e+11 +At top right: c1, c2 = -3.353e-16 4.039e+11 -t = 7.92e+04 no. steps = 7097 stepsize = 6.21e+02 -At bottom left: c1, c2 = -5.112e-23 3.334e+11 -At top right: c1, c2 = 1.320e-23 4.120e+11 +t = 7.92e+04 no. steps = 304 stepsize = 1.66e+03 +At bottom left: c1, c2 = -1.062e-17 3.334e+11 +At top right: c1, c2 = 1.340e-16 4.120e+11 -t = 8.64e+04 no. steps = 7109 stepsize = 6.21e+02 -At bottom left: c1, c2 = 1.584e-22 3.352e+11 -At top right: c1, c2 = -2.798e-23 4.163e+11 +t = 8.64e+04 no. steps = 308 stepsize = 1.66e+03 +At bottom left: c1, c2 = -2.989e-18 3.352e+11 +At top right: c1, c2 = 3.890e-17 4.163e+11 Final Statistics: -lenrw = 3302 leniw = 255 +lenrw = 3518 leniw = 266 lenrwls = 2455 leniwls = 126 -nst = 7109 nfe = 0 -nfi = 74641 nfels = 87206 -nni = 38963 nli = 87206 -nsetups = 431 netf = 26 -npe = 119 nps = 123911 -ncfn = 0 ncfl = 0 +nst = 308 nfe = 0 +nfi = 3713 nfels = 7325 +nni = 2110 nli = 7325 +nsetups = 53 netf = 12 +npe = 6 nps = 9355 +ncfn = 0 ncfl = 426 diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec.out b/examples/arkode/C_serial/ark_KrylovDemo_prec.out index e60c62304f..d7eedfc076 100644 --- a/examples/arkode/C_serial/ark_KrylovDemo_prec.out +++ b/examples/arkode/C_serial/ark_KrylovDemo_prec.out @@ -78,11 +78,11 @@ Species 6 10 11.0066 12.2649 12.2649 11.0066 10 10 10 10 10 10 10 -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 c values at t = 1e-06: @@ -111,34 +111,34 @@ Species 3 9.99991 9.99994 9.99997 9.99997 9.99994 9.99991 Species 4 -13.4984 13.4984 13.4984 13.4984 13.4984 13.4984 -13.4984 14.55 15.8924 15.8924 14.55 13.4984 -13.4984 15.8924 19.0296 19.0296 15.8924 13.4984 -13.4984 15.8924 19.0296 19.0296 15.8924 13.4984 -13.4984 14.55 15.8924 15.8924 14.55 13.4984 -13.4984 13.4984 13.4984 13.4984 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 14.5495 15.8919 15.8919 14.5495 13.4981 +13.4981 15.8919 19.0287 19.0287 15.8919 13.4981 +13.4981 15.8919 19.0287 19.0287 15.8919 13.4981 +13.4981 14.5495 15.8919 15.8919 14.5495 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 Species 5 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 -13.4984 14.7787 16.4136 16.4136 14.7787 13.4984 -13.4985 16.4136 20.236 20.236 16.4136 13.4985 -13.4985 16.4136 20.236 20.236 16.4136 13.4985 -13.4984 14.7787 16.4136 16.4136 14.7787 13.4984 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 14.7783 16.4131 16.4131 14.7783 13.4981 +13.4981 16.4131 20.235 20.235 16.4131 13.4981 +13.4981 16.4131 20.235 20.235 16.4131 13.4981 +13.4981 14.7783 16.4131 16.4131 14.7783 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 Species 6 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 -13.4984 15.0075 16.9348 16.9348 15.0075 13.4984 -13.4985 16.9348 21.4423 21.4423 16.9348 13.4985 -13.4985 16.9348 21.4423 21.4423 16.9348 13.4985 -13.4984 15.0075 16.9348 16.9348 15.0075 13.4984 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 15.007 16.9343 16.9343 15.007 13.4981 +13.4981 16.9343 21.4413 21.4413 16.9343 13.4981 +13.4981 16.9343 21.4413 21.4413 16.9343 13.4981 +13.4981 15.007 16.9343 16.9343 15.007 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.51e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.90e-03 c values at t = 0.001: @@ -167,41 +167,41 @@ Species 3 9.90776 9.93088 9.96016 9.96017 9.93092 9.90781 Species 4 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 Species 5 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 Species 6 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1797 nni = 1229 hu = 3.43e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1015 nni = 717 hu = 1.01e-02 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2023 nni = 1385 hu = 1.25e-02 +t = 1.00e-01 nst = 65 nfe = 0 nfi = 1130 nni = 802 hu = 1.60e-02 -t = 1.00e+00 nst = 153 nfe = 0 nfi = 2474 nni = 1706 hu = 6.52e-02 +t = 1.00e+00 nst = 83 nfe = 0 nfi = 1472 nni = 1054 hu = 8.85e-02 c values at t = 1: Species 1 -1.58851 1.59924 1.62152 1.64765 1.67036 1.68149 +1.58851 1.59924 1.62152 1.64764 1.67036 1.68149 1.58533 1.59503 1.61548 1.63952 1.66033 1.67036 -1.57757 1.58547 1.60239 1.62235 1.63952 1.64765 +1.57757 1.58547 1.60239 1.62235 1.63952 1.64764 1.5682 1.57412 1.58706 1.60239 1.61548 1.62152 1.56048 1.56463 1.57412 1.58547 1.59503 1.59924 1.55733 1.56048 1.5682 1.57757 1.58533 1.58851 @@ -210,7 +210,7 @@ Species 2 1.59067 1.60141 1.62371 1.64987 1.67261 1.68375 1.58748 1.5972 1.61766 1.64173 1.66257 1.67261 1.57971 1.58763 1.60457 1.62454 1.64173 1.64987 -1.57034 1.57626 1.58922 1.60457 1.61766 1.62371 +1.57034 1.57626 1.58921 1.60457 1.61766 1.62371 1.56261 1.56676 1.57626 1.58763 1.5972 1.60141 1.55945 1.56261 1.57034 1.57971 1.58748 1.59067 @@ -225,32 +225,32 @@ Species 3 Species 4 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 Species 5 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 Species 6 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 -t = 2.00e+00 nst = 164 nfe = 0 nfi = 2647 nni = 1824 hu = 1.58e-01 +t = 2.00e+00 nst = 100 nfe = 0 nfi = 1815 nni = 1301 hu = 5.29e-02 -t = 3.00e+00 nst = 170 nfe = 0 nfi = 2737 nni = 1884 hu = 1.58e-01 +t = 3.00e+00 nst = 113 nfe = 0 nfi = 2082 nni = 1491 hu = 9.87e-02 -t = 4.00e+00 nst = 176 nfe = 0 nfi = 2843 nni = 1955 hu = 1.85e-01 +t = 4.00e+00 nst = 120 nfe = 0 nfi = 2202 nni = 1574 hu = 2.96e-01 c values at t = 4: @@ -259,11 +259,11 @@ Species 1 1.1928 1.20035 1.21636 1.23523 1.25154 1.25935 1.18657 1.19274 1.20602 1.22173 1.23523 1.24157 1.17904 1.18368 1.19389 1.20602 1.21636 1.2211 -1.17284 1.17613 1.18368 1.19274 1.20035 1.20368 +1.17284 1.17612 1.18368 1.19274 1.20035 1.20368 1.17032 1.17284 1.17904 1.18657 1.1928 1.19535 Species 2 -1.19538 1.20371 1.22113 1.24161 1.25938 1.26804 +1.19538 1.20371 1.22113 1.24161 1.25938 1.26803 1.19284 1.20038 1.21639 1.23526 1.25157 1.25938 1.1866 1.19277 1.20606 1.22177 1.23526 1.24161 1.17908 1.18371 1.19393 1.20606 1.21639 1.22113 @@ -272,97 +272,97 @@ Species 2 Species 3 1.19542 1.20374 1.22116 1.24164 1.25942 1.26807 -1.19287 1.20042 1.21642 1.2353 1.2516 1.25942 -1.18663 1.1928 1.20609 1.2218 1.2353 1.24164 +1.19287 1.20041 1.21642 1.23529 1.2516 1.25942 +1.18663 1.1928 1.20609 1.2218 1.23529 1.24164 1.17911 1.18374 1.19396 1.20609 1.21642 1.22116 -1.17291 1.17619 1.18374 1.1928 1.20042 1.20374 +1.17291 1.17619 1.18374 1.1928 1.20041 1.20374 1.17039 1.17291 1.17911 1.18663 1.19287 1.19542 Species 4 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 Species 5 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 Species 6 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 -t = 5.00e+00 nst = 181 nfe = 0 nfi = 2911 nni = 1998 hu = 2.46e-01 +t = 5.00e+00 nst = 123 nfe = 0 nfi = 2259 nni = 1614 hu = 5.34e-01 -t = 6.00e+00 nst = 184 nfe = 0 nfi = 2950 nni = 2022 hu = 3.05e-01 +t = 6.00e+00 nst = 124 nfe = 0 nfi = 2275 nni = 1625 hu = 9.98e-01 -t = 7.00e+00 nst = 186 nfe = 0 nfi = 2975 nni = 2037 hu = 4.87e-01 +t = 7.00e+00 nst = 125 nfe = 0 nfi = 2290 nni = 1635 hu = 1.72e+00 c values at t = 7: Species 1 -1.18854 1.19682 1.21415 1.23453 1.25221 1.26082 -1.186 1.19351 1.20944 1.22822 1.24444 1.25221 -1.1798 1.18593 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18708 1.19916 1.20944 1.21415 -1.16614 1.1694 1.17692 1.18593 1.19351 1.19682 -1.16363 1.16614 1.17231 1.1798 1.186 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26081 +1.186 1.1935 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.16939 1.17691 1.18593 1.1935 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 2 -1.18854 1.19683 1.21415 1.23453 1.25222 1.26082 -1.186 1.19351 1.20944 1.22822 1.24444 1.25222 -1.1798 1.18594 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18709 1.19916 1.20944 1.21415 -1.16614 1.1694 1.17692 1.18594 1.19351 1.19683 -1.16363 1.16614 1.17231 1.1798 1.186 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26081 +1.186 1.19351 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.1694 1.17691 1.18593 1.19351 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 3 -1.18854 1.19683 1.21416 1.23453 1.25222 1.26082 -1.18601 1.19351 1.20944 1.22822 1.24444 1.25222 -1.1798 1.18594 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18709 1.19916 1.20944 1.21416 -1.16614 1.1694 1.17692 1.18594 1.19351 1.19683 -1.16363 1.16614 1.17231 1.1798 1.18601 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26082 +1.186 1.19351 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.1694 1.17691 1.18593 1.19351 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 4 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 Species 5 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 Species 6 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 -t = 8.00e+00 nst = 188 nfe = 0 nfi = 3003 nni = 2055 hu = 7.64e-01 +t = 8.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 9.00e+00 nst = 189 nfe = 0 nfi = 3015 nni = 2062 hu = 7.64e-01 +t = 9.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 1.00e+01 nst = 190 nfe = 0 nfi = 3030 nni = 2072 hu = 1.57e+00 +t = 1.00e+01 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 c values at t = 10: @@ -391,51 +391,51 @@ Species 3 1.16347 1.16598 1.17215 1.17964 1.18585 1.18838 Species 4 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Species 5 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Species 6 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 143 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 147 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 190 + Number of steps = 126 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 3030 - Number of f-s (SPGMR) = 6097 - Number of f-s (TOTAL) = 6097 - Number of setups = 38 - Number of nonlinear iterations = 2072 - Number of linear iterations = 6097 - Number of preconditioner evaluations = 38 - Number of preconditioner solves = 8080 - Number of error test failures = 1 - Number of nonlinear conv. failures = 0 - Number of linear convergence failures = 182 - Average Krylov subspace dimension = 2.943 + Number of f-s (implicit) = 2305 + Number of f-s (SPGMR) = 5210 + Number of f-s (TOTAL) = 5210 + Number of setups = 80 + Number of nonlinear iterations = 1645 + Number of linear iterations = 5210 + Number of preconditioner evaluations = 80 + Number of preconditioner solves = 6806 + Number of error test failures = 0 + Number of nonlinear conv. failures = 29 + Number of linear convergence failures = 228 + Average Krylov subspace dimension = 3.167 ---------------------------------------------------------------------------- @@ -447,64 +447,64 @@ Preconditioner type is jpre = SUN_PREC_LEFT Gram-Schmidt method type is gstype = SUN_CLASSICAL_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.51e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.90e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1797 nni = 1229 hu = 3.43e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1015 nni = 717 hu = 1.01e-02 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2023 nni = 1385 hu = 1.25e-02 +t = 1.00e-01 nst = 65 nfe = 0 nfi = 1130 nni = 802 hu = 1.60e-02 -t = 1.00e+00 nst = 153 nfe = 0 nfi = 2474 nni = 1706 hu = 6.52e-02 +t = 1.00e+00 nst = 83 nfe = 0 nfi = 1472 nni = 1054 hu = 8.85e-02 -t = 2.00e+00 nst = 164 nfe = 0 nfi = 2647 nni = 1824 hu = 1.58e-01 +t = 2.00e+00 nst = 100 nfe = 0 nfi = 1815 nni = 1301 hu = 5.28e-02 -t = 3.00e+00 nst = 170 nfe = 0 nfi = 2737 nni = 1884 hu = 1.58e-01 +t = 3.00e+00 nst = 113 nfe = 0 nfi = 2082 nni = 1491 hu = 9.87e-02 -t = 4.00e+00 nst = 176 nfe = 0 nfi = 2843 nni = 1955 hu = 1.85e-01 +t = 4.00e+00 nst = 120 nfe = 0 nfi = 2202 nni = 1574 hu = 2.96e-01 -t = 5.00e+00 nst = 181 nfe = 0 nfi = 2911 nni = 1998 hu = 2.46e-01 +t = 5.00e+00 nst = 123 nfe = 0 nfi = 2259 nni = 1614 hu = 5.33e-01 -t = 6.00e+00 nst = 184 nfe = 0 nfi = 2950 nni = 2022 hu = 3.05e-01 +t = 6.00e+00 nst = 124 nfe = 0 nfi = 2275 nni = 1625 hu = 9.98e-01 -t = 7.00e+00 nst = 186 nfe = 0 nfi = 2975 nni = 2037 hu = 4.86e-01 +t = 7.00e+00 nst = 125 nfe = 0 nfi = 2290 nni = 1635 hu = 1.72e+00 -t = 8.00e+00 nst = 188 nfe = 0 nfi = 3003 nni = 2055 hu = 7.64e-01 +t = 8.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 9.00e+00 nst = 189 nfe = 0 nfi = 3015 nni = 2062 hu = 7.64e-01 +t = 9.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 1.00e+01 nst = 190 nfe = 0 nfi = 3030 nni = 2072 hu = 1.57e+00 +t = 1.00e+01 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 148 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 153 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 190 + Number of steps = 126 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 3030 - Number of f-s (SPGMR) = 6096 - Number of f-s (TOTAL) = 6096 - Number of setups = 38 - Number of nonlinear iterations = 2072 - Number of linear iterations = 6096 - Number of preconditioner evaluations = 38 - Number of preconditioner solves = 8079 - Number of error test failures = 1 - Number of nonlinear conv. failures = 0 - Number of linear convergence failures = 182 - Average Krylov subspace dimension = 2.942 + Number of f-s (implicit) = 2305 + Number of f-s (SPGMR) = 5210 + Number of f-s (TOTAL) = 5210 + Number of setups = 80 + Number of nonlinear iterations = 1645 + Number of linear iterations = 5210 + Number of preconditioner evaluations = 80 + Number of preconditioner solves = 6806 + Number of error test failures = 0 + Number of nonlinear conv. failures = 29 + Number of linear convergence failures = 228 + Average Krylov subspace dimension = 3.167 ---------------------------------------------------------------------------- @@ -516,64 +516,64 @@ Preconditioner type is jpre = SUN_PREC_RIGHT Gram-Schmidt method type is gstype = SUN_MODIFIED_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.49e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.86e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1799 nni = 1231 hu = 3.79e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1027 nni = 726 hu = 2.51e-03 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2028 nni = 1390 hu = 1.32e-02 +t = 1.00e-01 nst = 72 nfe = 0 nfi = 1303 nni = 928 hu = 6.16e-03 -t = 1.00e+00 nst = 164 nfe = 0 nfi = 2669 nni = 1844 hu = 4.98e-02 +t = 1.00e+00 nst = 124 nfe = 0 nfi = 2243 nni = 1598 hu = 2.32e-02 -t = 2.00e+00 nst = 213 nfe = 0 nfi = 3526 nni = 2444 hu = 2.37e-02 +t = 2.00e+00 nst = 150 nfe = 0 nfi = 2672 nni = 1897 hu = 6.35e-02 -t = 3.00e+00 nst = 248 nfe = 0 nfi = 4087 nni = 2830 hu = 3.53e-02 +t = 3.00e+00 nst = 178 nfe = 0 nfi = 3178 nni = 2253 hu = 4.48e-02 -t = 4.00e+00 nst = 272 nfe = 0 nfi = 4465 nni = 3088 hu = 3.22e-02 +t = 4.00e+00 nst = 197 nfe = 0 nfi = 3492 nni = 2470 hu = 8.26e-02 -t = 5.00e+00 nst = 299 nfe = 0 nfi = 4876 nni = 3363 hu = 3.94e-02 +t = 5.00e+00 nst = 209 nfe = 0 nfi = 3678 nni = 2596 hu = 9.29e-02 -t = 6.00e+00 nst = 316 nfe = 0 nfi = 5130 nni = 3532 hu = 6.86e-02 +t = 6.00e+00 nst = 221 nfe = 0 nfi = 3860 nni = 2718 hu = 1.35e-01 -t = 7.00e+00 nst = 329 nfe = 0 nfi = 5315 nni = 3652 hu = 8.22e-02 +t = 7.00e+00 nst = 233 nfe = 0 nfi = 4050 nni = 2845 hu = 5.14e-02 -t = 8.00e+00 nst = 339 nfe = 0 nfi = 5455 nni = 3742 hu = 1.18e-01 +t = 8.00e+00 nst = 243 nfe = 0 nfi = 4202 nni = 2945 hu = 1.77e-01 -t = 9.00e+00 nst = 345 nfe = 0 nfi = 5536 nni = 3793 hu = 2.11e-01 +t = 9.00e+00 nst = 250 nfe = 0 nfi = 4307 nni = 3012 hu = 2.19e-01 -t = 1.00e+01 nst = 349 nfe = 0 nfi = 5589 nni = 3826 hu = 2.80e-01 +t = 1.00e+01 nst = 256 nfe = 0 nfi = 4390 nni = 3065 hu = 1.33e-01 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 153 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 159 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 349 + Number of steps = 256 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 5589 - Number of f-s (SPGMR) = 12378 - Number of f-s (TOTAL) = 12378 - Number of setups = 244 - Number of nonlinear iterations = 3826 - Number of linear iterations = 12378 - Number of preconditioner evaluations = 244 - Number of preconditioner solves = 15957 + Number of f-s (implicit) = 4390 + Number of f-s (SPGMR) = 10822 + Number of f-s (TOTAL) = 10822 + Number of setups = 245 + Number of nonlinear iterations = 3065 + Number of linear iterations = 10822 + Number of preconditioner evaluations = 245 + Number of preconditioner solves = 13664 Number of error test failures = 0 - Number of nonlinear conv. failures = 113 - Number of linear convergence failures = 977 - Average Krylov subspace dimension = 3.235 + Number of nonlinear conv. failures = 127 + Number of linear convergence failures = 916 + Average Krylov subspace dimension = 3.531 ---------------------------------------------------------------------------- @@ -585,64 +585,64 @@ Preconditioner type is jpre = SUN_PREC_RIGHT Gram-Schmidt method type is gstype = SUN_CLASSICAL_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.49e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.86e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1799 nni = 1231 hu = 3.79e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1027 nni = 726 hu = 2.51e-03 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2028 nni = 1390 hu = 1.32e-02 +t = 1.00e-01 nst = 72 nfe = 0 nfi = 1303 nni = 928 hu = 6.16e-03 -t = 1.00e+00 nst = 164 nfe = 0 nfi = 2669 nni = 1844 hu = 4.98e-02 +t = 1.00e+00 nst = 124 nfe = 0 nfi = 2243 nni = 1598 hu = 2.32e-02 -t = 2.00e+00 nst = 213 nfe = 0 nfi = 3526 nni = 2444 hu = 2.37e-02 +t = 2.00e+00 nst = 150 nfe = 0 nfi = 2672 nni = 1897 hu = 6.35e-02 -t = 3.00e+00 nst = 248 nfe = 0 nfi = 4087 nni = 2830 hu = 3.53e-02 +t = 3.00e+00 nst = 178 nfe = 0 nfi = 3178 nni = 2253 hu = 4.48e-02 -t = 4.00e+00 nst = 272 nfe = 0 nfi = 4465 nni = 3088 hu = 3.22e-02 +t = 4.00e+00 nst = 197 nfe = 0 nfi = 3492 nni = 2470 hu = 8.26e-02 -t = 5.00e+00 nst = 299 nfe = 0 nfi = 4876 nni = 3363 hu = 3.94e-02 +t = 5.00e+00 nst = 209 nfe = 0 nfi = 3678 nni = 2596 hu = 9.29e-02 -t = 6.00e+00 nst = 316 nfe = 0 nfi = 5130 nni = 3532 hu = 6.86e-02 +t = 6.00e+00 nst = 221 nfe = 0 nfi = 3860 nni = 2718 hu = 1.35e-01 -t = 7.00e+00 nst = 329 nfe = 0 nfi = 5315 nni = 3652 hu = 8.22e-02 +t = 7.00e+00 nst = 233 nfe = 0 nfi = 4050 nni = 2845 hu = 5.15e-02 -t = 8.00e+00 nst = 339 nfe = 0 nfi = 5455 nni = 3742 hu = 1.19e-01 +t = 8.00e+00 nst = 243 nfe = 0 nfi = 4202 nni = 2945 hu = 1.77e-01 -t = 9.00e+00 nst = 345 nfe = 0 nfi = 5536 nni = 3793 hu = 2.11e-01 +t = 9.00e+00 nst = 250 nfe = 0 nfi = 4307 nni = 3012 hu = 2.19e-01 -t = 1.00e+01 nst = 349 nfe = 0 nfi = 5589 nni = 3826 hu = 2.80e-01 +t = 1.00e+01 nst = 256 nfe = 0 nfi = 4390 nni = 3065 hu = 1.33e-01 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 158 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 165 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 349 + Number of steps = 256 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 5589 - Number of f-s (SPGMR) = 12378 - Number of f-s (TOTAL) = 12378 - Number of setups = 244 - Number of nonlinear iterations = 3826 - Number of linear iterations = 12378 - Number of preconditioner evaluations = 244 - Number of preconditioner solves = 15957 + Number of f-s (implicit) = 4390 + Number of f-s (SPGMR) = 10824 + Number of f-s (TOTAL) = 10824 + Number of setups = 245 + Number of nonlinear iterations = 3065 + Number of linear iterations = 10824 + Number of preconditioner evaluations = 245 + Number of preconditioner solves = 13666 Number of error test failures = 0 - Number of nonlinear conv. failures = 113 - Number of linear convergence failures = 976 - Average Krylov subspace dimension = 3.235 + Number of nonlinear conv. failures = 127 + Number of linear convergence failures = 916 + Average Krylov subspace dimension = 3.531 ---------------------------------------------------------------------------- diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out b/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out index e60c62304f..d7eedfc076 100644 --- a/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out +++ b/examples/arkode/C_serial/ark_KrylovDemo_prec_1.out @@ -78,11 +78,11 @@ Species 6 10 11.0066 12.2649 12.2649 11.0066 10 10 10 10 10 10 10 -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 c values at t = 1e-06: @@ -111,34 +111,34 @@ Species 3 9.99991 9.99994 9.99997 9.99997 9.99994 9.99991 Species 4 -13.4984 13.4984 13.4984 13.4984 13.4984 13.4984 -13.4984 14.55 15.8924 15.8924 14.55 13.4984 -13.4984 15.8924 19.0296 19.0296 15.8924 13.4984 -13.4984 15.8924 19.0296 19.0296 15.8924 13.4984 -13.4984 14.55 15.8924 15.8924 14.55 13.4984 -13.4984 13.4984 13.4984 13.4984 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 14.5495 15.8919 15.8919 14.5495 13.4981 +13.4981 15.8919 19.0287 19.0287 15.8919 13.4981 +13.4981 15.8919 19.0287 19.0287 15.8919 13.4981 +13.4981 14.5495 15.8919 15.8919 14.5495 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 Species 5 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 -13.4984 14.7787 16.4136 16.4136 14.7787 13.4984 -13.4985 16.4136 20.236 20.236 16.4136 13.4985 -13.4985 16.4136 20.236 20.236 16.4136 13.4985 -13.4984 14.7787 16.4136 16.4136 14.7787 13.4984 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 14.7783 16.4131 16.4131 14.7783 13.4981 +13.4981 16.4131 20.235 20.235 16.4131 13.4981 +13.4981 16.4131 20.235 20.235 16.4131 13.4981 +13.4981 14.7783 16.4131 16.4131 14.7783 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 Species 6 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 -13.4984 15.0075 16.9348 16.9348 15.0075 13.4984 -13.4985 16.9348 21.4423 21.4423 16.9348 13.4985 -13.4985 16.9348 21.4423 21.4423 16.9348 13.4985 -13.4984 15.0075 16.9348 16.9348 15.0075 13.4984 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 15.007 16.9343 16.9343 15.007 13.4981 +13.4981 16.9343 21.4413 21.4413 16.9343 13.4981 +13.4981 16.9343 21.4413 21.4413 16.9343 13.4981 +13.4981 15.007 16.9343 16.9343 15.007 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.51e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.90e-03 c values at t = 0.001: @@ -167,41 +167,41 @@ Species 3 9.90776 9.93088 9.96016 9.96017 9.93092 9.90781 Species 4 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 Species 5 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 Species 6 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1797 nni = 1229 hu = 3.43e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1015 nni = 717 hu = 1.01e-02 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2023 nni = 1385 hu = 1.25e-02 +t = 1.00e-01 nst = 65 nfe = 0 nfi = 1130 nni = 802 hu = 1.60e-02 -t = 1.00e+00 nst = 153 nfe = 0 nfi = 2474 nni = 1706 hu = 6.52e-02 +t = 1.00e+00 nst = 83 nfe = 0 nfi = 1472 nni = 1054 hu = 8.85e-02 c values at t = 1: Species 1 -1.58851 1.59924 1.62152 1.64765 1.67036 1.68149 +1.58851 1.59924 1.62152 1.64764 1.67036 1.68149 1.58533 1.59503 1.61548 1.63952 1.66033 1.67036 -1.57757 1.58547 1.60239 1.62235 1.63952 1.64765 +1.57757 1.58547 1.60239 1.62235 1.63952 1.64764 1.5682 1.57412 1.58706 1.60239 1.61548 1.62152 1.56048 1.56463 1.57412 1.58547 1.59503 1.59924 1.55733 1.56048 1.5682 1.57757 1.58533 1.58851 @@ -210,7 +210,7 @@ Species 2 1.59067 1.60141 1.62371 1.64987 1.67261 1.68375 1.58748 1.5972 1.61766 1.64173 1.66257 1.67261 1.57971 1.58763 1.60457 1.62454 1.64173 1.64987 -1.57034 1.57626 1.58922 1.60457 1.61766 1.62371 +1.57034 1.57626 1.58921 1.60457 1.61766 1.62371 1.56261 1.56676 1.57626 1.58763 1.5972 1.60141 1.55945 1.56261 1.57034 1.57971 1.58748 1.59067 @@ -225,32 +225,32 @@ Species 3 Species 4 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 Species 5 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 Species 6 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 -t = 2.00e+00 nst = 164 nfe = 0 nfi = 2647 nni = 1824 hu = 1.58e-01 +t = 2.00e+00 nst = 100 nfe = 0 nfi = 1815 nni = 1301 hu = 5.29e-02 -t = 3.00e+00 nst = 170 nfe = 0 nfi = 2737 nni = 1884 hu = 1.58e-01 +t = 3.00e+00 nst = 113 nfe = 0 nfi = 2082 nni = 1491 hu = 9.87e-02 -t = 4.00e+00 nst = 176 nfe = 0 nfi = 2843 nni = 1955 hu = 1.85e-01 +t = 4.00e+00 nst = 120 nfe = 0 nfi = 2202 nni = 1574 hu = 2.96e-01 c values at t = 4: @@ -259,11 +259,11 @@ Species 1 1.1928 1.20035 1.21636 1.23523 1.25154 1.25935 1.18657 1.19274 1.20602 1.22173 1.23523 1.24157 1.17904 1.18368 1.19389 1.20602 1.21636 1.2211 -1.17284 1.17613 1.18368 1.19274 1.20035 1.20368 +1.17284 1.17612 1.18368 1.19274 1.20035 1.20368 1.17032 1.17284 1.17904 1.18657 1.1928 1.19535 Species 2 -1.19538 1.20371 1.22113 1.24161 1.25938 1.26804 +1.19538 1.20371 1.22113 1.24161 1.25938 1.26803 1.19284 1.20038 1.21639 1.23526 1.25157 1.25938 1.1866 1.19277 1.20606 1.22177 1.23526 1.24161 1.17908 1.18371 1.19393 1.20606 1.21639 1.22113 @@ -272,97 +272,97 @@ Species 2 Species 3 1.19542 1.20374 1.22116 1.24164 1.25942 1.26807 -1.19287 1.20042 1.21642 1.2353 1.2516 1.25942 -1.18663 1.1928 1.20609 1.2218 1.2353 1.24164 +1.19287 1.20041 1.21642 1.23529 1.2516 1.25942 +1.18663 1.1928 1.20609 1.2218 1.23529 1.24164 1.17911 1.18374 1.19396 1.20609 1.21642 1.22116 -1.17291 1.17619 1.18374 1.1928 1.20042 1.20374 +1.17291 1.17619 1.18374 1.1928 1.20041 1.20374 1.17039 1.17291 1.17911 1.18663 1.19287 1.19542 Species 4 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 Species 5 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 Species 6 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 -t = 5.00e+00 nst = 181 nfe = 0 nfi = 2911 nni = 1998 hu = 2.46e-01 +t = 5.00e+00 nst = 123 nfe = 0 nfi = 2259 nni = 1614 hu = 5.34e-01 -t = 6.00e+00 nst = 184 nfe = 0 nfi = 2950 nni = 2022 hu = 3.05e-01 +t = 6.00e+00 nst = 124 nfe = 0 nfi = 2275 nni = 1625 hu = 9.98e-01 -t = 7.00e+00 nst = 186 nfe = 0 nfi = 2975 nni = 2037 hu = 4.87e-01 +t = 7.00e+00 nst = 125 nfe = 0 nfi = 2290 nni = 1635 hu = 1.72e+00 c values at t = 7: Species 1 -1.18854 1.19682 1.21415 1.23453 1.25221 1.26082 -1.186 1.19351 1.20944 1.22822 1.24444 1.25221 -1.1798 1.18593 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18708 1.19916 1.20944 1.21415 -1.16614 1.1694 1.17692 1.18593 1.19351 1.19682 -1.16363 1.16614 1.17231 1.1798 1.186 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26081 +1.186 1.1935 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.16939 1.17691 1.18593 1.1935 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 2 -1.18854 1.19683 1.21415 1.23453 1.25222 1.26082 -1.186 1.19351 1.20944 1.22822 1.24444 1.25222 -1.1798 1.18594 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18709 1.19916 1.20944 1.21415 -1.16614 1.1694 1.17692 1.18594 1.19351 1.19683 -1.16363 1.16614 1.17231 1.1798 1.186 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26081 +1.186 1.19351 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.1694 1.17691 1.18593 1.19351 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 3 -1.18854 1.19683 1.21416 1.23453 1.25222 1.26082 -1.18601 1.19351 1.20944 1.22822 1.24444 1.25222 -1.1798 1.18594 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18709 1.19916 1.20944 1.21416 -1.16614 1.1694 1.17692 1.18594 1.19351 1.19683 -1.16363 1.16614 1.17231 1.1798 1.18601 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26082 +1.186 1.19351 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.1694 1.17691 1.18593 1.19351 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 4 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 Species 5 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 Species 6 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 -t = 8.00e+00 nst = 188 nfe = 0 nfi = 3003 nni = 2055 hu = 7.64e-01 +t = 8.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 9.00e+00 nst = 189 nfe = 0 nfi = 3015 nni = 2062 hu = 7.64e-01 +t = 9.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 1.00e+01 nst = 190 nfe = 0 nfi = 3030 nni = 2072 hu = 1.57e+00 +t = 1.00e+01 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 c values at t = 10: @@ -391,51 +391,51 @@ Species 3 1.16347 1.16598 1.17215 1.17964 1.18585 1.18838 Species 4 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Species 5 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Species 6 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 143 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 147 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 190 + Number of steps = 126 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 3030 - Number of f-s (SPGMR) = 6097 - Number of f-s (TOTAL) = 6097 - Number of setups = 38 - Number of nonlinear iterations = 2072 - Number of linear iterations = 6097 - Number of preconditioner evaluations = 38 - Number of preconditioner solves = 8080 - Number of error test failures = 1 - Number of nonlinear conv. failures = 0 - Number of linear convergence failures = 182 - Average Krylov subspace dimension = 2.943 + Number of f-s (implicit) = 2305 + Number of f-s (SPGMR) = 5210 + Number of f-s (TOTAL) = 5210 + Number of setups = 80 + Number of nonlinear iterations = 1645 + Number of linear iterations = 5210 + Number of preconditioner evaluations = 80 + Number of preconditioner solves = 6806 + Number of error test failures = 0 + Number of nonlinear conv. failures = 29 + Number of linear convergence failures = 228 + Average Krylov subspace dimension = 3.167 ---------------------------------------------------------------------------- @@ -447,64 +447,64 @@ Preconditioner type is jpre = SUN_PREC_LEFT Gram-Schmidt method type is gstype = SUN_CLASSICAL_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.51e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.90e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1797 nni = 1229 hu = 3.43e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1015 nni = 717 hu = 1.01e-02 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2023 nni = 1385 hu = 1.25e-02 +t = 1.00e-01 nst = 65 nfe = 0 nfi = 1130 nni = 802 hu = 1.60e-02 -t = 1.00e+00 nst = 153 nfe = 0 nfi = 2474 nni = 1706 hu = 6.52e-02 +t = 1.00e+00 nst = 83 nfe = 0 nfi = 1472 nni = 1054 hu = 8.85e-02 -t = 2.00e+00 nst = 164 nfe = 0 nfi = 2647 nni = 1824 hu = 1.58e-01 +t = 2.00e+00 nst = 100 nfe = 0 nfi = 1815 nni = 1301 hu = 5.28e-02 -t = 3.00e+00 nst = 170 nfe = 0 nfi = 2737 nni = 1884 hu = 1.58e-01 +t = 3.00e+00 nst = 113 nfe = 0 nfi = 2082 nni = 1491 hu = 9.87e-02 -t = 4.00e+00 nst = 176 nfe = 0 nfi = 2843 nni = 1955 hu = 1.85e-01 +t = 4.00e+00 nst = 120 nfe = 0 nfi = 2202 nni = 1574 hu = 2.96e-01 -t = 5.00e+00 nst = 181 nfe = 0 nfi = 2911 nni = 1998 hu = 2.46e-01 +t = 5.00e+00 nst = 123 nfe = 0 nfi = 2259 nni = 1614 hu = 5.33e-01 -t = 6.00e+00 nst = 184 nfe = 0 nfi = 2950 nni = 2022 hu = 3.05e-01 +t = 6.00e+00 nst = 124 nfe = 0 nfi = 2275 nni = 1625 hu = 9.98e-01 -t = 7.00e+00 nst = 186 nfe = 0 nfi = 2975 nni = 2037 hu = 4.86e-01 +t = 7.00e+00 nst = 125 nfe = 0 nfi = 2290 nni = 1635 hu = 1.72e+00 -t = 8.00e+00 nst = 188 nfe = 0 nfi = 3003 nni = 2055 hu = 7.64e-01 +t = 8.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 9.00e+00 nst = 189 nfe = 0 nfi = 3015 nni = 2062 hu = 7.64e-01 +t = 9.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 1.00e+01 nst = 190 nfe = 0 nfi = 3030 nni = 2072 hu = 1.57e+00 +t = 1.00e+01 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 148 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 153 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 190 + Number of steps = 126 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 3030 - Number of f-s (SPGMR) = 6096 - Number of f-s (TOTAL) = 6096 - Number of setups = 38 - Number of nonlinear iterations = 2072 - Number of linear iterations = 6096 - Number of preconditioner evaluations = 38 - Number of preconditioner solves = 8079 - Number of error test failures = 1 - Number of nonlinear conv. failures = 0 - Number of linear convergence failures = 182 - Average Krylov subspace dimension = 2.942 + Number of f-s (implicit) = 2305 + Number of f-s (SPGMR) = 5210 + Number of f-s (TOTAL) = 5210 + Number of setups = 80 + Number of nonlinear iterations = 1645 + Number of linear iterations = 5210 + Number of preconditioner evaluations = 80 + Number of preconditioner solves = 6806 + Number of error test failures = 0 + Number of nonlinear conv. failures = 29 + Number of linear convergence failures = 228 + Average Krylov subspace dimension = 3.167 ---------------------------------------------------------------------------- @@ -516,64 +516,64 @@ Preconditioner type is jpre = SUN_PREC_RIGHT Gram-Schmidt method type is gstype = SUN_MODIFIED_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.49e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.86e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1799 nni = 1231 hu = 3.79e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1027 nni = 726 hu = 2.51e-03 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2028 nni = 1390 hu = 1.32e-02 +t = 1.00e-01 nst = 72 nfe = 0 nfi = 1303 nni = 928 hu = 6.16e-03 -t = 1.00e+00 nst = 164 nfe = 0 nfi = 2669 nni = 1844 hu = 4.98e-02 +t = 1.00e+00 nst = 124 nfe = 0 nfi = 2243 nni = 1598 hu = 2.32e-02 -t = 2.00e+00 nst = 213 nfe = 0 nfi = 3526 nni = 2444 hu = 2.37e-02 +t = 2.00e+00 nst = 150 nfe = 0 nfi = 2672 nni = 1897 hu = 6.35e-02 -t = 3.00e+00 nst = 248 nfe = 0 nfi = 4087 nni = 2830 hu = 3.53e-02 +t = 3.00e+00 nst = 178 nfe = 0 nfi = 3178 nni = 2253 hu = 4.48e-02 -t = 4.00e+00 nst = 272 nfe = 0 nfi = 4465 nni = 3088 hu = 3.22e-02 +t = 4.00e+00 nst = 197 nfe = 0 nfi = 3492 nni = 2470 hu = 8.26e-02 -t = 5.00e+00 nst = 299 nfe = 0 nfi = 4876 nni = 3363 hu = 3.94e-02 +t = 5.00e+00 nst = 209 nfe = 0 nfi = 3678 nni = 2596 hu = 9.29e-02 -t = 6.00e+00 nst = 316 nfe = 0 nfi = 5130 nni = 3532 hu = 6.86e-02 +t = 6.00e+00 nst = 221 nfe = 0 nfi = 3860 nni = 2718 hu = 1.35e-01 -t = 7.00e+00 nst = 329 nfe = 0 nfi = 5315 nni = 3652 hu = 8.22e-02 +t = 7.00e+00 nst = 233 nfe = 0 nfi = 4050 nni = 2845 hu = 5.14e-02 -t = 8.00e+00 nst = 339 nfe = 0 nfi = 5455 nni = 3742 hu = 1.18e-01 +t = 8.00e+00 nst = 243 nfe = 0 nfi = 4202 nni = 2945 hu = 1.77e-01 -t = 9.00e+00 nst = 345 nfe = 0 nfi = 5536 nni = 3793 hu = 2.11e-01 +t = 9.00e+00 nst = 250 nfe = 0 nfi = 4307 nni = 3012 hu = 2.19e-01 -t = 1.00e+01 nst = 349 nfe = 0 nfi = 5589 nni = 3826 hu = 2.80e-01 +t = 1.00e+01 nst = 256 nfe = 0 nfi = 4390 nni = 3065 hu = 1.33e-01 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 153 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 159 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 349 + Number of steps = 256 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 5589 - Number of f-s (SPGMR) = 12378 - Number of f-s (TOTAL) = 12378 - Number of setups = 244 - Number of nonlinear iterations = 3826 - Number of linear iterations = 12378 - Number of preconditioner evaluations = 244 - Number of preconditioner solves = 15957 + Number of f-s (implicit) = 4390 + Number of f-s (SPGMR) = 10822 + Number of f-s (TOTAL) = 10822 + Number of setups = 245 + Number of nonlinear iterations = 3065 + Number of linear iterations = 10822 + Number of preconditioner evaluations = 245 + Number of preconditioner solves = 13664 Number of error test failures = 0 - Number of nonlinear conv. failures = 113 - Number of linear convergence failures = 977 - Average Krylov subspace dimension = 3.235 + Number of nonlinear conv. failures = 127 + Number of linear convergence failures = 916 + Average Krylov subspace dimension = 3.531 ---------------------------------------------------------------------------- @@ -585,64 +585,64 @@ Preconditioner type is jpre = SUN_PREC_RIGHT Gram-Schmidt method type is gstype = SUN_CLASSICAL_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.49e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.86e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1799 nni = 1231 hu = 3.79e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1027 nni = 726 hu = 2.51e-03 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2028 nni = 1390 hu = 1.32e-02 +t = 1.00e-01 nst = 72 nfe = 0 nfi = 1303 nni = 928 hu = 6.16e-03 -t = 1.00e+00 nst = 164 nfe = 0 nfi = 2669 nni = 1844 hu = 4.98e-02 +t = 1.00e+00 nst = 124 nfe = 0 nfi = 2243 nni = 1598 hu = 2.32e-02 -t = 2.00e+00 nst = 213 nfe = 0 nfi = 3526 nni = 2444 hu = 2.37e-02 +t = 2.00e+00 nst = 150 nfe = 0 nfi = 2672 nni = 1897 hu = 6.35e-02 -t = 3.00e+00 nst = 248 nfe = 0 nfi = 4087 nni = 2830 hu = 3.53e-02 +t = 3.00e+00 nst = 178 nfe = 0 nfi = 3178 nni = 2253 hu = 4.48e-02 -t = 4.00e+00 nst = 272 nfe = 0 nfi = 4465 nni = 3088 hu = 3.22e-02 +t = 4.00e+00 nst = 197 nfe = 0 nfi = 3492 nni = 2470 hu = 8.26e-02 -t = 5.00e+00 nst = 299 nfe = 0 nfi = 4876 nni = 3363 hu = 3.94e-02 +t = 5.00e+00 nst = 209 nfe = 0 nfi = 3678 nni = 2596 hu = 9.29e-02 -t = 6.00e+00 nst = 316 nfe = 0 nfi = 5130 nni = 3532 hu = 6.86e-02 +t = 6.00e+00 nst = 221 nfe = 0 nfi = 3860 nni = 2718 hu = 1.35e-01 -t = 7.00e+00 nst = 329 nfe = 0 nfi = 5315 nni = 3652 hu = 8.22e-02 +t = 7.00e+00 nst = 233 nfe = 0 nfi = 4050 nni = 2845 hu = 5.15e-02 -t = 8.00e+00 nst = 339 nfe = 0 nfi = 5455 nni = 3742 hu = 1.19e-01 +t = 8.00e+00 nst = 243 nfe = 0 nfi = 4202 nni = 2945 hu = 1.77e-01 -t = 9.00e+00 nst = 345 nfe = 0 nfi = 5536 nni = 3793 hu = 2.11e-01 +t = 9.00e+00 nst = 250 nfe = 0 nfi = 4307 nni = 3012 hu = 2.19e-01 -t = 1.00e+01 nst = 349 nfe = 0 nfi = 5589 nni = 3826 hu = 2.80e-01 +t = 1.00e+01 nst = 256 nfe = 0 nfi = 4390 nni = 3065 hu = 1.33e-01 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 158 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 165 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 349 + Number of steps = 256 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 5589 - Number of f-s (SPGMR) = 12378 - Number of f-s (TOTAL) = 12378 - Number of setups = 244 - Number of nonlinear iterations = 3826 - Number of linear iterations = 12378 - Number of preconditioner evaluations = 244 - Number of preconditioner solves = 15957 + Number of f-s (implicit) = 4390 + Number of f-s (SPGMR) = 10824 + Number of f-s (TOTAL) = 10824 + Number of setups = 245 + Number of nonlinear iterations = 3065 + Number of linear iterations = 10824 + Number of preconditioner evaluations = 245 + Number of preconditioner solves = 13666 Number of error test failures = 0 - Number of nonlinear conv. failures = 113 - Number of linear convergence failures = 976 - Average Krylov subspace dimension = 3.235 + Number of nonlinear conv. failures = 127 + Number of linear convergence failures = 916 + Average Krylov subspace dimension = 3.531 ---------------------------------------------------------------------------- diff --git a/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out b/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out index e60c62304f..d7eedfc076 100644 --- a/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out +++ b/examples/arkode/C_serial/ark_KrylovDemo_prec_2.out @@ -78,11 +78,11 @@ Species 6 10 11.0066 12.2649 12.2649 11.0066 10 10 10 10 10 10 10 -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 c values at t = 1e-06: @@ -111,34 +111,34 @@ Species 3 9.99991 9.99994 9.99997 9.99997 9.99994 9.99991 Species 4 -13.4984 13.4984 13.4984 13.4984 13.4984 13.4984 -13.4984 14.55 15.8924 15.8924 14.55 13.4984 -13.4984 15.8924 19.0296 19.0296 15.8924 13.4984 -13.4984 15.8924 19.0296 19.0296 15.8924 13.4984 -13.4984 14.55 15.8924 15.8924 14.55 13.4984 -13.4984 13.4984 13.4984 13.4984 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 14.5495 15.8919 15.8919 14.5495 13.4981 +13.4981 15.8919 19.0287 19.0287 15.8919 13.4981 +13.4981 15.8919 19.0287 19.0287 15.8919 13.4981 +13.4981 14.5495 15.8919 15.8919 14.5495 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 Species 5 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 -13.4984 14.7787 16.4136 16.4136 14.7787 13.4984 -13.4985 16.4136 20.236 20.236 16.4136 13.4985 -13.4985 16.4136 20.236 20.236 16.4136 13.4985 -13.4984 14.7787 16.4136 16.4136 14.7787 13.4984 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 14.7783 16.4131 16.4131 14.7783 13.4981 +13.4981 16.4131 20.235 20.235 16.4131 13.4981 +13.4981 16.4131 20.235 20.235 16.4131 13.4981 +13.4981 14.7783 16.4131 16.4131 14.7783 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 Species 6 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 -13.4984 15.0075 16.9348 16.9348 15.0075 13.4984 -13.4985 16.9348 21.4423 21.4423 16.9348 13.4985 -13.4985 16.9348 21.4423 21.4423 16.9348 13.4985 -13.4984 15.0075 16.9348 16.9348 15.0075 13.4984 -13.4984 13.4984 13.4985 13.4985 13.4984 13.4984 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 +13.4981 15.007 16.9343 16.9343 15.007 13.4981 +13.4981 16.9343 21.4413 21.4413 16.9343 13.4981 +13.4981 16.9343 21.4413 21.4413 16.9343 13.4981 +13.4981 15.007 16.9343 16.9343 15.007 13.4981 +13.498 13.4981 13.4981 13.4981 13.4981 13.498 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.51e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.90e-03 c values at t = 0.001: @@ -167,41 +167,41 @@ Species 3 9.90776 9.93088 9.96016 9.96017 9.93092 9.90781 Species 4 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 Species 5 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 Species 6 -297231 297749 298392 298451 297925 297520 +297231 297749 298393 298451 297925 297520 297692 307245 319327 319378 307390 297925 298276 319264 345799 345840 319378 298451 -298276 319252 345772 345799 319327 298392 +298276 319252 345772 345799 319327 298393 297691 307208 319252 319264 307245 297749 297229 297691 298276 298276 297692 297231 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1797 nni = 1229 hu = 3.43e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1015 nni = 717 hu = 1.01e-02 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2023 nni = 1385 hu = 1.25e-02 +t = 1.00e-01 nst = 65 nfe = 0 nfi = 1130 nni = 802 hu = 1.60e-02 -t = 1.00e+00 nst = 153 nfe = 0 nfi = 2474 nni = 1706 hu = 6.52e-02 +t = 1.00e+00 nst = 83 nfe = 0 nfi = 1472 nni = 1054 hu = 8.85e-02 c values at t = 1: Species 1 -1.58851 1.59924 1.62152 1.64765 1.67036 1.68149 +1.58851 1.59924 1.62152 1.64764 1.67036 1.68149 1.58533 1.59503 1.61548 1.63952 1.66033 1.67036 -1.57757 1.58547 1.60239 1.62235 1.63952 1.64765 +1.57757 1.58547 1.60239 1.62235 1.63952 1.64764 1.5682 1.57412 1.58706 1.60239 1.61548 1.62152 1.56048 1.56463 1.57412 1.58547 1.59503 1.59924 1.55733 1.56048 1.5682 1.57757 1.58533 1.58851 @@ -210,7 +210,7 @@ Species 2 1.59067 1.60141 1.62371 1.64987 1.67261 1.68375 1.58748 1.5972 1.61766 1.64173 1.66257 1.67261 1.57971 1.58763 1.60457 1.62454 1.64173 1.64987 -1.57034 1.57626 1.58922 1.60457 1.61766 1.62371 +1.57034 1.57626 1.58921 1.60457 1.61766 1.62371 1.56261 1.56676 1.57626 1.58763 1.5972 1.60141 1.55945 1.56261 1.57034 1.57971 1.58748 1.59067 @@ -225,32 +225,32 @@ Species 3 Species 4 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 Species 5 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 Species 6 47718.4 48040.3 48709 49493.5 50175.5 50509.4 47622.8 47914 48527.8 49249.6 49874.4 50175.5 -47389.7 47627 48135 48734.2 49249.6 49493.5 -47108.5 47286.1 47674.6 48135 48527.8 48709 -46876.6 47001.1 47286.1 47627 47914 48040.3 +47389.7 47627 48135 48734.1 49249.6 49493.5 +47108.5 47286 47674.6 48135 48527.8 48709 +46876.6 47001.1 47286 47627 47914 48040.3 46781.9 46876.6 47108.5 47389.7 47622.8 47718.4 -t = 2.00e+00 nst = 164 nfe = 0 nfi = 2647 nni = 1824 hu = 1.58e-01 +t = 2.00e+00 nst = 100 nfe = 0 nfi = 1815 nni = 1301 hu = 5.29e-02 -t = 3.00e+00 nst = 170 nfe = 0 nfi = 2737 nni = 1884 hu = 1.58e-01 +t = 3.00e+00 nst = 113 nfe = 0 nfi = 2082 nni = 1491 hu = 9.87e-02 -t = 4.00e+00 nst = 176 nfe = 0 nfi = 2843 nni = 1955 hu = 1.85e-01 +t = 4.00e+00 nst = 120 nfe = 0 nfi = 2202 nni = 1574 hu = 2.96e-01 c values at t = 4: @@ -259,11 +259,11 @@ Species 1 1.1928 1.20035 1.21636 1.23523 1.25154 1.25935 1.18657 1.19274 1.20602 1.22173 1.23523 1.24157 1.17904 1.18368 1.19389 1.20602 1.21636 1.2211 -1.17284 1.17613 1.18368 1.19274 1.20035 1.20368 +1.17284 1.17612 1.18368 1.19274 1.20035 1.20368 1.17032 1.17284 1.17904 1.18657 1.1928 1.19535 Species 2 -1.19538 1.20371 1.22113 1.24161 1.25938 1.26804 +1.19538 1.20371 1.22113 1.24161 1.25938 1.26803 1.19284 1.20038 1.21639 1.23526 1.25157 1.25938 1.1866 1.19277 1.20606 1.22177 1.23526 1.24161 1.17908 1.18371 1.19393 1.20606 1.21639 1.22113 @@ -272,97 +272,97 @@ Species 2 Species 3 1.19542 1.20374 1.22116 1.24164 1.25942 1.26807 -1.19287 1.20042 1.21642 1.2353 1.2516 1.25942 -1.18663 1.1928 1.20609 1.2218 1.2353 1.24164 +1.19287 1.20041 1.21642 1.23529 1.2516 1.25942 +1.18663 1.1928 1.20609 1.2218 1.23529 1.24164 1.17911 1.18374 1.19396 1.20609 1.21642 1.22116 -1.17291 1.17619 1.18374 1.1928 1.20042 1.20374 +1.17291 1.17619 1.18374 1.1928 1.20041 1.20374 1.17039 1.17291 1.17911 1.18663 1.19287 1.19542 Species 4 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 Species 5 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 Species 6 35860.6 36110.2 36632.4 37246.4 37779.5 38038.7 -35784.2 36010.4 36490.4 37056.3 37545.4 37779.5 +35784.2 36010.4 36490.4 37056.3 37545.3 37779.5 35597.2 35782 36180.5 36651.6 37056.3 37246.4 -35371.4 35510.3 35816.7 36180.5 36490.4 36632.4 -35185.4 35283.8 35510.3 35782 36010.4 36110.2 -35109.8 35185.4 35371.4 35597.2 35784.2 35860.6 +35371.4 35510.4 35816.7 36180.5 36490.4 36632.4 +35185.4 35283.8 35510.4 35782 36010.4 36110.2 +35109.7 35185.4 35371.4 35597.2 35784.2 35860.6 -t = 5.00e+00 nst = 181 nfe = 0 nfi = 2911 nni = 1998 hu = 2.46e-01 +t = 5.00e+00 nst = 123 nfe = 0 nfi = 2259 nni = 1614 hu = 5.34e-01 -t = 6.00e+00 nst = 184 nfe = 0 nfi = 2950 nni = 2022 hu = 3.05e-01 +t = 6.00e+00 nst = 124 nfe = 0 nfi = 2275 nni = 1625 hu = 9.98e-01 -t = 7.00e+00 nst = 186 nfe = 0 nfi = 2975 nni = 2037 hu = 4.87e-01 +t = 7.00e+00 nst = 125 nfe = 0 nfi = 2290 nni = 1635 hu = 1.72e+00 c values at t = 7: Species 1 -1.18854 1.19682 1.21415 1.23453 1.25221 1.26082 -1.186 1.19351 1.20944 1.22822 1.24444 1.25221 -1.1798 1.18593 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18708 1.19916 1.20944 1.21415 -1.16614 1.1694 1.17692 1.18593 1.19351 1.19682 -1.16363 1.16614 1.17231 1.1798 1.186 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26081 +1.186 1.1935 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.16939 1.17691 1.18593 1.1935 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 2 -1.18854 1.19683 1.21415 1.23453 1.25222 1.26082 -1.186 1.19351 1.20944 1.22822 1.24444 1.25222 -1.1798 1.18594 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18709 1.19916 1.20944 1.21415 -1.16614 1.1694 1.17692 1.18594 1.19351 1.19683 -1.16363 1.16614 1.17231 1.1798 1.186 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26081 +1.186 1.19351 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.1694 1.17691 1.18593 1.19351 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 3 -1.18854 1.19683 1.21416 1.23453 1.25222 1.26082 -1.18601 1.19351 1.20944 1.22822 1.24444 1.25222 -1.1798 1.18594 1.19916 1.21479 1.22822 1.23453 -1.17231 1.17692 1.18709 1.19916 1.20944 1.21416 -1.16614 1.1694 1.17692 1.18594 1.19351 1.19683 -1.16363 1.16614 1.17231 1.1798 1.18601 1.18854 +1.18853 1.19682 1.21415 1.23452 1.25221 1.26082 +1.186 1.19351 1.20943 1.22821 1.24444 1.25221 +1.17979 1.18593 1.19915 1.21478 1.22821 1.23452 +1.1723 1.17691 1.18708 1.19915 1.20943 1.21415 +1.16613 1.1694 1.17691 1.18593 1.19351 1.19682 +1.16362 1.16613 1.1723 1.17979 1.186 1.18853 Species 4 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 Species 5 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 Species 6 -35655.3 35903.6 36423.2 37034.1 37564.4 37822.3 -35579.3 35804.3 36281.9 36844.9 37331.5 37564.4 -35393.1 35577 35973.5 36442.3 36844.9 37034.1 -35168.4 35306.6 35611.5 35973.5 36281.9 36423.2 -34983.3 35081.1 35306.6 35577 35804.3 35903.6 -34907.9 34983.3 35168.4 35393.1 35579.3 35655.3 +35655.1 35903.4 36423 37033.9 37564.2 37822.1 +35579 35804.1 36281.7 36844.7 37331.3 37564.2 +35392.9 35576.8 35973.3 36442 36844.7 37033.9 +35168.2 35306.4 35611.2 35973.3 36281.7 36423 +34983 35081 35306.4 35576.8 35804.1 35903.4 +34907.7 34983 35168.2 35392.9 35579 35655.1 -t = 8.00e+00 nst = 188 nfe = 0 nfi = 3003 nni = 2055 hu = 7.64e-01 +t = 8.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 9.00e+00 nst = 189 nfe = 0 nfi = 3015 nni = 2062 hu = 7.64e-01 +t = 9.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 1.00e+01 nst = 190 nfe = 0 nfi = 3030 nni = 2072 hu = 1.57e+00 +t = 1.00e+01 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 c values at t = 10: @@ -391,51 +391,51 @@ Species 3 1.16347 1.16598 1.17215 1.17964 1.18585 1.18838 Species 4 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Species 5 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Species 6 -35650.6 35898.8 36418.3 37029.2 37559.5 37817.3 -35574.5 35799.5 36277.1 36840 37326.6 37559.5 -35388.4 35572.3 35968.7 36437.4 36840 37029.2 -35163.7 35301.9 35606.7 35968.7 36277.1 36418.3 -34978.6 35076.5 35301.9 35572.3 35799.5 35898.8 -34903.3 34978.6 35163.7 35388.4 35574.5 35650.6 +35650.5 35898.8 36418.3 37029.2 37559.5 37817.4 +35574.5 35799.5 36277 36840 37326.6 37559.5 +35388.3 35572.2 35968.7 36437.4 36840 37029.2 +35163.6 35301.9 35606.6 35968.7 36277 36418.3 +34978.5 35076.4 35301.9 35572.2 35799.5 35898.8 +34903.2 34978.5 35163.6 35388.3 35574.5 35650.5 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 143 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 147 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 190 + Number of steps = 126 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 3030 - Number of f-s (SPGMR) = 6097 - Number of f-s (TOTAL) = 6097 - Number of setups = 38 - Number of nonlinear iterations = 2072 - Number of linear iterations = 6097 - Number of preconditioner evaluations = 38 - Number of preconditioner solves = 8080 - Number of error test failures = 1 - Number of nonlinear conv. failures = 0 - Number of linear convergence failures = 182 - Average Krylov subspace dimension = 2.943 + Number of f-s (implicit) = 2305 + Number of f-s (SPGMR) = 5210 + Number of f-s (TOTAL) = 5210 + Number of setups = 80 + Number of nonlinear iterations = 1645 + Number of linear iterations = 5210 + Number of preconditioner evaluations = 80 + Number of preconditioner solves = 6806 + Number of error test failures = 0 + Number of nonlinear conv. failures = 29 + Number of linear convergence failures = 228 + Average Krylov subspace dimension = 3.167 ---------------------------------------------------------------------------- @@ -447,64 +447,64 @@ Preconditioner type is jpre = SUN_PREC_LEFT Gram-Schmidt method type is gstype = SUN_CLASSICAL_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.51e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.90e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1797 nni = 1229 hu = 3.43e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1015 nni = 717 hu = 1.01e-02 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2023 nni = 1385 hu = 1.25e-02 +t = 1.00e-01 nst = 65 nfe = 0 nfi = 1130 nni = 802 hu = 1.60e-02 -t = 1.00e+00 nst = 153 nfe = 0 nfi = 2474 nni = 1706 hu = 6.52e-02 +t = 1.00e+00 nst = 83 nfe = 0 nfi = 1472 nni = 1054 hu = 8.85e-02 -t = 2.00e+00 nst = 164 nfe = 0 nfi = 2647 nni = 1824 hu = 1.58e-01 +t = 2.00e+00 nst = 100 nfe = 0 nfi = 1815 nni = 1301 hu = 5.28e-02 -t = 3.00e+00 nst = 170 nfe = 0 nfi = 2737 nni = 1884 hu = 1.58e-01 +t = 3.00e+00 nst = 113 nfe = 0 nfi = 2082 nni = 1491 hu = 9.87e-02 -t = 4.00e+00 nst = 176 nfe = 0 nfi = 2843 nni = 1955 hu = 1.85e-01 +t = 4.00e+00 nst = 120 nfe = 0 nfi = 2202 nni = 1574 hu = 2.96e-01 -t = 5.00e+00 nst = 181 nfe = 0 nfi = 2911 nni = 1998 hu = 2.46e-01 +t = 5.00e+00 nst = 123 nfe = 0 nfi = 2259 nni = 1614 hu = 5.33e-01 -t = 6.00e+00 nst = 184 nfe = 0 nfi = 2950 nni = 2022 hu = 3.05e-01 +t = 6.00e+00 nst = 124 nfe = 0 nfi = 2275 nni = 1625 hu = 9.98e-01 -t = 7.00e+00 nst = 186 nfe = 0 nfi = 2975 nni = 2037 hu = 4.86e-01 +t = 7.00e+00 nst = 125 nfe = 0 nfi = 2290 nni = 1635 hu = 1.72e+00 -t = 8.00e+00 nst = 188 nfe = 0 nfi = 3003 nni = 2055 hu = 7.64e-01 +t = 8.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 9.00e+00 nst = 189 nfe = 0 nfi = 3015 nni = 2062 hu = 7.64e-01 +t = 9.00e+00 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 -t = 1.00e+01 nst = 190 nfe = 0 nfi = 3030 nni = 2072 hu = 1.57e+00 +t = 1.00e+01 nst = 126 nfe = 0 nfi = 2305 nni = 1645 hu = 2.85e+00 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 148 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 153 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 190 + Number of steps = 126 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 3030 - Number of f-s (SPGMR) = 6096 - Number of f-s (TOTAL) = 6096 - Number of setups = 38 - Number of nonlinear iterations = 2072 - Number of linear iterations = 6096 - Number of preconditioner evaluations = 38 - Number of preconditioner solves = 8079 - Number of error test failures = 1 - Number of nonlinear conv. failures = 0 - Number of linear convergence failures = 182 - Average Krylov subspace dimension = 2.942 + Number of f-s (implicit) = 2305 + Number of f-s (SPGMR) = 5210 + Number of f-s (TOTAL) = 5210 + Number of setups = 80 + Number of nonlinear iterations = 1645 + Number of linear iterations = 5210 + Number of preconditioner evaluations = 80 + Number of preconditioner solves = 6806 + Number of error test failures = 0 + Number of nonlinear conv. failures = 29 + Number of linear convergence failures = 228 + Average Krylov subspace dimension = 3.167 ---------------------------------------------------------------------------- @@ -516,64 +516,64 @@ Preconditioner type is jpre = SUN_PREC_RIGHT Gram-Schmidt method type is gstype = SUN_MODIFIED_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.49e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.86e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1799 nni = 1231 hu = 3.79e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1027 nni = 726 hu = 2.51e-03 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2028 nni = 1390 hu = 1.32e-02 +t = 1.00e-01 nst = 72 nfe = 0 nfi = 1303 nni = 928 hu = 6.16e-03 -t = 1.00e+00 nst = 164 nfe = 0 nfi = 2669 nni = 1844 hu = 4.98e-02 +t = 1.00e+00 nst = 124 nfe = 0 nfi = 2243 nni = 1598 hu = 2.32e-02 -t = 2.00e+00 nst = 213 nfe = 0 nfi = 3526 nni = 2444 hu = 2.37e-02 +t = 2.00e+00 nst = 150 nfe = 0 nfi = 2672 nni = 1897 hu = 6.35e-02 -t = 3.00e+00 nst = 248 nfe = 0 nfi = 4087 nni = 2830 hu = 3.53e-02 +t = 3.00e+00 nst = 178 nfe = 0 nfi = 3178 nni = 2253 hu = 4.48e-02 -t = 4.00e+00 nst = 272 nfe = 0 nfi = 4465 nni = 3088 hu = 3.22e-02 +t = 4.00e+00 nst = 197 nfe = 0 nfi = 3492 nni = 2470 hu = 8.26e-02 -t = 5.00e+00 nst = 299 nfe = 0 nfi = 4876 nni = 3363 hu = 3.94e-02 +t = 5.00e+00 nst = 209 nfe = 0 nfi = 3678 nni = 2596 hu = 9.29e-02 -t = 6.00e+00 nst = 316 nfe = 0 nfi = 5130 nni = 3532 hu = 6.86e-02 +t = 6.00e+00 nst = 221 nfe = 0 nfi = 3860 nni = 2718 hu = 1.35e-01 -t = 7.00e+00 nst = 329 nfe = 0 nfi = 5315 nni = 3652 hu = 8.22e-02 +t = 7.00e+00 nst = 233 nfe = 0 nfi = 4050 nni = 2845 hu = 5.14e-02 -t = 8.00e+00 nst = 339 nfe = 0 nfi = 5455 nni = 3742 hu = 1.18e-01 +t = 8.00e+00 nst = 243 nfe = 0 nfi = 4202 nni = 2945 hu = 1.77e-01 -t = 9.00e+00 nst = 345 nfe = 0 nfi = 5536 nni = 3793 hu = 2.11e-01 +t = 9.00e+00 nst = 250 nfe = 0 nfi = 4307 nni = 3012 hu = 2.19e-01 -t = 1.00e+01 nst = 349 nfe = 0 nfi = 5589 nni = 3826 hu = 2.80e-01 +t = 1.00e+01 nst = 256 nfe = 0 nfi = 4390 nni = 3065 hu = 1.33e-01 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 153 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 159 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 349 + Number of steps = 256 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 5589 - Number of f-s (SPGMR) = 12378 - Number of f-s (TOTAL) = 12378 - Number of setups = 244 - Number of nonlinear iterations = 3826 - Number of linear iterations = 12378 - Number of preconditioner evaluations = 244 - Number of preconditioner solves = 15957 + Number of f-s (implicit) = 4390 + Number of f-s (SPGMR) = 10822 + Number of f-s (TOTAL) = 10822 + Number of setups = 245 + Number of nonlinear iterations = 3065 + Number of linear iterations = 10822 + Number of preconditioner evaluations = 245 + Number of preconditioner solves = 13664 Number of error test failures = 0 - Number of nonlinear conv. failures = 113 - Number of linear convergence failures = 977 - Average Krylov subspace dimension = 3.235 + Number of nonlinear conv. failures = 127 + Number of linear convergence failures = 916 + Average Krylov subspace dimension = 3.531 ---------------------------------------------------------------------------- @@ -585,64 +585,64 @@ Preconditioner type is jpre = SUN_PREC_RIGHT Gram-Schmidt method type is gstype = SUN_CLASSICAL_GS -t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-08 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 9.89e-08 +t = 1.00e-07 nst = 5 nfe = 0 nfi = 75 nni = 47 hu = 1.84e-07 -t = 1.00e-06 nst = 8 nfe = 0 nfi = 120 nni = 77 hu = 4.79e-07 +t = 1.00e-06 nst = 7 nfe = 0 nfi = 106 nni = 68 hu = 1.10e-06 -t = 1.00e-05 nst = 27 nfe = 0 nfi = 407 nni = 269 hu = 4.79e-07 +t = 1.00e-05 nst = 15 nfe = 0 nfi = 226 nni = 148 hu = 1.10e-06 -t = 1.00e-04 nst = 106 nfe = 0 nfi = 1688 nni = 1155 hu = 1.70e-05 +t = 1.00e-04 nst = 54 nfe = 0 nfi = 928 nni = 655 hu = 3.03e-05 -t = 1.00e-03 nst = 110 nfe = 0 nfi = 1750 nni = 1197 hu = 1.49e-03 +t = 1.00e-03 nst = 57 nfe = 0 nfi = 975 nni = 687 hu = 2.86e-03 -t = 1.00e-02 nst = 113 nfe = 0 nfi = 1799 nni = 1231 hu = 3.79e-03 +t = 1.00e-02 nst = 59 nfe = 0 nfi = 1027 nni = 726 hu = 2.51e-03 -t = 1.00e-01 nst = 127 nfe = 0 nfi = 2028 nni = 1390 hu = 1.32e-02 +t = 1.00e-01 nst = 72 nfe = 0 nfi = 1303 nni = 928 hu = 6.16e-03 -t = 1.00e+00 nst = 164 nfe = 0 nfi = 2669 nni = 1844 hu = 4.98e-02 +t = 1.00e+00 nst = 124 nfe = 0 nfi = 2243 nni = 1598 hu = 2.32e-02 -t = 2.00e+00 nst = 213 nfe = 0 nfi = 3526 nni = 2444 hu = 2.37e-02 +t = 2.00e+00 nst = 150 nfe = 0 nfi = 2672 nni = 1897 hu = 6.35e-02 -t = 3.00e+00 nst = 248 nfe = 0 nfi = 4087 nni = 2830 hu = 3.53e-02 +t = 3.00e+00 nst = 178 nfe = 0 nfi = 3178 nni = 2253 hu = 4.48e-02 -t = 4.00e+00 nst = 272 nfe = 0 nfi = 4465 nni = 3088 hu = 3.22e-02 +t = 4.00e+00 nst = 197 nfe = 0 nfi = 3492 nni = 2470 hu = 8.26e-02 -t = 5.00e+00 nst = 299 nfe = 0 nfi = 4876 nni = 3363 hu = 3.94e-02 +t = 5.00e+00 nst = 209 nfe = 0 nfi = 3678 nni = 2596 hu = 9.29e-02 -t = 6.00e+00 nst = 316 nfe = 0 nfi = 5130 nni = 3532 hu = 6.86e-02 +t = 6.00e+00 nst = 221 nfe = 0 nfi = 3860 nni = 2718 hu = 1.35e-01 -t = 7.00e+00 nst = 329 nfe = 0 nfi = 5315 nni = 3652 hu = 8.22e-02 +t = 7.00e+00 nst = 233 nfe = 0 nfi = 4050 nni = 2845 hu = 5.15e-02 -t = 8.00e+00 nst = 339 nfe = 0 nfi = 5455 nni = 3742 hu = 1.19e-01 +t = 8.00e+00 nst = 243 nfe = 0 nfi = 4202 nni = 2945 hu = 1.77e-01 -t = 9.00e+00 nst = 345 nfe = 0 nfi = 5536 nni = 3793 hu = 2.11e-01 +t = 9.00e+00 nst = 250 nfe = 0 nfi = 4307 nni = 3012 hu = 2.19e-01 -t = 1.00e+01 nst = 349 nfe = 0 nfi = 5589 nni = 3826 hu = 2.80e-01 +t = 1.00e+01 nst = 256 nfe = 0 nfi = 4390 nni = 3065 hu = 1.33e-01 Final statistics for this run: - ARKStep real workspace length = 3558 - ARKStep integer workspace length = 158 + ARKStep real workspace length = 3790 + ARKStep integer workspace length = 165 ARKLS real workspace length = 2647 ARKLS integer workspace length = 42 - Number of steps = 349 + Number of steps = 256 Number of f-s (explicit) = 0 - Number of f-s (implicit) = 5589 - Number of f-s (SPGMR) = 12378 - Number of f-s (TOTAL) = 12378 - Number of setups = 244 - Number of nonlinear iterations = 3826 - Number of linear iterations = 12378 - Number of preconditioner evaluations = 244 - Number of preconditioner solves = 15957 + Number of f-s (implicit) = 4390 + Number of f-s (SPGMR) = 10824 + Number of f-s (TOTAL) = 10824 + Number of setups = 245 + Number of nonlinear iterations = 3065 + Number of linear iterations = 10824 + Number of preconditioner evaluations = 245 + Number of preconditioner solves = 13666 Number of error test failures = 0 - Number of nonlinear conv. failures = 113 - Number of linear convergence failures = 976 - Average Krylov subspace dimension = 3.235 + Number of nonlinear conv. failures = 127 + Number of linear convergence failures = 916 + Average Krylov subspace dimension = 3.531 ---------------------------------------------------------------------------- diff --git a/examples/arkode/C_serial/ark_analytic.out b/examples/arkode/C_serial/ark_analytic.out index 83a4c0f4d3..6c502d1d6a 100644 --- a/examples/arkode/C_serial/ark_analytic.out +++ b/examples/arkode/C_serial/ark_analytic.out @@ -7,10 +7,10 @@ Analytical ODE test problem: t u --------------------- 1.000000 0.785398 - 2.000000 1.107149 + 2.000000 1.107148 3.000000 1.249046 4.000000 1.325818 - 5.000000 1.373401 + 5.000000 1.373400 6.000000 1.405648 7.000000 1.428899 8.000000 1.446441 @@ -19,12 +19,12 @@ Analytical ODE test problem: --------------------- Final Solver Statistics: - Internal solver steps = 559 (attempted = 559) - Total RHS evals: Fe = 0, Fi = 5593 - Total linear solver setups = 25 + Internal solver steps = 94 (attempted = 94) + Total RHS evals: Fe = 0, Fi = 943 + Total linear solver setups = 21 Total RHS evals for setting up the linear system = 0 - Total number of Jacobian evaluations = 5 - Total number of Newton iterations = 2795 + Total number of Jacobian evaluations = 2 + Total number of Newton iterations = 470 Total number of linear solver convergence failures = 0 Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_analytic_mels.out b/examples/arkode/C_serial/ark_analytic_mels.out index dbe45fe83d..190e03c071 100644 --- a/examples/arkode/C_serial/ark_analytic_mels.out +++ b/examples/arkode/C_serial/ark_analytic_mels.out @@ -7,10 +7,10 @@ Analytical ODE test problem: t u --------------------- 1.000000 0.785398 - 2.000000 1.107149 + 2.000000 1.107148 3.000000 1.249046 4.000000 1.325818 - 5.000000 1.373401 + 5.000000 1.373400 6.000000 1.405648 7.000000 1.428899 8.000000 1.446441 @@ -19,12 +19,12 @@ Analytical ODE test problem: --------------------- Final Solver Statistics: - Internal solver steps = 559 (attempted = 559) - Total RHS evals: Fe = 0, Fi = 5593 + Internal solver steps = 94 (attempted = 94) + Total RHS evals: Fe = 0, Fi = 943 Total linear solver setups = 0 Total RHS evals for setting up the linear system = 0 Total number of Jacobian evaluations = 0 - Total number of Newton iterations = 2795 + Total number of Newton iterations = 470 Total number of linear solver convergence failures = 0 Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_analytic_nonlin.out b/examples/arkode/C_serial/ark_analytic_nonlin.out index 902ace198d..91ee81bc9a 100644 --- a/examples/arkode/C_serial/ark_analytic_nonlin.out +++ b/examples/arkode/C_serial/ark_analytic_nonlin.out @@ -6,10 +6,10 @@ Analytical ODE test problem: t u --------------------- 1.000000 0.916291 - 2.000000 1.609437 + 2.000000 1.609438 3.000000 2.140066 4.000000 2.564949 - 5.000000 2.917770 + 5.000000 2.917771 6.000000 3.218876 7.000000 3.481240 8.000000 3.713572 @@ -18,15 +18,15 @@ Analytical ODE test problem: --------------------- Final Statistics: -Current time = 10.12157090914652 -Steps = 82 -Step attempts = 83 +Current time = 10.12743729989852 +Steps = 62 +Step attempts = 62 Stability limited steps = 0 -Accuracy limited steps = 83 -Error test fails = 1 +Accuracy limited steps = 62 +Error test fails = 0 NLS step fails = 0 Inequality constraint fails = 0 Initial step size = 6.103515625000001e-12 -Last step size = 0.4463519264234082 -Current step size = 0.4463519264234082 -RHS fn evals = 417 +Last step size = 0.553529760219145 +Current step size = 0.553529760219145 +RHS fn evals = 251 diff --git a/examples/arkode/C_serial/ark_brusselator.out b/examples/arkode/C_serial/ark_brusselator.out index dec501df56..05882e2bd4 100644 --- a/examples/arkode/C_serial/ark_brusselator.out +++ b/examples/arkode/C_serial/ark_brusselator.out @@ -7,25 +7,25 @@ Brusselator ODE test problem: t u v w ------------------------------------------- 0.000000 1.200000 3.100000 3.000000 - 1.000000 1.103849 3.013164 3.499981 - 2.000000 0.687997 3.521384 3.499988 - 3.000000 0.409467 4.277888 3.499993 - 4.000000 0.367889 4.942005 3.499994 - 5.000000 0.413860 5.510615 3.499993 - 6.000000 0.589251 5.855655 3.499990 - 7.000000 4.756472 0.735414 3.499917 - 8.000000 1.813403 1.575799 3.499968 - 9.000000 0.527886 2.807385 3.499991 - 10.000000 0.305598 3.657381 3.499995 + 1.000000 1.103878 3.013131 3.499981 + 2.000000 0.687989 3.521377 3.499988 + 3.000000 0.409465 4.277893 3.499993 + 4.000000 0.367902 4.941998 3.499994 + 5.000000 0.413859 5.510619 3.499993 + 6.000000 0.589265 5.855640 3.499990 + 7.000000 4.756457 0.735481 3.499917 + 8.000000 1.813436 1.575779 3.499968 + 9.000000 0.527882 2.807389 3.499991 + 10.000000 0.305603 3.657381 3.499995 ------------------------------------------- Final Solver Statistics: - Internal solver steps = 252 (attempted = 262) - Total RHS evals: Fe = 0, Fi = 1910 - Total linear solver setups = 111 + Internal solver steps = 151 (attempted = 167) + Total RHS evals: Fe = 0, Fi = 1443 + Total linear solver setups = 124 Total RHS evals for setting up the linear system = 0 - Total number of Jacobian evaluations = 71 - Total number of Newton iterations = 3286 - Total number of nonlinear solver convergence failures = 70 - Total number of error test failures = 9 - Total number of failed steps from solver failure = 1 + Total number of Jacobian evaluations = 74 + Total number of Newton iterations = 2313 + Total number of nonlinear solver convergence failures = 73 + Total number of error test failures = 6 + Total number of failed steps from solver failure = 10 diff --git a/examples/arkode/C_serial/ark_brusselator1D.out b/examples/arkode/C_serial/ark_brusselator1D.out index d430e862df..551ede9364 100644 --- a/examples/arkode/C_serial/ark_brusselator1D.out +++ b/examples/arkode/C_serial/ark_brusselator1D.out @@ -12,110 +12,110 @@ 0.300000 0.695306 3.334633 1.999986 0.400000 0.706918 3.311313 1.999986 0.500000 0.719185 3.286601 1.999986 - 0.600000 0.732137 3.260442 1.999986 - 0.700000 0.745798 3.232787 1.999985 - 0.800000 0.760185 3.203596 1.999985 - 0.900000 0.775302 3.172839 1.999985 + 0.600000 0.732138 3.260442 1.999986 + 0.700000 0.745798 3.232788 1.999985 + 0.800000 0.760187 3.203594 1.999985 + 0.900000 0.775303 3.172838 1.999985 1.000000 0.791135 3.140510 1.999984 - 1.100000 0.807648 3.106624 1.999984 - 1.200000 0.824771 3.071233 1.999984 - 1.300000 0.842402 3.034426 1.999983 - 1.400000 0.860384 2.996350 1.999983 - 1.500000 0.878514 2.957207 1.999983 - 1.600000 0.896525 2.917266 1.999982 - 1.700000 0.914089 2.876873 1.999982 - 1.800000 0.930823 2.836438 1.999982 - 1.900000 0.946292 2.796446 1.999982 - 2.000000 0.960034 2.757430 1.999981 - 2.100000 0.971577 2.719961 1.999981 - 2.200000 0.980476 2.684622 1.999981 - 2.300000 0.986338 2.651980 1.999981 - 2.400000 0.988853 2.622559 1.999981 - 2.500000 0.987816 2.596818 1.999981 - 2.600000 0.983141 2.575127 1.999981 - 2.700000 0.974859 2.557765 1.999981 - 2.800000 0.963115 2.544902 1.999981 - 2.900000 0.948155 2.536610 1.999981 - 3.000000 0.930300 2.532867 1.999982 - 3.100000 0.909931 2.533566 1.999982 - 3.200000 0.887464 2.538528 1.999983 - 3.300000 0.863335 2.547514 1.999983 - 3.400000 0.837978 2.560240 1.999983 - 3.500000 0.811818 2.576391 1.999984 - 3.600000 0.785255 2.595624 1.999984 - 3.700000 0.758658 2.617586 1.999985 - 3.800000 0.732363 2.641921 1.999986 - 3.900000 0.706662 2.668274 1.999986 - 4.000000 0.681809 2.696300 1.999986 - 4.100000 0.658011 2.725670 1.999987 - 4.200000 0.635435 2.756075 1.999987 - 4.300000 0.614204 2.787228 1.999988 + 1.100000 0.807651 3.106620 1.999984 + 1.200000 0.824772 3.071232 1.999984 + 1.300000 0.842404 3.034423 1.999983 + 1.400000 0.860386 2.996347 1.999983 + 1.500000 0.878514 2.957205 1.999983 + 1.600000 0.896528 2.917260 1.999982 + 1.700000 0.914089 2.876871 1.999982 + 1.800000 0.930823 2.836437 1.999982 + 1.900000 0.946293 2.796444 1.999982 + 2.000000 0.960034 2.757429 1.999981 + 2.100000 0.971577 2.719960 1.999981 + 2.200000 0.980475 2.684622 1.999981 + 2.300000 0.986336 2.651980 1.999981 + 2.400000 0.988853 2.622558 1.999981 + 2.500000 0.987814 2.596819 1.999981 + 2.600000 0.983140 2.575127 1.999981 + 2.700000 0.974856 2.557766 1.999981 + 2.800000 0.963114 2.544903 1.999981 + 2.900000 0.948154 2.536611 1.999981 + 3.000000 0.930298 2.532870 1.999982 + 3.100000 0.909929 2.533567 1.999982 + 3.200000 0.887463 2.538530 1.999983 + 3.300000 0.863334 2.547515 1.999983 + 3.400000 0.837978 2.560242 1.999983 + 3.500000 0.811818 2.576392 1.999984 + 3.600000 0.785254 2.595625 1.999984 + 3.700000 0.758658 2.617588 1.999985 + 3.800000 0.732362 2.641923 1.999986 + 3.900000 0.706662 2.668275 1.999986 + 4.000000 0.681808 2.696301 1.999986 + 4.100000 0.658011 2.725672 1.999987 + 4.200000 0.635435 2.756076 1.999987 + 4.300000 0.614204 2.787229 1.999988 4.400000 0.594404 2.818869 1.999988 - 4.500000 0.576082 2.850764 1.999989 - 4.600000 0.559254 2.882710 1.999989 - 4.700000 0.543909 2.914529 1.999989 - 4.800000 0.530011 2.946071 1.999990 + 4.500000 0.576082 2.850766 1.999989 + 4.600000 0.559254 2.882711 1.999989 + 4.700000 0.543909 2.914530 1.999989 + 4.800000 0.530011 2.946072 1.999990 4.900000 0.517506 2.977210 1.999990 - 5.000000 0.506326 3.007843 1.999990 - 5.100000 0.496393 3.037889 1.999990 - 5.200000 0.487625 3.067283 1.999990 - 5.300000 0.479935 3.095976 1.999991 - 5.400000 0.473237 3.123932 1.999991 - 5.500000 0.467445 3.151126 1.999991 - 5.600000 0.462480 3.177540 1.999991 - 5.700000 0.458264 3.203165 1.999991 - 5.800000 0.454726 3.227997 1.999991 - 5.900000 0.451799 3.252035 1.999991 - 6.000000 0.449425 3.275283 1.999991 + 5.000000 0.506325 3.007844 1.999990 + 5.100000 0.496393 3.037890 1.999990 + 5.200000 0.487625 3.067284 1.999990 + 5.300000 0.479935 3.095977 1.999991 + 5.400000 0.473237 3.123933 1.999991 + 5.500000 0.467445 3.151127 1.999991 + 5.600000 0.462480 3.177541 1.999991 + 5.700000 0.458264 3.203166 1.999991 + 5.800000 0.454725 3.227998 1.999991 + 5.900000 0.451799 3.252036 1.999991 + 6.000000 0.449425 3.275284 1.999991 6.100000 0.447546 3.297745 1.999991 - 6.200000 0.446115 3.319428 1.999991 + 6.200000 0.446115 3.319429 1.999991 6.300000 0.445085 3.340341 1.999991 - 6.400000 0.444419 3.360492 1.999991 + 6.400000 0.444418 3.360492 1.999991 6.500000 0.444079 3.379891 1.999991 6.600000 0.444034 3.398547 1.999991 - 6.700000 0.444257 3.416470 1.999991 - 6.800000 0.444722 3.433669 1.999991 - 6.900000 0.445409 3.450154 1.999991 + 6.700000 0.444257 3.416471 1.999991 + 6.800000 0.444722 3.433670 1.999991 + 6.900000 0.445408 3.450155 1.999991 7.000000 0.446297 3.465935 1.999991 - 7.100000 0.447370 3.481018 1.999991 + 7.100000 0.447370 3.481019 1.999991 7.200000 0.448614 3.495415 1.999991 - 7.300000 0.450016 3.509131 1.999991 - 7.400000 0.451564 3.522176 1.999991 + 7.300000 0.450016 3.509132 1.999991 + 7.400000 0.451564 3.522177 1.999991 7.500000 0.453249 3.534557 1.999991 - 7.600000 0.455064 3.546280 1.999991 + 7.600000 0.455064 3.546281 1.999991 7.700000 0.457000 3.557353 1.999991 - 7.800000 0.459052 3.567781 1.999991 - 7.900000 0.461215 3.577572 1.999991 + 7.800000 0.459052 3.567782 1.999991 + 7.900000 0.461216 3.577572 1.999991 8.000000 0.463486 3.586729 1.999991 8.100000 0.465860 3.595257 1.999991 8.200000 0.468335 3.603162 1.999991 8.300000 0.470909 3.610447 1.999991 8.400000 0.473582 3.617116 1.999991 - 8.500000 0.476352 3.623172 1.999991 + 8.500000 0.476352 3.623171 1.999991 8.600000 0.479220 3.628616 1.999991 8.700000 0.482186 3.633451 1.999991 - 8.800000 0.485250 3.637679 1.999990 + 8.800000 0.485251 3.637679 1.999990 8.900000 0.488416 3.641299 1.999990 - 9.000000 0.491684 3.644312 1.999990 - 9.100000 0.495058 3.646716 1.999990 - 9.200000 0.498539 3.648510 1.999990 - 9.300000 0.502133 3.649691 1.999990 - 9.400000 0.505843 3.650257 1.999990 - 9.500000 0.509674 3.650202 1.999990 - 9.600000 0.513632 3.649522 1.999990 - 9.700000 0.517722 3.648210 1.999990 + 9.000000 0.491684 3.644311 1.999990 + 9.100000 0.495058 3.646715 1.999990 + 9.200000 0.498540 3.648509 1.999990 + 9.300000 0.502134 3.649691 1.999990 + 9.400000 0.505844 3.650256 1.999990 + 9.500000 0.509675 3.650202 1.999990 + 9.600000 0.513632 3.649521 1.999990 + 9.700000 0.517722 3.648209 1.999990 9.800000 0.521951 3.646257 1.999990 - 9.900000 0.526326 3.643656 1.999990 + 9.900000 0.526327 3.643656 1.999990 10.000000 0.530857 3.640396 1.999990 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 99 (attempted = 99) - Total RHS evals: Fe = 0, Fi = 1186 - Total linear solver setups = 35 + Internal solver steps = 66 (attempted = 67) + Total RHS evals: Fe = 0, Fi = 887 + Total linear solver setups = 33 Total RHS evals for setting up the linear system = 0 - Total number of Jacobian evaluations = 14 - Total number of Newton iterations = 1196 - Total number of nonlinear solver convergence failures = 13 + Total number of Jacobian evaluations = 16 + Total number of Newton iterations = 899 + Total number of nonlinear solver convergence failures = 15 Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out b/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out index 8cae2ef2fe..b2f0381093 100644 --- a/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out +++ b/examples/arkode/C_serial/ark_brusselator1D_FEM_slu.out @@ -10,114 +10,114 @@ ---------------------------------------------- 0.100000 0.637854 3.356025 1.999989 0.200000 0.643035 3.345751 1.999989 - 0.300000 0.648532 3.334867 1.999989 - 0.400000 0.654362 3.323350 1.999989 - 0.500000 0.660542 3.311172 1.999988 - 0.600000 0.667093 3.298309 1.999988 - 0.700000 0.674031 3.284739 1.999989 + 0.300000 0.648532 3.334868 1.999989 + 0.400000 0.654362 3.323350 1.999988 + 0.500000 0.660543 3.311172 1.999988 + 0.600000 0.667094 3.298309 1.999988 + 0.700000 0.674031 3.284739 1.999988 0.800000 0.681370 3.270442 1.999988 - 0.900000 0.689121 3.255404 1.999988 - 1.000000 0.697284 3.239620 1.999988 - 1.100000 0.705853 3.223093 1.999987 - 1.200000 0.714805 3.205842 1.999987 - 1.300000 0.724098 3.187903 1.999987 - 1.400000 0.733670 3.169332 1.999987 - 1.500000 0.743428 3.150212 1.999987 - 1.600000 0.753248 3.130655 1.999987 - 1.700000 0.762974 3.110801 1.999986 - 1.800000 0.772411 3.090829 1.999986 - 1.900000 0.781336 3.070946 1.999986 - 2.000000 0.789499 3.051390 1.999986 - 2.100000 0.796638 3.032422 1.999986 - 2.200000 0.802489 3.014319 1.999986 - 2.300000 0.806808 2.997360 1.999986 - 2.400000 0.809386 2.981819 1.999986 - 2.500000 0.810059 2.967951 1.999986 - 2.600000 0.808728 2.955979 1.999986 - 2.700000 0.805361 2.946086 1.999986 - 2.800000 0.799988 2.938411 1.999986 - 2.900000 0.792711 2.933041 1.999986 - 3.000000 0.783681 2.930010 1.999986 - 3.100000 0.773096 2.929307 1.999986 - 3.200000 0.761187 2.930874 1.999986 - 3.300000 0.748207 2.934613 1.999987 + 0.900000 0.689123 3.255402 1.999988 + 1.000000 0.697286 3.239618 1.999988 + 1.100000 0.705855 3.223091 1.999988 + 1.200000 0.714809 3.205838 1.999987 + 1.300000 0.724100 3.187901 1.999987 + 1.400000 0.733673 3.169328 1.999987 + 1.500000 0.743433 3.150206 1.999987 + 1.600000 0.753250 3.130652 1.999987 + 1.700000 0.762975 3.110798 1.999986 + 1.800000 0.772413 3.090825 1.999986 + 1.900000 0.781338 3.070943 1.999986 + 2.000000 0.789502 3.051386 1.999986 + 2.100000 0.796640 3.032419 1.999986 + 2.200000 0.802491 3.014315 1.999986 + 2.300000 0.806810 2.997356 1.999986 + 2.400000 0.809388 2.981816 1.999986 + 2.500000 0.810060 2.967948 1.999986 + 2.600000 0.808729 2.955976 1.999986 + 2.700000 0.805361 2.946083 1.999986 + 2.800000 0.799988 2.938409 1.999986 + 2.900000 0.792711 2.933038 1.999986 + 3.000000 0.783680 2.930008 1.999986 + 3.100000 0.773094 2.929308 1.999986 + 3.200000 0.761186 2.930875 1.999986 + 3.300000 0.748207 2.934611 1.999987 3.400000 0.734416 2.940394 1.999987 - 3.500000 0.720074 2.948062 1.999987 - 3.600000 0.705429 2.957444 1.999987 - 3.700000 0.690715 2.968354 1.999988 - 3.800000 0.676141 2.980600 1.999988 - 3.900000 0.661892 2.993989 1.999988 - 4.000000 0.648123 3.008331 1.999989 - 4.100000 0.634962 3.023445 1.999989 + 3.500000 0.720073 2.948061 1.999987 + 3.600000 0.705429 2.957443 1.999987 + 3.700000 0.690715 2.968353 1.999988 + 3.800000 0.676140 2.980599 1.999988 + 3.900000 0.661892 2.993988 1.999988 + 4.000000 0.648121 3.008331 1.999989 + 4.100000 0.634962 3.023444 1.999989 4.200000 0.622506 3.039157 1.999989 - 4.300000 0.610828 3.055308 1.999989 + 4.300000 0.610827 3.055308 1.999989 4.400000 0.599972 3.071751 1.999989 - 4.500000 0.589962 3.088356 1.999990 - 4.600000 0.580801 3.105007 1.999990 - 4.700000 0.572477 3.121602 1.999990 - 4.800000 0.564964 3.138058 1.999990 - 4.900000 0.558227 3.154303 1.999990 - 5.000000 0.552224 3.170277 1.999990 + 4.500000 0.589960 3.088357 1.999990 + 4.600000 0.580801 3.105006 1.999990 + 4.700000 0.572476 3.121603 1.999990 + 4.800000 0.564963 3.138059 1.999990 + 4.900000 0.558226 3.154303 1.999990 + 5.000000 0.552223 3.170279 1.999990 5.100000 0.546907 3.185935 1.999991 - 5.200000 0.542229 3.201239 1.999991 - 5.300000 0.538138 3.216162 1.999991 - 5.400000 0.534586 3.230682 1.999991 - 5.500000 0.531525 3.244788 1.999991 - 5.600000 0.528910 3.258468 1.999991 - 5.700000 0.526699 3.271719 1.999991 - 5.800000 0.524852 3.284539 1.999991 - 5.900000 0.523334 3.296928 1.999991 - 6.000000 0.522112 3.308889 1.999991 - 6.100000 0.521154 3.320426 1.999991 - 6.200000 0.520436 3.331545 1.999991 - 6.300000 0.519932 3.342250 1.999991 - 6.400000 0.519621 3.352549 1.999991 - 6.500000 0.519484 3.362446 1.999991 - 6.600000 0.519503 3.371949 1.999991 - 6.700000 0.519664 3.381064 1.999991 - 6.800000 0.519953 3.389797 1.999991 - 6.900000 0.520358 3.398153 1.999991 - 7.000000 0.520869 3.406139 1.999991 - 7.100000 0.521477 3.413759 1.999991 - 7.200000 0.522174 3.421020 1.999991 - 7.300000 0.522953 3.427926 1.999991 - 7.400000 0.523807 3.434482 1.999991 - 7.500000 0.524732 3.440692 1.999991 - 7.600000 0.525723 3.446560 1.999991 - 7.700000 0.526775 3.452091 1.999991 - 7.800000 0.527887 3.457288 1.999991 - 7.900000 0.529055 3.462154 1.999991 - 8.000000 0.530276 3.466692 1.999991 - 8.100000 0.531549 3.470906 1.999991 - 8.200000 0.532872 3.474798 1.999991 - 8.300000 0.534244 3.478370 1.999991 + 5.200000 0.542228 3.201240 1.999991 + 5.300000 0.538137 3.216163 1.999991 + 5.400000 0.534585 3.230684 1.999991 + 5.500000 0.531524 3.244789 1.999991 + 5.600000 0.528909 3.258469 1.999991 + 5.700000 0.526698 3.271720 1.999991 + 5.800000 0.524852 3.284540 1.999991 + 5.900000 0.523334 3.296929 1.999991 + 6.000000 0.522111 3.308890 1.999991 + 6.100000 0.521152 3.320427 1.999991 + 6.200000 0.520433 3.331546 1.999991 + 6.300000 0.519931 3.342252 1.999991 + 6.400000 0.519621 3.352550 1.999991 + 6.500000 0.519483 3.362448 1.999991 + 6.600000 0.519502 3.371951 1.999991 + 6.700000 0.519663 3.381066 1.999991 + 6.800000 0.519953 3.389798 1.999991 + 6.900000 0.520358 3.398154 1.999991 + 7.000000 0.520869 3.406140 1.999991 + 7.100000 0.521477 3.413761 1.999991 + 7.200000 0.522174 3.421021 1.999991 + 7.300000 0.522953 3.427927 1.999991 + 7.400000 0.523807 3.434483 1.999991 + 7.500000 0.524731 3.440693 1.999991 + 7.600000 0.525722 3.446561 1.999991 + 7.700000 0.526776 3.452092 1.999991 + 7.800000 0.527887 3.457289 1.999991 + 7.900000 0.529055 3.462155 1.999991 + 8.000000 0.530276 3.466693 1.999991 + 8.100000 0.531549 3.470907 1.999991 + 8.200000 0.532872 3.474799 1.999991 + 8.300000 0.534244 3.478371 1.999991 8.400000 0.535665 3.481625 1.999991 8.500000 0.537133 3.484564 1.999991 - 8.600000 0.538649 3.487188 1.999991 + 8.600000 0.538649 3.487189 1.999991 8.700000 0.540213 3.489499 1.999991 8.800000 0.541825 3.491498 1.999991 8.900000 0.543486 3.493185 1.999991 9.000000 0.545196 3.494560 1.999991 - 9.100000 0.546957 3.495624 1.999991 - 9.200000 0.548771 3.496375 1.999991 - 9.300000 0.550638 3.496814 1.999990 - 9.400000 0.552561 3.496938 1.999990 - 9.500000 0.554543 3.496746 1.999990 + 9.100000 0.546958 3.495624 1.999991 + 9.200000 0.548771 3.496376 1.999991 + 9.300000 0.550639 3.496814 1.999990 + 9.400000 0.552562 3.496938 1.999990 + 9.500000 0.554543 3.496747 1.999990 9.600000 0.556585 3.496236 1.999990 - 9.700000 0.558691 3.495404 1.999990 - 9.800000 0.560864 3.494248 1.999990 + 9.700000 0.558692 3.495404 1.999990 + 9.800000 0.560865 3.494247 1.999990 9.900000 0.563108 3.492763 1.999990 10.000000 0.565426 3.490945 1.999990 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 95 (attempted = 95) - Total RHS evals: Fe = 0, Fi = 1111 + Internal solver steps = 57 (attempted = 59) + Total RHS evals: Fe = 0, Fi = 769 Total mass matrix setups = 1 - Total mass matrix solves = 193 - Total mass times evals = 1688 - Total linear solver setups = 31 - Total number of Jacobian evaluations = 11 - Total number of Newton iterations = 1118 - Total number of nonlinear solver convergence failures = 10 + Total mass matrix solves = 117 + Total mass times evals = 1135 + Total linear solver setups = 39 + Total number of Jacobian evaluations = 20 + Total number of Newton iterations = 785 + Total number of nonlinear solver convergence failures = 19 Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_brusselator1D_klu.out b/examples/arkode/C_serial/ark_brusselator1D_klu.out index a4e1828ee9..08362ace06 100644 --- a/examples/arkode/C_serial/ark_brusselator1D_klu.out +++ b/examples/arkode/C_serial/ark_brusselator1D_klu.out @@ -8,22 +8,22 @@ t ||u||_rms ||v||_rms ||w||_rms ---------------------------------------------- 1.000000 0.791135 3.140510 1.999984 - 2.000000 0.960034 2.757430 1.999981 - 3.000000 0.930300 2.532867 1.999982 - 4.000000 0.681809 2.696300 1.999986 - 5.000000 0.506326 3.007843 1.999990 - 6.000000 0.449425 3.275283 1.999991 + 2.000000 0.960034 2.757429 1.999981 + 3.000000 0.930298 2.532870 1.999982 + 4.000000 0.681808 2.696301 1.999986 + 5.000000 0.506325 3.007844 1.999990 + 6.000000 0.449425 3.275284 1.999991 7.000000 0.446297 3.465935 1.999991 8.000000 0.463486 3.586729 1.999991 - 9.000000 0.491684 3.644312 1.999990 + 9.000000 0.491684 3.644311 1.999990 10.000000 0.530857 3.640396 1.999990 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 99 (attempted = 99) - Total RHS evals: Fe = 0, Fi = 1186 - Total linear solver setups = 35 - Total number of Jacobian evaluations = 14 - Total number of nonlinear iterations = 1196 - Total number of nonlinear solver convergence failures = 13 + Internal solver steps = 66 (attempted = 67) + Total RHS evals: Fe = 0, Fi = 887 + Total linear solver setups = 33 + Total number of Jacobian evaluations = 16 + Total number of nonlinear iterations = 899 + Total number of nonlinear solver convergence failures = 15 Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_brusselator_fp.out b/examples/arkode/C_serial/ark_brusselator_fp.out index 76e1aa7768..66d08f1734 100644 --- a/examples/arkode/C_serial/ark_brusselator_fp.out +++ b/examples/arkode/C_serial/ark_brusselator_fp.out @@ -6,22 +6,22 @@ Brusselator ODE test problem, fixed-point solver: t u v w ---------------------------------------------- - 1.000000 1.897255 1.274939 2.997155 - 2.000000 0.346125 2.366448 2.999481 - 3.000000 0.147442 2.862061 2.999781 - 4.000000 0.140733 3.226731 2.999780 - 5.000000 0.142659 3.583206 2.999789 - 6.000000 0.145095 3.936910 2.999782 - 7.000000 0.147720 4.287893 2.999780 - 8.000000 0.150542 4.635957 2.999775 - 9.000000 0.153590 4.980863 2.999768 - 10.000000 0.156901 5.322330 2.999763 + 1.000000 1.897255 1.274939 2.997143 + 2.000000 0.346125 2.366448 2.999487 + 3.000000 0.147442 2.862060 2.999779 + 4.000000 0.140733 3.226731 2.999813 + 5.000000 0.142659 3.583206 2.999839 + 6.000000 0.145095 3.936910 2.999785 + 7.000000 0.147720 4.287893 2.999764 + 8.000000 0.150542 4.635957 2.999762 + 9.000000 0.153590 4.980863 2.999787 + 10.000000 0.156901 5.322330 2.999779 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 729 (attempted = 730) - Total RHS evals: Fe = 4382, Fi = 15142 - Total number of fixed-point iterations = 14410 + Internal solver steps = 315 (attempted = 315) + Total RHS evals: Fe = 2208, Fi = 7763 + Total number of fixed-point iterations = 7445 Total number of nonlinear solver convergence failures = 0 - Total number of error test failures = 1 + Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_brusselator_fp_1.out b/examples/arkode/C_serial/ark_brusselator_fp_1.out index 76e1aa7768..66d08f1734 100644 --- a/examples/arkode/C_serial/ark_brusselator_fp_1.out +++ b/examples/arkode/C_serial/ark_brusselator_fp_1.out @@ -6,22 +6,22 @@ Brusselator ODE test problem, fixed-point solver: t u v w ---------------------------------------------- - 1.000000 1.897255 1.274939 2.997155 - 2.000000 0.346125 2.366448 2.999481 - 3.000000 0.147442 2.862061 2.999781 - 4.000000 0.140733 3.226731 2.999780 - 5.000000 0.142659 3.583206 2.999789 - 6.000000 0.145095 3.936910 2.999782 - 7.000000 0.147720 4.287893 2.999780 - 8.000000 0.150542 4.635957 2.999775 - 9.000000 0.153590 4.980863 2.999768 - 10.000000 0.156901 5.322330 2.999763 + 1.000000 1.897255 1.274939 2.997143 + 2.000000 0.346125 2.366448 2.999487 + 3.000000 0.147442 2.862060 2.999779 + 4.000000 0.140733 3.226731 2.999813 + 5.000000 0.142659 3.583206 2.999839 + 6.000000 0.145095 3.936910 2.999785 + 7.000000 0.147720 4.287893 2.999764 + 8.000000 0.150542 4.635957 2.999762 + 9.000000 0.153590 4.980863 2.999787 + 10.000000 0.156901 5.322330 2.999779 ---------------------------------------------- Final Solver Statistics: - Internal solver steps = 729 (attempted = 730) - Total RHS evals: Fe = 4382, Fi = 15142 - Total number of fixed-point iterations = 14410 + Internal solver steps = 315 (attempted = 315) + Total RHS evals: Fe = 2208, Fi = 7763 + Total number of fixed-point iterations = 7445 Total number of nonlinear solver convergence failures = 0 - Total number of error test failures = 1 + Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out index bbaf5142f3..17ece79919 100644 --- a/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out +++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_ark_1_0.out @@ -8,18 +8,17 @@ Conserved Exponential Entropy problem: step t u v e delta e ------------------------------------------------------------------------------- 0 0.000000e+00 1.000000e+00 5.000000e-01 4.367003e+00 0.000000e+00 - 40 7.671134e-01 -1.432143e+00 1.417843e+00 4.367003e+00 5.329071e-15 - 80 2.733674e+00 -9.963899e+00 1.474066e+00 4.367003e+00 7.993606e-15 + 40 1.524191e+00 -4.684189e+00 1.471959e+00 4.367003e+00 3.552714e-15 ------------------------------------------------------------------------------- Final Solver Statistics: - Internal solver steps = 86 (attempted = 86) - Total number of error test failures = 0 - Total RHS evals: Fe = 432, Fi = 0 - Total Relaxation Fn evals = 266 - Total Relaxation Jac evals = 524 + Internal solver steps = 49 (attempted = 51) + Total number of error test failures = 2 + Total RHS evals: Fe = 255, Fi = 0 + Total Relaxation Fn evals = 183 + Total Relaxation Jac evals = 336 Total Relaxation fails = 0 Total Relaxation bound fails = 0 Total Relaxation NLS fails = 0 - Total Relaxation NLS iters = 94 + Total Relaxation NLS iters = 81 diff --git a/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out b/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out index e39d0b1160..d62c1791c6 100644 --- a/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out +++ b/examples/arkode/C_serial/ark_conserved_exp_entropy_erk_1.out @@ -8,18 +8,17 @@ Conserved Exponential Entropy problem: step t u v e delta e ------------------------------------------------------------------------------- 0 0.000000e+00 1.000000e+00 5.000000e-01 4.367003e+00 0.000000e+00 - 40 6.829631e-01 -1.088653e+00 1.393849e+00 4.367003e+00 7.993606e-15 - 80 3.316326e+00 -1.250833e+01 1.474076e+00 4.367003e+00 1.332268e-14 + 40 1.735025e+00 -5.603629e+00 1.473233e+00 4.367003e+00 5.329071e-15 ------------------------------------------------------------------------------- Final Solver Statistics: - Internal solver steps = 83 (attempted = 85) - Total number of error test failures = 2 - Total RHS evals = 425 - Total Relaxation Fn evals = 267 - Total Relaxation Jac evals = 522 - Total Relaxation fails = 0 - Total Relaxation bound fails = 0 + Internal solver steps = 47 (attempted = 51) + Total number of error test failures = 3 + Total RHS evals = 253 + Total Relaxation Fn evals = 187 + Total Relaxation Jac evals = 340 + Total Relaxation fails = 1 + Total Relaxation bound fails = 1 Total Relaxation NLS fails = 0 - Total Relaxation NLS iters = 97 + Total Relaxation NLS iters = 85 diff --git a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out index 35872dff8b..4b3a9d3aab 100644 --- a/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out +++ b/examples/arkode/C_serial/ark_dissipated_exp_entropy_1_0.out @@ -8,19 +8,17 @@ Dissipated Exponential Entropy problem: step t u e u_err delta e ------------------------------------------------------------------------------- 0 0.000000e+00 1.000000e+00 2.718282e+00 0.000000e+00 0.000000e+00 - 40 4.675332e-01 1.798296e-01 1.197013e+00 1.083801e-01 -1.521269e+00 - 80 1.147092e+00 -4.153968e-01 6.600783e-01 -9.770808e-01 -2.058204e+00 - 120 3.654055e+00 -1.391763e+00 2.486366e-01 -2.841170e+00 -2.469645e+00 + 40 4.820760e+00 -1.646470e+00 1.927290e-01 -3.337911e+00 -2.525553e+00 ------------------------------------------------------------------------------- Final Solver Statistics: - Internal solver steps = 130 (attempted = 130) - Total number of error test failures = 0 - Total RHS evals: Fe = 652, Fi = 0 - Total Relaxation Fn evals = 391 - Total Relaxation Jac evals = 781 + Internal solver steps = 41 (attempted = 42) + Total number of error test failures = 1 + Total RHS evals: Fe = 211, Fi = 0 + Total Relaxation Fn evals = 161 + Total Relaxation Jac evals = 287 Total Relaxation fails = 0 Total Relaxation bound fails = 0 Total Relaxation NLS fails = 0 - Total Relaxation NLS iters = 131 + Total Relaxation NLS iters = 77 diff --git a/examples/arkode/C_serial/ark_heat1D.out b/examples/arkode/C_serial/ark_heat1D.out index 4b1068888c..9af0df2ab1 100644 --- a/examples/arkode/C_serial/ark_heat1D.out +++ b/examples/arkode/C_serial/ark_heat1D.out @@ -18,12 +18,12 @@ ------------------------- Final Solver Statistics: - Internal solver steps = 190 (attempted = 190) - Total RHS evals: Fe = 0, Fi = 1903 + Internal solver steps = 81 (attempted = 81) + Total RHS evals: Fe = 0, Fi = 813 Total linear solver setups = 0 - Total linear iterations = 17826 - Total number of Jacobian-vector products = 17826 + Total linear iterations = 11330 + Total number of Jacobian-vector products = 11330 Total number of linear solver convergence failures = 0 - Total number of Newton iterations = 950 + Total number of Newton iterations = 405 Total number of nonlinear solver convergence failures = 0 Total number of error test failures = 0 diff --git a/examples/arkode/C_serial/ark_heat1D_adapt.out b/examples/arkode/C_serial/ark_heat1D_adapt.out index 8135e3df32..a614c53a0e 100644 --- a/examples/arkode/C_serial/ark_heat1D_adapt.out +++ b/examples/arkode/C_serial/ark_heat1D_adapt.out @@ -6,135 +6,60 @@ ---------------------------------------------------------------------------------------- 0 0.000000000000000e+00 0.000000000000000e+00 0.000000000000000e+00 21 0 0 1 3.629021901461023e-12 7.505751048377368e-09 2.979166031180459e-12 21 5 5 - 2 7.505751048377368e-09 1.501150209675474e-07 6.164657920190889e-09 21 5 5 - 3 1.501150209675474e-07 3.002300419350948e-06 1.293969127943737e-07 21 5 10 - 4 3.002300419350948e-06 6.004600838701896e-05 2.593514282988711e-06 21 5 10 - 5 6.004600838701896e-05 2.853823679832573e-04 5.166758334555005e-05 21 5 20 - 6 2.853823679832573e-04 2.575255434332890e-04 2.798555740976005e-04 21 5 25 - 7 2.575255434332890e-04 4.094541134469988e-04 4.794249470975060e-04 21 5 25 - 8 4.094541134469988e-04 4.094541134469988e-04 7.863858401326194e-04 21 5 29 - 9 4.094541134469988e-04 6.522908622655267e-04 1.082809129037782e-03 21 5 29 - 10 6.522908622655267e-04 5.699096897079724e-04 1.606858836596097e-03 23 5 40 - 11 5.699096897079724e-04 1.007836116841849e-03 2.005669425160000e-03 23 5 35 - 12 1.007836116841849e-03 1.007836116841849e-03 2.683040723903781e-03 23 5 40 - 13 1.007836116841849e-03 8.453991367856834e-04 3.678394364905319e-03 25 5 40 - 14 8.453991367856834e-04 1.990429632970147e-03 4.265067457277110e-03 25 5 34 - 15 1.990429632970147e-03 1.990429632970147e-03 5.574933430469675e-03 25 5 41 - 16 1.990429632970147e-03 3.606542084539227e-03 6.798364394830465e-03 25 5 35 - 17 4.980841065373463e-04 4.980841065373463e-04 6.927003185856736e-03 27 15 180 - 18 4.980841065373463e-04 4.980841065373463e-04 7.441563969778088e-03 29 5 30 - 19 4.980841065373463e-04 1.669338950987901e-03 7.722575172690612e-03 29 5 29 - 20 1.669338950987901e-03 3.660363409600048e-03 8.637783681073969e-03 29 5 44 - 21 3.660363409600048e-03 7.228866504893484e-03 1.050862732430420e-02 29 5 66 - 22 2.277066494413550e-04 2.223939246469188e-04 1.033655098852881e-02 32 20 250 - 23 2.223939246469188e-04 4.398048897676356e-04 1.092351423512213e-02 34 5 24 - 24 4.398048897676356e-04 1.023058876200847e-03 1.113462885573467e-02 34 5 33 - 25 1.023058876200847e-03 1.023058876200847e-03 1.161665279683433e-02 34 5 36 - 26 1.023058876200847e-03 3.919845082560766e-03 1.208659994169145e-02 34 5 38 - 27 3.919845082560766e-03 3.863020439217562e-03 1.378155752244160e-02 34 5 81 - 28 3.863020439217562e-03 1.257825200903444e-02 1.530364032030464e-02 34 5 59 - 29 1.533031872906549e-03 1.436302440195315e-03 1.578270750227194e-02 36 15 221 - 30 1.436302440195315e-03 3.755629101798260e-03 1.630186567569052e-02 36 5 31 - 31 2.870300468364886e-03 2.460481648357659e-03 1.728893354958566e-02 38 10 144 - 32 5.484132002743671e-04 5.448534872232822e-04 1.710787102567137e-02 40 15 251 - 33 5.448534872232822e-04 9.911472786863407e-04 1.728222131772621e-02 40 5 43 - 34 9.911472786863407e-04 2.853828564040550e-03 1.759429056441933e-02 40 5 47 - 35 2.853828564040550e-03 8.346188420319504e-03 1.845696364866320e-02 40 5 98 - 36 4.184969207140296e-03 4.184969207140296e-03 1.963139612674647e-02 40 10 209 - 37 7.891664187375526e-04 7.780072216640708e-04 1.916618790361855e-02 44 15 270 - 38 7.780072216640708e-04 1.432006588296146e-03 1.936507264204106e-02 44 5 51 - 39 1.432006588296146e-03 1.432006588296146e-03 1.933721559864914e-02 46 5 63 - 40 1.432006588296146e-03 2.920150155413109e-03 1.967900635018854e-02 46 5 59 - 41 2.920150155413109e-03 8.021410496618760e-03 2.034576732622878e-02 46 5 91 - 42 8.021410496618760e-03 8.021410496618760e-03 2.198707476731612e-02 46 5 105 - 43 8.021410496618760e-03 8.021410496618760e-03 2.338592734070328e-02 46 5 105 - 44 7.749248836531081e-04 7.712524403928612e-04 2.311665583789623e-02 50 15 273 - 45 7.712524403928612e-04 1.454207673515780e-03 2.323643927854141e-02 50 5 59 - 46 1.454207673515780e-03 3.893553595468784e-03 2.345743682946040e-02 50 5 75 - 47 3.893553595468784e-03 8.577785831996225e-03 2.401981148625224e-02 50 5 105 - 48 3.583582798475919e-03 3.583582798475919e-03 2.450182832136591e-02 50 10 210 - 49 3.583582798475919e-03 1.225842385200837e-02 2.495216274153317e-02 50 5 88 - 50 4.962462241849634e-03 4.962462241849634e-03 2.552759545114530e-02 50 10 208 - 51 4.962462241849634e-03 1.668087632819629e-02 2.605197291673569e-02 50 5 95 - 52 4.505316812294505e-03 4.505316812294505e-03 2.648793970156092e-02 50 10 201 - 53 4.505316812294505e-03 2.222468245231715e-02 2.688916611820219e-02 50 5 101 - 54 4.746858164506530e-03 4.746858164506530e-03 2.727761588174917e-02 50 15 298 - 55 4.746858164506530e-03 4.349218756600245e-03 2.848305395101498e-02 52 5 105 - 56 4.349218756600245e-03 4.349218756600245e-03 2.902306824658978e-02 54 5 105 - 57 4.349218756600245e-03 1.066724741463221e-02 2.931026262297523e-02 54 5 105 - 58 6.268748418325634e-03 6.268748418325634e-03 2.936878001655390e-02 56 10 210 - 59 6.268748418325634e-03 1.161381148923531e-02 2.970425918866458e-02 56 5 105 - 60 1.161381148923531e-02 1.028179098818762e-02 2.979356337650783e-02 58 5 105 - 61 1.028179098818762e-02 1.028179098818762e-02 2.969467522937706e-02 60 5 105 - 62 1.028179098818762e-02 3.106655738625877e-02 3.001826469123505e-02 60 5 105 - 63 1.471496945828350e-02 1.469024921725142e-02 3.039908149974539e-02 60 10 210 - 64 1.085599032570171e-02 1.085599032570171e-02 3.063067318046183e-02 60 10 210 - 65 1.085599032570171e-02 1.085599032570171e-02 3.082863809383847e-02 60 5 105 - 66 1.085599032570171e-02 1.085599032570171e-02 3.099902977389579e-02 60 5 105 - 67 7.618142079252098e-03 7.618142079252098e-03 3.110458948722743e-02 60 10 210 - 68 7.618142079252098e-03 3.289115457484437e-02 3.120052296435948e-02 60 5 105 - 69 3.289115457484437e-02 2.984967095026484e-02 3.153119483133013e-02 60 5 105 - 70 7.462417737566209e-03 7.462417737566209e-03 3.159027055714576e-02 60 6 126 - 71 7.462417737566209e-03 1.532601802900749e-02 3.164512521044466e-02 60 5 105 - 72 5.317294174445867e-03 5.317294174445867e-03 3.168191671045904e-02 60 10 210 - 73 5.317294174445867e-03 1.637705260014558e-02 3.171694897858042e-02 60 5 105 - 74 1.637705260014558e-02 5.597209894014091e-02 3.181506419526589e-02 60 5 105 - 75 9.763057448204533e-03 9.763057448204533e-03 3.186752063019930e-02 60 10 210 - 76 9.763057448204533e-03 3.404927513904092e-02 3.191613054349100e-02 60 5 105 - 77 3.404927513904092e-02 2.968548341756130e-02 3.206067821894520e-02 60 5 105 - 78 1.178500969634106e-02 1.178500969634106e-02 3.210368406300197e-02 60 10 210 - 79 1.178500969634106e-02 2.585117047072884e-02 3.214367493868805e-02 60 5 105 - 80 1.411007380226322e-02 1.411007380226322e-02 3.218801588316333e-02 60 10 210 - 81 1.411007380226322e-02 1.411007380226322e-02 3.222893682105193e-02 60 5 105 - 82 1.411007380226322e-02 1.401864440990195e-02 3.226656117886238e-02 60 5 105 - 83 1.401864440990195e-02 1.401864440990195e-02 3.230147951662023e-02 60 5 105 - 84 1.401864440990195e-02 1.303768352877046e-02 3.233369732860109e-02 60 5 105 - 85 7.810676399949200e-03 7.810676399949200e-03 3.235074731143681e-02 60 10 210 - 86 7.810676399949200e-03 7.810676399949200e-03 3.236714343315446e-02 60 5 105 - 87 7.810676399949200e-03 1.411979073878545e-02 3.238290227600748e-02 60 5 105 - 88 1.411979073878545e-02 3.418255178001077e-02 3.240986169975903e-02 60 5 105 - 89 1.683729734872759e-02 1.683729734872759e-02 3.243961052649499e-02 60 10 210 - 90 5.293743003823701e-03 5.293743003823701e-03 3.244847429329385e-02 60 10 210 - 91 5.293743003823701e-03 8.291768498653825e-03 3.245709535299850e-02 60 5 105 - 92 8.291768498653825e-03 1.880612123267676e-02 3.247017621575291e-02 60 5 105 - 93 1.173402792581162e-02 1.173402792581162e-02 3.248779528914644e-02 60 10 209 - 94 1.173402792581162e-02 1.173402792581162e-02 3.250442716997714e-02 60 5 105 - 95 1.173402792581162e-02 3.281754406804230e-02 3.252013886269631e-02 60 5 105 - 96 6.424707662957514e-03 6.424707662957514e-03 3.252836644102348e-02 60 10 197 - 97 6.424707662957514e-03 4.714988041054190e-02 3.253634036181408e-02 60 5 72 - 98 4.714988041054191e-03 4.714988041054191e-03 3.254203651909890e-02 60 10 171 - 99 4.714988041054191e-03 4.282144720721703e-02 3.254760362002126e-02 60 5 56 - 100 4.282144720721703e-02 3.592705003681280e-02 3.259281046463217e-02 60 5 105 - 101 7.349314806790228e-03 7.349314806790228e-03 3.259965013816767e-02 60 15 315 - 102 7.349314806790228e-03 3.112322123785429e-02 3.260625388050781e-02 60 5 96 - 103 3.112322123785429e-02 3.112322123785429e-02 3.263174602069833e-02 60 5 105 - 104 6.839739280813347e-03 6.839739280813347e-03 3.263685222363544e-02 60 15 315 - 105 6.839739280813347e-03 3.638819250655535e-02 3.264179137178386e-02 60 5 77 - 106 3.638819250655535e-02 3.638819250655535e-02 3.266544357612065e-02 60 5 105 - 107 1.812430795718352e-02 1.812430795718352e-02 3.267571852602801e-02 60 10 210 - 108 3.325944651421952e-03 3.325944651421952e-03 3.267751436841327e-02 60 15 315 - 109 3.325944651421952e-03 1.705033487710399e-02 3.267928353707002e-02 60 5 79 - 110 4.262583719275997e-03 4.262583719275997e-03 3.268151038658581e-02 60 6 118 - 111 4.262583719275997e-03 1.551192985487607e-02 3.268369082817933e-02 60 5 87 - 112 1.551192985487607e-02 2.477145186640316e-02 3.269122491441458e-02 60 5 105 - 113 1.660178108793211e-02 1.660178108793211e-02 3.269867454817608e-02 60 10 210 - 114 1.660178108793211e-02 1.660178108793211e-02 3.270557188991038e-02 60 5 105 - 115 1.660178108793211e-02 1.660178108793211e-02 3.271192363723516e-02 60 5 105 - 116 1.660178108793211e-02 3.371605679577483e-02 3.271779428194488e-02 60 5 105 - 117 1.522144924734310e-02 1.522144924734310e-02 3.272271516928414e-02 60 10 210 - 118 1.522144924734310e-02 1.396058321278275e-02 3.272735805276025e-02 60 5 105 - 119 1.396058321278275e-02 2.708386296373138e-02 3.273131056482627e-02 60 5 105 - 120 1.784278714797101e-02 1.559390397930733e-02 3.273593683845105e-02 60 10 210 - 121 1.108547745869386e-02 1.108547745869386e-02 3.273862071549129e-02 60 10 210 - 122 1.108547745869386e-02 3.935975276857615e-02 3.274118608200519e-02 60 5 105 - 123 9.839938192144036e-03 9.839938192144036e-03 3.274329592751463e-02 60 6 126 - 124 9.839938192144036e-03 3.408840272553354e-02 3.274535508616430e-02 60 5 105 - 125 2.571312978993083e-02 2.384800532128622e-02 3.274985374478378e-02 60 10 210 - 126 2.384800532128622e-02 1.550804686753758e-02 3.275393582150888e-02 60 5 105 - 127 1.550804686753758e-02 1.550804686753758e-02 3.275635661747035e-02 60 5 105 + 2 7.505751048377368e-09 1.501150209675474e-07 6.164657920190881e-09 21 5 5 + 3 1.501150209675474e-07 3.002300419350948e-06 1.293969127943736e-07 21 5 10 + 4 3.002300419350948e-06 6.004600838701896e-05 2.593514282988707e-06 21 5 10 + 5 6.004600838701896e-05 9.179695432740554e-04 5.166758334555006e-05 21 5 20 + 6 6.343529631021770e-04 6.343529631021770e-04 5.490107589070345e-04 21 10 71 + 7 6.343529631021770e-04 1.640766607248460e-03 1.016221951592573e-03 21 5 30 + 8 1.640766607248460e-03 1.640766607248460e-03 2.134866313383894e-03 21 5 44 + 9 1.640766607248460e-03 3.176698405719737e-03 3.286762343767416e-03 23 5 49 + 10 3.176698405719737e-03 5.205769554730186e-03 5.734914214529641e-03 25 5 64 + 11 5.205769554730186e-03 1.339482149449628e-02 8.758410337014513e-03 25 5 68 + 12 1.339482149449628e-02 2.332821068681652e-02 1.485648844651735e-02 29 5 105 + 13 1.248179029454408e-02 1.248179029454408e-02 1.921287199748071e-02 36 10 210 + 14 9.588256882437387e-03 9.588256882437387e-03 2.104862438183799e-02 41 10 210 + 15 9.588256882437387e-03 9.072835074236115e-03 2.233672417170544e-02 45 5 105 + 16 9.072835074236115e-03 1.988051835432095e-02 2.343939842488585e-02 47 5 105 + 17 6.960791062868028e-03 6.960791062868028e-03 2.405632210541165e-02 51 10 210 + 18 6.960791062868028e-03 6.960791062868028e-03 2.492132293215528e-02 51 5 105 + 19 6.960791062868028e-03 3.066147567606387e-02 2.568044417989735e-02 51 5 105 + 20 1.520100022024879e-02 1.520100022024879e-02 2.703440991514135e-02 51 10 210 + 21 1.520100022024879e-02 1.402812176548887e-02 2.893254344544397e-02 53 5 105 + 22 3.453230395577901e-03 3.453230395577901e-03 2.907729515230845e-02 57 15 315 + 23 3.453230395577901e-03 4.380619717346660e-02 2.926736320852006e-02 57 5 105 + 24 2.143697625828337e-02 2.143697625828337e-02 3.022770522599001e-02 57 10 210 + 25 1.356011281557917e-02 1.356011281557917e-02 3.023724114482764e-02 59 10 210 + 26 1.356011281557917e-02 1.356011281557917e-02 3.009776300185301e-02 61 5 105 + 27 1.356011281557917e-02 3.138761818464553e-02 3.039254356669188e-02 61 5 105 + 28 7.846904546161384e-03 7.846904546161384e-03 3.053825831218209e-02 61 8 168 + 29 7.846904546161384e-03 2.239691157381613e-02 3.066884228245018e-02 61 5 105 + 30 2.239691157381613e-02 5.412840940406207e-02 3.097561342632622e-02 61 5 105 + 31 1.353210235101552e-02 1.353210235101552e-02 3.112115182492113e-02 61 6 126 + 32 1.353210235101552e-02 4.142434758270885e-02 3.124840273405157e-02 61 5 105 + 33 4.142434758270885e-02 3.618670101066103e-02 3.153571866268843e-02 61 5 105 + 34 3.618670101066103e-02 3.618670101066103e-02 3.173010312408515e-02 61 5 105 + 35 2.214853217414426e-02 2.214853217414426e-02 3.182094040960617e-02 61 10 210 + 36 2.214853217414426e-02 2.214853217414426e-02 3.189816288230699e-02 61 5 105 + 37 2.214853217414426e-02 5.186611313324672e-02 3.196759669660224e-02 61 5 105 + 38 8.040644595736463e-03 8.040644595736463e-03 3.199040525837332e-02 61 15 315 + 39 8.040644595736463e-03 5.876157539566557e-02 3.201252102107658e-02 61 5 105 + 40 3.587005198309809e-02 3.587005198309809e-02 3.210344780887179e-02 61 10 210 + 41 3.587005198309809e-02 5.488468266739412e-02 3.217985412734894e-02 61 5 105 + 42 1.374405125972745e-02 1.374405125972745e-02 3.220409719627156e-02 61 15 315 + 43 1.374405125972745e-02 2.631735687158033e-02 3.222687726392420e-02 61 5 105 + 44 2.631735687158033e-02 4.896506098319962e-02 3.226656316743638e-02 61 5 105 + 45 3.843089200986815e-02 3.509372351306133e-02 3.231817217122992e-02 61 10 210 + 46 3.509372351306133e-02 5.783394726183869e-02 3.235628573228867e-02 61 5 105 + 47 5.783394726183869e-02 5.783394726183869e-02 3.240393576192167e-02 61 5 105 + 48 5.783394726183869e-02 5.783394726183869e-02 3.244648352442751e-02 61 5 105 + 49 5.783394726183869e-02 9.181938668493264e-02 3.247357215372555e-02 61 5 105 + 50 9.181938668493264e-02 8.705576617257466e-02 3.250192810507965e-02 61 5 105 + 51 7.053634514968483e-02 5.234936503647198e-02 3.252069946290664e-02 61 10 210 + 52 5.234936503647198e-02 5.234936503647198e-02 3.252835118465876e-02 61 5 105 ---------------------------------------------------------------------------------------- Final solver statistics: - Total number of time steps = 127 - Total nonlinear iterations = 868 - Total linear iterations = 15028 + Total number of time steps = 52 + Total nonlinear iterations = 349 + Total linear iterations = 6445 diff --git a/examples/arkode/C_serial/ark_robertson.out b/examples/arkode/C_serial/ark_robertson.out index f4774b096c..3c04cc2765 100644 --- a/examples/arkode/C_serial/ark_robertson.out +++ b/examples/arkode/C_serial/ark_robertson.out @@ -4,127 +4,127 @@ Robertson ODE test problem: t u v w -------------------------------------------------- 0.000e+00 1.00000e+00 0.00000e+00 0.00000e+00 - 1.000e+09 2.08319e-06 8.28673e-12 9.99998e-01 - 2.000e+09 1.04165e-06 4.16315e-12 9.99999e-01 - 3.000e+09 6.94436e-07 2.79812e-12 9.99999e-01 - 4.000e+09 5.20822e-07 2.09671e-12 9.99999e-01 - 5.000e+09 4.16653e-07 1.65358e-12 1.00000e+00 - 6.000e+09 3.47215e-07 1.38790e-12 1.00000e+00 - 7.000e+09 2.97617e-07 1.19569e-12 1.00000e+00 - 8.000e+09 2.60418e-07 1.03823e-12 1.00000e+00 - 9.000e+09 2.31478e-07 9.17074e-13 1.00000e+00 - 1.000e+10 2.08331e-07 8.40189e-13 1.00000e+00 - 1.100e+10 1.89393e-07 7.61696e-13 1.00000e+00 - 1.200e+10 1.73605e-07 6.83245e-13 1.00000e+00 - 1.300e+10 1.60257e-07 6.52283e-13 1.00000e+00 - 1.400e+10 1.48808e-07 6.03096e-13 1.00000e+00 - 1.500e+10 1.38890e-07 5.53757e-13 1.00000e+00 - 1.600e+10 1.30208e-07 5.02107e-13 1.00000e+00 - 1.700e+10 1.22550e-07 5.05848e-13 1.00000e+00 - 1.800e+10 1.15741e-07 4.81445e-13 1.00000e+00 - 1.900e+10 1.09650e-07 4.30685e-13 1.00000e+00 - 2.000e+10 1.04164e-07 4.00365e-13 1.00000e+00 - 2.100e+10 9.92051e-08 3.87356e-13 1.00000e+00 - 2.200e+10 9.46982e-08 3.79643e-13 1.00000e+00 - 2.300e+10 9.05793e-08 3.59181e-13 1.00000e+00 - 2.400e+10 8.68052e-08 3.35291e-13 1.00000e+00 - 2.500e+10 8.33344e-08 3.30550e-13 1.00000e+00 - 2.600e+10 8.01274e-08 3.33613e-13 1.00000e+00 - 2.700e+10 7.71569e-08 3.13668e-13 1.00000e+00 - 2.800e+10 7.44011e-08 2.86383e-13 1.00000e+00 - 2.900e+10 7.18380e-08 2.67839e-13 1.00000e+00 - 3.000e+10 6.94456e-08 2.74115e-13 1.00000e+00 - 3.100e+10 6.72046e-08 2.89954e-13 1.00000e+00 - 3.200e+10 6.51032e-08 2.82625e-13 1.00000e+00 - 3.300e+10 6.31303e-08 2.63498e-13 1.00000e+00 - 3.400e+10 6.12746e-08 2.44356e-13 1.00000e+00 - 3.500e+10 5.95249e-08 2.36979e-13 1.00000e+00 - 3.600e+10 5.78710e-08 2.38699e-13 1.00000e+00 - 3.700e+10 5.63063e-08 2.34238e-13 1.00000e+00 - 3.800e+10 5.48245e-08 2.25989e-13 1.00000e+00 - 3.900e+10 5.34192e-08 2.16535e-13 1.00000e+00 - 4.000e+10 5.20842e-08 2.08459e-13 1.00000e+00 - 4.100e+10 5.08134e-08 2.01687e-13 1.00000e+00 - 4.200e+10 4.96024e-08 1.93815e-13 1.00000e+00 - 4.300e+10 4.84479e-08 1.85739e-13 1.00000e+00 - 4.400e+10 4.73465e-08 1.78395e-13 1.00000e+00 - 4.500e+10 4.62947e-08 1.72720e-13 1.00000e+00 - 4.600e+10 4.52893e-08 1.69648e-13 1.00000e+00 - 4.700e+10 4.43267e-08 1.70114e-13 1.00000e+00 - 4.800e+10 4.34036e-08 1.74964e-13 1.00000e+00 - 4.900e+10 4.25175e-08 1.78828e-13 1.00000e+00 - 5.000e+10 4.16666e-08 1.78796e-13 1.00000e+00 - 5.100e+10 4.08492e-08 1.75793e-13 1.00000e+00 - 5.200e+10 4.00636e-08 1.70743e-13 1.00000e+00 - 5.300e+10 3.93079e-08 1.64571e-13 1.00000e+00 - 5.400e+10 3.85805e-08 1.58202e-13 1.00000e+00 - 5.500e+10 3.78794e-08 1.52559e-13 1.00000e+00 - 5.600e+10 3.72031e-08 1.48433e-13 1.00000e+00 - 5.700e+10 3.65504e-08 1.45182e-13 1.00000e+00 - 5.800e+10 3.59202e-08 1.42852e-13 1.00000e+00 - 5.900e+10 3.53114e-08 1.42011e-13 1.00000e+00 - 6.000e+10 3.47228e-08 1.43770e-13 1.00000e+00 - 6.100e+10 3.41536e-08 1.42505e-13 1.00000e+00 - 6.200e+10 3.36028e-08 1.31615e-13 1.00000e+00 - 6.300e+10 3.30693e-08 1.21361e-13 1.00000e+00 - 6.400e+10 3.25524e-08 1.16679e-13 1.00000e+00 - 6.500e+10 3.20514e-08 1.16007e-13 1.00000e+00 - 6.600e+10 3.15658e-08 1.17783e-13 1.00000e+00 - 6.700e+10 3.10947e-08 1.20445e-13 1.00000e+00 - 6.800e+10 3.06376e-08 1.22430e-13 1.00000e+00 - 6.900e+10 3.01937e-08 1.22179e-13 1.00000e+00 - 7.000e+10 2.97624e-08 1.18554e-13 1.00000e+00 - 7.100e+10 2.93432e-08 1.19564e-13 1.00000e+00 - 7.200e+10 2.89357e-08 1.20819e-13 1.00000e+00 - 7.300e+10 2.85393e-08 1.12238e-13 1.00000e+00 - 7.400e+10 2.81536e-08 1.08409e-13 1.00000e+00 - 7.500e+10 2.77782e-08 1.11242e-13 1.00000e+00 - 7.600e+10 2.74127e-08 1.08952e-13 1.00000e+00 - 7.700e+10 2.70567e-08 1.02106e-13 1.00000e+00 - 7.800e+10 2.67098e-08 1.03189e-13 1.00000e+00 - 7.900e+10 2.63717e-08 1.10597e-13 1.00000e+00 - 8.000e+10 2.60421e-08 1.05448e-13 1.00000e+00 - 8.100e+10 2.57206e-08 1.03702e-13 1.00000e+00 - 8.200e+10 2.54069e-08 1.04168e-13 1.00000e+00 - 8.300e+10 2.51008e-08 1.00603e-13 1.00000e+00 - 8.400e+10 2.48020e-08 9.77251e-14 1.00000e+00 - 8.500e+10 2.45102e-08 9.82338e-14 1.00000e+00 - 8.600e+10 2.42252e-08 9.64282e-14 1.00000e+00 - 8.700e+10 2.39467e-08 9.59624e-14 1.00000e+00 - 8.800e+10 2.36746e-08 9.45243e-14 1.00000e+00 - 8.900e+10 2.34086e-08 9.10474e-14 1.00000e+00 - 9.000e+10 2.31485e-08 9.02954e-14 1.00000e+00 - 9.100e+10 2.28941e-08 9.57143e-14 1.00000e+00 - 9.200e+10 2.26452e-08 1.00341e-13 1.00000e+00 - 9.300e+10 2.24017e-08 1.03006e-13 1.00000e+00 - 9.400e+10 2.21634e-08 1.03573e-13 1.00000e+00 - 9.500e+10 2.19301e-08 1.01905e-13 1.00000e+00 - 9.600e+10 2.17016e-08 9.78643e-14 1.00000e+00 - 9.700e+10 2.14779e-08 9.13138e-14 1.00000e+00 - 9.800e+10 2.12588e-08 8.23720e-14 1.00000e+00 - 9.900e+10 2.10440e-08 7.45584e-14 1.00000e+00 - 1.000e+11 2.08334e-08 6.88517e-14 1.00000e+00 + 1.000e+09 2.08331e-06 8.33429e-12 9.99998e-01 + 2.000e+09 1.04164e-06 4.16714e-12 9.99999e-01 + 3.000e+09 6.94449e-07 2.77740e-12 9.99999e-01 + 4.000e+09 5.20749e-07 2.07853e-12 9.99999e-01 + 5.000e+09 4.16649e-07 1.66767e-12 1.00000e+00 + 6.000e+09 3.47167e-07 1.38899e-12 1.00000e+00 + 7.000e+09 2.97627e-07 1.19146e-12 1.00000e+00 + 8.000e+09 2.60419e-07 1.04226e-12 1.00000e+00 + 9.000e+09 2.31453e-07 9.25133e-13 1.00000e+00 + 1.000e+10 2.08319e-07 8.32781e-13 1.00000e+00 + 1.100e+10 1.89396e-07 7.57619e-13 1.00000e+00 + 1.200e+10 1.73606e-07 6.93342e-13 1.00000e+00 + 1.300e+10 1.60262e-07 6.41680e-13 1.00000e+00 + 1.400e+10 1.48789e-07 5.97724e-13 1.00000e+00 + 1.500e+10 1.38865e-07 5.57820e-13 1.00000e+00 + 1.600e+10 1.30210e-07 5.21682e-13 1.00000e+00 + 1.700e+10 1.22552e-07 4.89114e-13 1.00000e+00 + 1.800e+10 1.15736e-07 4.60496e-13 1.00000e+00 + 1.900e+10 1.09647e-07 4.36195e-13 1.00000e+00 + 2.000e+10 1.04172e-07 4.16546e-13 1.00000e+00 + 2.100e+10 9.92030e-08 3.99272e-13 1.00000e+00 + 2.200e+10 9.46813e-08 3.81801e-13 1.00000e+00 + 2.300e+10 9.05601e-08 3.64664e-13 1.00000e+00 + 2.400e+10 8.67926e-08 3.48393e-13 1.00000e+00 + 2.500e+10 8.33323e-08 3.33523e-13 1.00000e+00 + 2.600e+10 8.01327e-08 3.20559e-13 1.00000e+00 + 2.700e+10 7.71616e-08 3.07972e-13 1.00000e+00 + 2.800e+10 7.44020e-08 2.95291e-13 1.00000e+00 + 2.900e+10 7.18354e-08 2.83442e-13 1.00000e+00 + 3.000e+10 6.94432e-08 2.73350e-13 1.00000e+00 + 3.100e+10 6.72067e-08 2.65938e-13 1.00000e+00 + 3.200e+10 6.51076e-08 2.61517e-13 1.00000e+00 + 3.300e+10 6.31345e-08 2.52902e-13 1.00000e+00 + 3.400e+10 6.12776e-08 2.44744e-13 1.00000e+00 + 3.500e+10 5.95267e-08 2.39282e-13 1.00000e+00 + 3.600e+10 5.78731e-08 2.31701e-13 1.00000e+00 + 3.700e+10 5.63088e-08 2.25415e-13 1.00000e+00 + 3.800e+10 5.48259e-08 2.19890e-13 1.00000e+00 + 3.900e+10 5.34190e-08 2.14616e-13 1.00000e+00 + 4.000e+10 5.20832e-08 2.09489e-13 1.00000e+00 + 4.100e+10 5.08134e-08 2.04402e-13 1.00000e+00 + 4.200e+10 4.96046e-08 1.99252e-13 1.00000e+00 + 4.300e+10 4.84517e-08 1.93934e-13 1.00000e+00 + 4.400e+10 4.73499e-08 1.88761e-13 1.00000e+00 + 4.500e+10 4.62960e-08 1.84295e-13 1.00000e+00 + 4.600e+10 4.52878e-08 1.80408e-13 1.00000e+00 + 4.700e+10 4.43228e-08 1.76962e-13 1.00000e+00 + 4.800e+10 4.33987e-08 1.73820e-13 1.00000e+00 + 4.900e+10 4.25132e-08 1.70846e-13 1.00000e+00 + 5.000e+10 4.16639e-08 1.67900e-13 1.00000e+00 + 5.100e+10 4.08484e-08 1.64847e-13 1.00000e+00 + 5.200e+10 4.00645e-08 1.61548e-13 1.00000e+00 + 5.300e+10 3.93097e-08 1.57866e-13 1.00000e+00 + 5.400e+10 3.85818e-08 1.53755e-13 1.00000e+00 + 5.500e+10 3.78790e-08 1.49796e-13 1.00000e+00 + 5.600e+10 3.72005e-08 1.46111e-13 1.00000e+00 + 5.700e+10 3.65453e-08 1.42690e-13 1.00000e+00 + 5.800e+10 3.59126e-08 1.39525e-13 1.00000e+00 + 5.900e+10 3.53016e-08 1.36604e-13 1.00000e+00 + 6.000e+10 3.47113e-08 1.33919e-13 1.00000e+00 + 6.100e+10 3.41410e-08 1.31458e-13 1.00000e+00 + 6.200e+10 3.35898e-08 1.29214e-13 1.00000e+00 + 6.300e+10 3.30568e-08 1.27176e-13 1.00000e+00 + 6.400e+10 3.25411e-08 1.25334e-13 1.00000e+00 + 6.500e+10 3.20419e-08 1.23678e-13 1.00000e+00 + 6.600e+10 3.15583e-08 1.22199e-13 1.00000e+00 + 6.700e+10 3.10895e-08 1.20886e-13 1.00000e+00 + 6.800e+10 3.06346e-08 1.19731e-13 1.00000e+00 + 6.900e+10 3.01927e-08 1.18723e-13 1.00000e+00 + 7.000e+10 2.97630e-08 1.17853e-13 1.00000e+00 + 7.100e+10 2.93446e-08 1.17111e-13 1.00000e+00 + 7.200e+10 2.89370e-08 1.16380e-13 1.00000e+00 + 7.300e+10 2.85401e-08 1.15393e-13 1.00000e+00 + 7.400e+10 2.81538e-08 1.14172e-13 1.00000e+00 + 7.500e+10 2.77777e-08 1.12754e-13 1.00000e+00 + 7.600e+10 2.74115e-08 1.11179e-13 1.00000e+00 + 7.700e+10 2.70548e-08 1.09484e-13 1.00000e+00 + 7.800e+10 2.67075e-08 1.07707e-13 1.00000e+00 + 7.900e+10 2.63691e-08 1.05886e-13 1.00000e+00 + 8.000e+10 2.60394e-08 1.04060e-13 1.00000e+00 + 8.100e+10 2.57180e-08 1.02266e-13 1.00000e+00 + 8.200e+10 2.54046e-08 1.00543e-13 1.00000e+00 + 8.300e+10 2.50989e-08 9.89277e-14 1.00000e+00 + 8.400e+10 2.48007e-08 9.74592e-14 1.00000e+00 + 8.500e+10 2.45096e-08 9.61754e-14 1.00000e+00 + 8.600e+10 2.42252e-08 9.51142e-14 1.00000e+00 + 8.700e+10 2.39473e-08 9.43137e-14 1.00000e+00 + 8.800e+10 2.36756e-08 9.38120e-14 1.00000e+00 + 8.900e+10 2.34097e-08 9.36471e-14 1.00000e+00 + 9.000e+10 2.31496e-08 9.33817e-14 1.00000e+00 + 9.100e+10 2.28952e-08 9.26556e-14 1.00000e+00 + 9.200e+10 2.26463e-08 9.16002e-14 1.00000e+00 + 9.300e+10 2.24027e-08 9.03468e-14 1.00000e+00 + 9.400e+10 2.21644e-08 8.90268e-14 1.00000e+00 + 9.500e+10 2.19311e-08 8.77717e-14 1.00000e+00 + 9.600e+10 2.17027e-08 8.67127e-14 1.00000e+00 + 9.700e+10 2.14789e-08 8.59704e-14 1.00000e+00 + 9.800e+10 2.12597e-08 8.53046e-14 1.00000e+00 + 9.900e+10 2.10450e-08 8.45747e-14 1.00000e+00 + 1.000e+11 2.08345e-08 8.37885e-14 1.00000e+00 -------------------------------------------------- Final Statistics: -Current time = 115949571244.6344 -Steps = 740 -Step attempts = 784 +Current time = 104593591173.6704 +Steps = 139 +Step attempts = 141 Stability limited steps = 0 -Accuracy limited steps = 779 -Error test fails = 39 -NLS step fails = 5 +Accuracy limited steps = 139 +Error test fails = 0 +NLS step fails = 2 Inequality constraint fails = 0 Initial step size = 1e-08 -Last step size = 18264803707.2694 -Current step size = 18264803707.2694 +Last step size = 7800622211.884792 +Current step size = 22352983592.05556 Explicit RHS fn evals = 0 -Implicit RHS fn evals = 25084 -NLS iters = 21171 -NLS fails = 46 -NLS iters per step = 28.60945945945946 -LS setups = 208 -Jac fn evals = 52 +Implicit RHS fn evals = 4997 +NLS iters = 4298 +NLS fails = 39 +NLS iters per step = 30.92086330935252 +LS setups = 110 +Jac fn evals = 40 LS RHS fn evals = 0 Prec setup evals = 0 Prec solves = 0 @@ -133,5 +133,5 @@ LS fails = 0 Jac-times setups = 0 Jac-times evals = 0 LS iters per NLS iter = 0 -Jac evals per NLS iter = 0.002456190071323981 +Jac evals per NLS iter = 0.009306654257794323 Prec evals per NLS iter = 0 diff --git a/examples/arkode/C_serial/ark_robertson_constraints.out b/examples/arkode/C_serial/ark_robertson_constraints.out index a5abcd3dfd..5144c1bda3 100644 --- a/examples/arkode/C_serial/ark_robertson_constraints.out +++ b/examples/arkode/C_serial/ark_robertson_constraints.out @@ -4,116 +4,116 @@ Robertson ODE test problem: t u v w -------------------------------------------------- 0.000e+00 1.00000e+00 0.00000e+00 0.00000e+00 - 1.000e+09 2.08372e-06 1.28623e-11 9.99998e-01 - 2.000e+09 1.04177e-06 4.17962e-12 9.99999e-01 - 3.000e+09 6.94491e-07 1.08662e-12 9.99999e-01 - 4.000e+09 5.20859e-07 2.11202e-12 9.99999e-01 - 5.000e+09 4.16681e-07 2.67597e-12 1.00000e+00 - 6.000e+09 3.47234e-07 1.32035e-12 1.00000e+00 - 7.000e+09 2.97625e-07 9.17289e-13 1.00000e+00 - 8.000e+09 2.60423e-07 1.34317e-12 1.00000e+00 - 9.000e+09 2.31483e-07 1.77831e-13 1.00000e+00 - 1.000e+10 2.08336e-07 8.66411e-14 1.00000e+00 - 1.100e+10 1.89400e-07 -1.20076e-12 1.00000e+00 - 1.200e+10 1.73615e-07 6.95917e-13 1.00000e+00 - 1.300e+10 1.60260e-07 6.35488e-13 1.00000e+00 - 1.400e+10 1.48812e-07 6.62922e-13 1.00000e+00 - 1.500e+10 1.38889e-07 9.89014e-13 1.00000e+00 - 1.600e+10 1.30210e-07 4.44922e-13 1.00000e+00 - 1.700e+10 1.22549e-07 1.72526e-12 1.00000e+00 - 1.800e+10 1.15739e-07 3.90984e-12 1.00000e+00 - 1.900e+10 1.09651e-07 4.44476e-13 1.00000e+00 - 2.000e+10 1.04167e-07 1.31808e-12 1.00000e+00 - 2.100e+10 9.92075e-08 7.65928e-13 1.00000e+00 - 2.200e+10 9.46989e-08 -1.16031e-13 1.00000e+00 - 2.300e+10 9.05834e-08 -2.00950e-12 1.00000e+00 - 2.400e+10 8.68068e-08 3.52748e-13 1.00000e+00 - 2.500e+10 8.33341e-08 4.86598e-13 1.00000e+00 - 2.600e+10 8.01289e-08 5.62896e-13 1.00000e+00 - 2.700e+10 7.71612e-08 6.08319e-13 1.00000e+00 - 2.800e+10 7.44056e-08 4.14818e-13 1.00000e+00 - 2.900e+10 7.18402e-08 6.98424e-14 1.00000e+00 - 3.000e+10 6.94449e-08 6.23385e-13 1.00000e+00 - 3.100e+10 6.72051e-08 2.68162e-13 1.00000e+00 - 3.200e+10 6.51049e-08 2.53517e-13 1.00000e+00 - 3.300e+10 6.31320e-08 2.53703e-13 1.00000e+00 - 3.400e+10 6.12751e-08 2.53682e-13 1.00000e+00 - 3.500e+10 5.95243e-08 2.90151e-13 1.00000e+00 - 3.600e+10 5.78709e-08 2.74982e-13 1.00000e+00 - 3.700e+10 5.63068e-08 2.31075e-13 1.00000e+00 - 3.800e+10 5.48248e-08 4.05480e-13 1.00000e+00 - 3.900e+10 5.34193e-08 2.94098e-13 1.00000e+00 - 4.000e+10 5.20839e-08 1.94391e-13 1.00000e+00 - 4.100e+10 5.08135e-08 2.15900e-13 1.00000e+00 - 4.200e+10 4.96037e-08 1.41126e-13 1.00000e+00 - 4.300e+10 4.84501e-08 1.79785e-13 1.00000e+00 - 4.400e+10 4.73464e-08 2.69369e-12 1.00000e+00 - 4.500e+10 4.62850e-08 1.18598e-11 1.00000e+00 - 4.600e+10 4.52825e-08 7.90431e-12 1.00000e+00 - 4.700e+10 4.43266e-08 1.76122e-13 1.00000e+00 - 4.800e+10 4.34029e-08 2.26422e-13 1.00000e+00 - 4.900e+10 4.25172e-08 1.84214e-13 1.00000e+00 - 5.000e+10 4.16669e-08 1.23287e-13 1.00000e+00 - 5.100e+10 4.08543e-08 -4.28961e-12 1.00000e+00 - 5.200e+10 4.00729e-08 -8.50417e-12 1.00000e+00 - 5.300e+10 3.93110e-08 -2.57802e-12 1.00000e+00 - 5.400e+10 3.85804e-08 1.47943e-13 1.00000e+00 - 5.500e+10 3.78772e-08 1.86930e-12 1.00000e+00 - 5.600e+10 3.72025e-08 1.31732e-13 1.00000e+00 - 5.700e+10 3.65494e-08 5.66584e-13 1.00000e+00 - 5.800e+10 3.59196e-08 1.78679e-13 1.00000e+00 - 5.900e+10 3.53112e-08 -1.92694e-13 1.00000e+00 - 6.000e+10 3.47222e-08 2.42813e-13 1.00000e+00 - 6.100e+10 3.41531e-08 1.50415e-13 1.00000e+00 - 6.200e+10 3.36022e-08 1.34708e-13 1.00000e+00 - 6.300e+10 3.30690e-08 -7.92804e-16 1.00000e+00 - 6.400e+10 3.25522e-08 1.27438e-13 1.00000e+00 - 6.500e+10 3.20515e-08 3.49793e-14 1.00000e+00 - 6.600e+10 3.15669e-08 -1.02211e-12 1.00000e+00 - 6.700e+10 3.10946e-08 1.41439e-13 1.00000e+00 - 6.800e+10 3.06374e-08 7.27249e-14 1.00000e+00 - 6.900e+10 3.01894e-08 4.00333e-12 1.00000e+00 - 7.000e+10 2.97602e-08 1.87205e-12 1.00000e+00 - 7.100e+10 2.93428e-08 1.30225e-13 1.00000e+00 - 7.200e+10 2.89354e-08 1.31656e-14 1.00000e+00 - 7.300e+10 2.85437e-08 -4.70269e-12 1.00000e+00 - 7.400e+10 2.81625e-08 -9.20849e-12 1.00000e+00 - 7.500e+10 2.77780e-08 -5.78693e-14 1.00000e+00 - 7.600e+10 2.74119e-08 5.68095e-13 1.00000e+00 - 7.700e+10 2.70563e-08 1.53510e-13 1.00000e+00 - 7.800e+10 2.67092e-08 3.61374e-13 1.00000e+00 - 7.900e+10 2.63714e-08 9.53870e-14 1.00000e+00 - 8.000e+10 2.60417e-08 1.04868e-13 1.00000e+00 - 8.100e+10 2.57202e-08 9.19696e-14 1.00000e+00 - 8.200e+10 2.54065e-08 1.04617e-13 1.00000e+00 - 8.300e+10 2.51004e-08 1.17459e-13 1.00000e+00 - 8.400e+10 2.48017e-08 4.24962e-14 1.00000e+00 - 8.500e+10 2.45107e-08 -7.68506e-13 1.00000e+00 - 8.600e+10 2.42268e-08 -1.88041e-12 1.00000e+00 - 8.700e+10 2.39489e-08 -2.44492e-12 1.00000e+00 - 8.800e+10 2.36760e-08 -1.61373e-12 1.00000e+00 - 8.900e+10 2.34086e-08 -2.03789e-13 1.00000e+00 - 9.000e+10 2.31474e-08 8.50587e-13 1.00000e+00 - 9.100e+10 2.28938e-08 1.36755e-13 1.00000e+00 - 9.200e+10 2.26451e-08 -2.32772e-14 1.00000e+00 - 9.300e+10 2.24015e-08 8.00906e-14 1.00000e+00 - 9.400e+10 2.21631e-08 8.59755e-14 1.00000e+00 - 9.500e+10 2.19305e-08 -5.14361e-13 1.00000e+00 - 9.600e+10 2.17023e-08 -7.48165e-13 1.00000e+00 - 9.700e+10 2.14796e-08 -1.80243e-12 1.00000e+00 - 9.800e+10 2.12586e-08 5.56097e-14 1.00000e+00 - 9.900e+10 2.10438e-08 1.05420e-13 1.00000e+00 - 1.000e+11 2.08333e-08 9.66856e-14 1.00000e+00 + 1.000e+09 2.08360e-06 8.36400e-12 9.99998e-01 + 2.000e+09 1.04172e-06 4.15311e-12 9.99999e-01 + 3.000e+09 6.94478e-07 2.68507e-12 9.99999e-01 + 4.000e+09 5.20856e-07 2.09660e-12 9.99999e-01 + 5.000e+09 4.16657e-07 1.69078e-12 1.00000e+00 + 6.000e+09 3.47223e-07 1.64565e-12 1.00000e+00 + 7.000e+09 2.97628e-07 1.19352e-12 1.00000e+00 + 8.000e+09 2.60424e-07 8.66465e-13 1.00000e+00 + 9.000e+09 2.31487e-07 9.48683e-13 1.00000e+00 + 1.000e+10 2.08338e-07 8.59228e-13 1.00000e+00 + 1.100e+10 1.89398e-07 7.19219e-13 1.00000e+00 + 1.200e+10 1.73614e-07 9.57213e-13 1.00000e+00 + 1.300e+10 1.60259e-07 6.37403e-13 1.00000e+00 + 1.400e+10 1.48812e-07 6.09353e-13 1.00000e+00 + 1.500e+10 1.38891e-07 6.06346e-13 1.00000e+00 + 1.600e+10 1.30210e-07 5.35055e-13 1.00000e+00 + 1.700e+10 1.22551e-07 3.22042e-13 1.00000e+00 + 1.800e+10 1.15742e-07 4.04820e-13 1.00000e+00 + 1.900e+10 1.09651e-07 3.51504e-13 1.00000e+00 + 2.000e+10 1.04168e-07 9.35110e-13 1.00000e+00 + 2.100e+10 9.92076e-08 3.93511e-13 1.00000e+00 + 2.200e+10 9.46983e-08 2.04458e-13 1.00000e+00 + 2.300e+10 9.05796e-08 1.53673e-12 1.00000e+00 + 2.400e+10 8.68056e-08 1.30024e-12 1.00000e+00 + 2.500e+10 8.33343e-08 3.32990e-13 1.00000e+00 + 2.600e+10 8.01291e-08 3.37100e-13 1.00000e+00 + 2.700e+10 7.71613e-08 3.05620e-13 1.00000e+00 + 2.800e+10 7.44054e-08 3.94416e-13 1.00000e+00 + 2.900e+10 7.18393e-08 7.39108e-13 1.00000e+00 + 3.000e+10 6.94451e-08 2.84752e-13 1.00000e+00 + 3.100e+10 6.72045e-08 6.82125e-13 1.00000e+00 + 3.200e+10 6.51045e-08 5.16099e-13 1.00000e+00 + 3.300e+10 6.31319e-08 2.40192e-13 1.00000e+00 + 3.400e+10 6.12751e-08 2.46306e-13 1.00000e+00 + 3.500e+10 5.95238e-08 7.21721e-13 1.00000e+00 + 3.600e+10 5.78709e-08 2.00297e-13 1.00000e+00 + 3.700e+10 5.63069e-08 1.73639e-13 1.00000e+00 + 3.800e+10 5.48250e-08 2.46595e-13 1.00000e+00 + 3.900e+10 5.34196e-08 -1.16870e-13 1.00000e+00 + 4.000e+10 5.20838e-08 1.99346e-13 1.00000e+00 + 4.100e+10 5.08134e-08 2.04472e-13 1.00000e+00 + 4.200e+10 4.96036e-08 1.87262e-13 1.00000e+00 + 4.300e+10 4.84499e-08 2.13767e-13 1.00000e+00 + 4.400e+10 4.73488e-08 2.29471e-13 1.00000e+00 + 4.500e+10 4.62967e-08 1.76227e-13 1.00000e+00 + 4.600e+10 4.52900e-08 3.33520e-13 1.00000e+00 + 4.700e+10 4.43264e-08 3.88600e-13 1.00000e+00 + 4.800e+10 4.34032e-08 8.18879e-14 1.00000e+00 + 4.900e+10 4.25173e-08 2.33610e-13 1.00000e+00 + 5.000e+10 4.16672e-08 -4.64379e-14 1.00000e+00 + 5.100e+10 4.08497e-08 4.58390e-13 1.00000e+00 + 5.200e+10 4.00644e-08 1.90111e-13 1.00000e+00 + 5.300e+10 3.93085e-08 1.55728e-13 1.00000e+00 + 5.400e+10 3.85806e-08 1.24168e-13 1.00000e+00 + 5.500e+10 3.78791e-08 9.10211e-14 1.00000e+00 + 5.600e+10 3.72026e-08 1.50409e-13 1.00000e+00 + 5.700e+10 3.65499e-08 2.22499e-13 1.00000e+00 + 5.800e+10 3.59194e-08 4.92181e-13 1.00000e+00 + 5.900e+10 3.53104e-08 6.77266e-13 1.00000e+00 + 6.000e+10 3.47221e-08 4.69444e-13 1.00000e+00 + 6.100e+10 3.41531e-08 2.96266e-13 1.00000e+00 + 6.200e+10 3.36027e-08 -2.17071e-13 1.00000e+00 + 6.300e+10 3.30690e-08 1.49732e-13 1.00000e+00 + 6.400e+10 3.25523e-08 1.29854e-13 1.00000e+00 + 6.500e+10 3.20515e-08 1.32955e-13 1.00000e+00 + 6.600e+10 3.15658e-08 1.34510e-13 1.00000e+00 + 6.700e+10 3.10947e-08 1.18914e-13 1.00000e+00 + 6.800e+10 3.06375e-08 1.07076e-13 1.00000e+00 + 6.900e+10 3.01934e-08 1.09958e-13 1.00000e+00 + 7.000e+10 2.97621e-08 1.27044e-13 1.00000e+00 + 7.100e+10 2.93429e-08 1.45700e-13 1.00000e+00 + 7.200e+10 2.89353e-08 1.49766e-13 1.00000e+00 + 7.300e+10 2.85390e-08 1.24366e-13 1.00000e+00 + 7.400e+10 2.81533e-08 9.86242e-14 1.00000e+00 + 7.500e+10 2.77779e-08 1.25270e-13 1.00000e+00 + 7.600e+10 2.74124e-08 1.42888e-13 1.00000e+00 + 7.700e+10 2.70565e-08 5.26740e-14 1.00000e+00 + 7.800e+10 2.67104e-08 -7.28172e-13 1.00000e+00 + 7.900e+10 2.63727e-08 -1.14768e-12 1.00000e+00 + 8.000e+10 2.60415e-08 3.94256e-13 1.00000e+00 + 8.100e+10 2.57207e-08 -2.84679e-13 1.00000e+00 + 8.200e+10 2.54066e-08 1.11491e-13 1.00000e+00 + 8.300e+10 2.51005e-08 1.10618e-13 1.00000e+00 + 8.400e+10 2.48017e-08 1.40226e-13 1.00000e+00 + 8.500e+10 2.45098e-08 2.09575e-13 1.00000e+00 + 8.600e+10 2.42247e-08 3.74730e-13 1.00000e+00 + 8.700e+10 2.39465e-08 8.48621e-14 1.00000e+00 + 8.800e+10 2.36744e-08 9.74612e-14 1.00000e+00 + 8.900e+10 2.34084e-08 8.94206e-14 1.00000e+00 + 9.000e+10 2.31483e-08 1.32787e-14 1.00000e+00 + 9.100e+10 2.28941e-08 -1.24333e-13 1.00000e+00 + 9.200e+10 2.26453e-08 -2.80975e-13 1.00000e+00 + 9.300e+10 2.24020e-08 -4.14209e-13 1.00000e+00 + 9.400e+10 2.21637e-08 -4.81596e-13 1.00000e+00 + 9.500e+10 2.19304e-08 -4.40697e-13 1.00000e+00 + 9.600e+10 2.17018e-08 -2.49072e-13 1.00000e+00 + 9.700e+10 2.14777e-08 1.39454e-13 1.00000e+00 + 9.800e+10 2.12587e-08 3.23759e-14 1.00000e+00 + 9.900e+10 2.10440e-08 -1.79065e-14 1.00000e+00 + 1.000e+11 2.08334e-08 7.89518e-14 1.00000e+00 -------------------------------------------------- Final Solver Statistics: - Internal solver steps = 353 (attempted = 519) - Total RHS evals: Fe = 0, Fi = 13780 - Total linear solver setups = 545 + Internal solver steps = 228 (attempted = 365) + Total RHS evals: Fe = 0, Fi = 8802 + Total linear solver setups = 381 Total RHS evals for setting up the linear system = 0 - Total number of Jacobian evaluations = 366 - Total number of Newton iterations = 11842 - Total number of nonlinear solver convergence failures = 363 + Total number of Jacobian evaluations = 259 + Total number of Newton iterations = 7593 + Total number of nonlinear solver convergence failures = 258 Total number of error test failures = 0 - Total number of constraint test failures = 2 - Total number of failed steps from solver failure = 164 + Total number of constraint test failures = 0 + Total number of failed steps from solver failure = 137 diff --git a/examples/arkode/C_serial/ark_robertson_root.out b/examples/arkode/C_serial/ark_robertson_root.out index f67f8d34a9..f4b80b8bf4 100644 --- a/examples/arkode/C_serial/ark_robertson_root.out +++ b/examples/arkode/C_serial/ark_robertson_root.out @@ -4,30 +4,30 @@ Robertson ODE test problem (with rootfinding): t u v w ----------------------------------------------------- 0.00000e+00 1.00000e+00 0.00000e+00 0.00000e+00 - 2.64019e-01 9.89965e-01 3.47058e-05 1.00000e-02 + 2.64019e-01 9.89965e-01 3.47057e-05 1.00000e-02 rootsfound[] = 0 1 - 4.00000e+00 9.05519e-01 2.24048e-05 9.44589e-02 - 4.00000e+01 7.15827e-01 9.18550e-06 2.84164e-01 - 4.00000e+02 4.50519e-01 3.22290e-06 5.49478e-01 - 4.00000e+03 1.83202e-01 8.94213e-07 8.16797e-01 - 4.00000e+04 3.89834e-02 1.62170e-07 9.61016e-01 - 4.00000e+05 4.93828e-03 1.98505e-08 9.95062e-01 - 4.00000e+06 5.16811e-04 2.06833e-09 9.99483e-01 - 2.07956e+07 1.00000e-04 4.00054e-10 9.99900e-01 + 4.00000e+00 9.05519e-01 2.24054e-05 9.44589e-02 + 4.00000e+01 7.15825e-01 9.18460e-06 2.84166e-01 + 4.00000e+02 4.50519e-01 3.22263e-06 5.49478e-01 + 4.00000e+03 1.83190e-01 8.93942e-07 8.16809e-01 + 4.00000e+04 3.89837e-02 1.62089e-07 9.61016e-01 + 4.00000e+05 4.93828e-03 1.98477e-08 9.95062e-01 + 4.00000e+06 5.16780e-04 2.06948e-09 9.99483e-01 + 2.07922e+07 1.00000e-04 3.98851e-10 9.99900e-01 rootsfound[] = -1 0 - 4.00000e+08 5.20672e-06 2.05159e-11 9.99995e-01 - 4.00000e+09 5.20802e-07 1.54856e-12 9.99999e-01 - 4.00000e+10 5.20846e-08 2.09189e-13 1.00000e+00 + 4.00000e+08 5.20756e-06 2.04508e-11 9.99995e-01 + 4.00000e+09 5.20868e-07 2.08696e-12 9.99999e-01 + 4.00000e+10 5.20728e-08 2.24134e-13 1.00000e+00 ----------------------------------------------------- Final Solver Statistics: - Internal solver steps = 748 (attempted = 813) - Total RHS evals: Fe = 0, Fi = 25698 - Total linear solver setups = 263 + Internal solver steps = 138 (attempted = 151) + Total RHS evals: Fe = 0, Fi = 4875 + Total linear solver setups = 131 Total RHS evals for setting up the linear system = 0 - Total number of Jacobian evaluations = 65 - Total number of Newton iterations = 21684 - Total root-function g evals = 776 - Total number of nonlinear solver convergence failures = 59 - Total number of error test failures = 47 - Total number of failed steps from solver failure = 18 + Total number of Jacobian evaluations = 57 + Total number of Newton iterations = 4161 + Total root-function g evals = 179 + Total number of nonlinear solver convergence failures = 56 + Total number of error test failures = 0 + Total number of failed steps from solver failure = 13 diff --git a/examples/arkode/F2003_serial/ark_analytic_f2003.out b/examples/arkode/F2003_serial/ark_analytic_f2003.out index c5c64ac439..e58085cbae 100644 --- a/examples/arkode/F2003_serial/ark_analytic_f2003.out +++ b/examples/arkode/F2003_serial/ark_analytic_f2003.out @@ -6,7 +6,7 @@ 0.00000E+00 0.00000E+00 1.00000E+00 7.85398E-01 2.00000E+00 1.10715E+00 - 3.00000E+00 1.24905E+00 + 3.00000E+00 1.24904E+00 4.00000E+00 1.32582E+00 5.00000E+00 1.37340E+00 6.00000E+00 1.40565E+00 @@ -16,15 +16,15 @@ 1.00000E+01 1.47113E+00 General Solver Stats: - Total internal steps taken = 419 - Total internal steps attempts = 424 - Total rhs function calls = 5090 - Num lin solver setup calls = 43 - Num error test failures = 5 + Total internal steps taken = 65 + Total internal steps attempts = 69 + Total rhs function calls = 1106 + Num lin solver setup calls = 25 + Num error test failures = 4 First internal step size = 6.10352E-12 - Last internal step size = 6.85164E-02 - Next internal step size = 6.85164E-02 - Current internal time = 1.00642E+01 - Num nonlinear solver iters = 2967 - Num nonlinear solver fails = 4 + Last internal step size = 7.33055E-01 + Next internal step size = 1.15922E+00 + Current internal time = 1.02733E+01 + Num nonlinear solver iters = 758 + Num nonlinear solver fails = 1 diff --git a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out index a78e16c9fd..813100a750 100644 --- a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out +++ b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_0.out @@ -28,10 +28,10 @@ MRIStep Solver Statistics: Internal solver steps = 1000 Total RHS evals: Fe = 2769 Total linear solver setups = 50 - Total linear iterations = 6250 - Total number of Jacobian-vector products = 6250 + Total linear iterations = 6236 + Total number of Jacobian-vector products = 6236 Total number of Preconditioner setups = 50 - Total number of Preconditioner solves = 6250 + Total number of Preconditioner solves = 6236 Total number of linear solver convergence failures = 0 Total number of Newton iterations = 1768 Total number of nonlinear solver convergence failures = 0 diff --git a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out index bbf3267c89..8c26b3c75c 100644 --- a/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out +++ b/test/unit_tests/arkode/CXX_parallel/ark_test_heat2D_mri_1.out @@ -28,10 +28,10 @@ MRIStep Solver Statistics: Internal solver steps = 1000 Total RHS evals: Fe = 2001 Total linear solver setups = 1 - Total linear iterations = 4731 - Total number of Jacobian-vector products = 4731 + Total linear iterations = 4709 + Total number of Jacobian-vector products = 4709 Total number of Preconditioner setups = 1 - Total number of Preconditioner solves = 4731 + Total number of Preconditioner solves = 4709 Total number of linear solver convergence failures = 0 Total number of Newton iterations = 1000 Total number of nonlinear solver convergence failures = 0 diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out b/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out index 559c92b3ae..af1a1e9936 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_butcher.out @@ -50,6 +50,8 @@ ARKodeButcherTable_CheckOrder: Testing method ARKODE_FORWARD_EULER_1_1: table matches predicted method/embedding orders of 1/0 Testing method ARKODE_RALSTON_EULER_2_1_2: table matches predicted method/embedding orders of 2/1 Testing method ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2: table matches predicted method/embedding orders of 2/1 +Testing method ARKODE_RALSTON_3_1_2: table matches predicted method/embedding orders of 2/1 +Testing method ARKODE_TSITOURAS_7_4_5: table matches predicted method/embedding orders of 5/4 Testing individual DIRK methods: diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_-1_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_-1_0.out index 251a290409..787afaea84 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_-1_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_-1_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_0.out index a5d862a551..91f351282f 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 20 + expected: 20 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 26 + expected: 26 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_1.out index b5755efd07..d83e21f6cc 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_0_1.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 20 + expected: 20 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 26 + expected: 26 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_0.out index 85b1436888..a4250ec2d7 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_1.out index dc65841178..745e569a91 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_0_1_1.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_-1_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_-1_0.out index a635cf9f2b..5b8c3cd4ce 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_-1_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_-1_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_0.out index 17271d2d55..b0729eeb1a 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 20 + expected: 20 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 26 + expected: 26 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_1.out index db53a029b4..4fd408ec58 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_0_1.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 20 + expected: 20 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 26 + expected: 26 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_0.out index 360e2985b9..c7b9c2c722 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_1.out index 7b6e6eaa43..baf8edeaf5 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_1_1_1.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_-1_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_-1_0.out index 7febbb08dc..99d96ef61a 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_-1_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_-1_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_0.out index e10f1f5d4c..9cb1e7c680 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 20 + expected: 20 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 26 + expected: 26 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_1.out index 23ba95fc26..b88535e887 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_0_1.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 20 + expected: 20 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 26 + expected: 26 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_0.out index 6104aab893..f88520d0cc 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_0.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_1.out index 8e069fe420..99cf47e2b0 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_ark_2_1_1.out @@ -888,6 +888,76 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ERK: ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ERK: ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + ======================== Test implicit RK methods ======================== diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_-1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_-1.out index 7943fd7e1b..d560ef3256 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_-1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_-1.out @@ -885,5 +885,75 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + All tests passed! diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out index e252ae486b..cfa9d29396 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_0.out @@ -885,5 +885,75 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 20 + expected: 20 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 26 + expected: 26 +-------------------- + All tests passed! diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out index c62f75edf0..d6e8467efc 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_erk_1.out @@ -885,5 +885,75 @@ Fe RHS evals: expected: 8 -------------------- +======================== +ARKODE_RALSTON_3_1_2 + stages: 3 + order: 2 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 3 + expected: 3 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 5 + expected: 5 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Dense Output +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 9 + expected: 9 +-------------------- + +======================== +ARKODE_TSITOURAS_7_4_5 + stages: 7 + order: 5 + explicit 1st stage: 1 + stiffly accurate: 1 + first same as last: 1 +======================== +-------------------- +Steps: 1 +Fe RHS evals: + actual: 7 + expected: 7 +-------------------- +Steps: 2 +Fe RHS evals: + actual: 13 + expected: 13 +-------------------- +Steps: 3 +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Dense Output +Fe RHS evals: + actual: 19 + expected: 19 +-------------------- +Steps: 4 +Fe RHS evals: + actual: 25 + expected: 25 +-------------------- + All tests passed! diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_-1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_-1.out index 9f09d86912..39975addfc 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_-1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_-1.out @@ -149,7 +149,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.980199 y_n = 0.980199 - Error = -5.3153e-12 + Error = -5.31541e-12 Steps = 1 Fe evals = 5 Fi evals = 0 @@ -344,7 +344,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.980199 y_n = 0.980199 - Error = 1.36036e-12 + Error = 1.3608e-12 Steps = 1 Fe evals = 0 Fi evals = 10 @@ -580,7 +580,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.970446 y_n = 0.970446 - Error = -2.09769e-11 + Error = -2.0977e-11 Steps = 1 Fe evals = 6 Fi evals = 11 diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_0.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_0.out index 4591cb3cd3..c3dfe1282b 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_0.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_0.out @@ -149,7 +149,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.980199 y_n = 0.980199 - Error = -5.3153e-12 + Error = -5.31541e-12 Steps = 1 Fe evals = 5 Fi evals = 0 @@ -344,7 +344,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.980199 y_n = 0.980199 - Error = 1.36036e-12 + Error = 1.3608e-12 Steps = 1 Fe evals = 0 Fi evals = 10 @@ -580,7 +580,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.970446 y_n = 0.970446 - Error = -2.09769e-11 + Error = -2.0977e-11 Steps = 1 Fe evals = 6 Fi evals = 11 diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_1.out b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_1.out index 5311a51fcd..1b28df5a23 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_1.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_dahlquist_mri_1.out @@ -149,7 +149,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.980199 y_n = 0.980199 - Error = -5.3153e-12 + Error = -5.31541e-12 Steps = 1 Fe evals = 5 Fi evals = 0 @@ -344,7 +344,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.980199 y_n = 0.980199 - Error = 1.36036e-12 + Error = 1.3608e-12 Steps = 1 Fe evals = 0 Fi evals = 10 @@ -580,7 +580,7 @@ MRIStep Statistics: Time = 0.01 y(t) = 0.970446 y_n = 0.970446 - Error = -2.09769e-11 + Error = -2.0977e-11 Steps = 1 Fe evals = 6 Fi evals = 11 diff --git a/test/unit_tests/arkode/CXX_serial/ark_test_getjac.out b/test/unit_tests/arkode/CXX_serial/ark_test_getjac.out index 55510d3575..6cd23ccbc6 100644 --- a/test/unit_tests/arkode/CXX_serial/ark_test_getjac.out +++ b/test/unit_tests/arkode/CXX_serial/ark_test_getjac.out @@ -1,9 +1,9 @@ Jac nst = 0 -Jac t = 2.574576339619671e-05 +Jac t = 5.149152679239342e-05 Index J DQ J true absolute difference relative difference ------------------------------------------------------------------------------------------------------------ - 0 -1.999995689060819e+00 -1.999995709039434e+00 1.997861476255025e-08 -9.989328813183135e-09 - 1 4.999999950267850e-01 5.000000000000000e-01 4.973214950965144e-09 9.946429901930287e-09 - 2 4.999999864690596e-01 5.000000000000000e-01 1.353094036815605e-08 2.706188073631211e-08 - 3 -9.982835887986570e-01 -9.982836157735868e-01 2.697492984538030e-08 -2.702130879357063e-08 + 0 -1.999991397768883e+00 -1.999991418078868e+00 2.030998458302236e-08 -1.015503586636963e-08 + 1 4.999999949079691e-01 5.000000000000000e-01 5.092030852527074e-09 1.018406170505415e-08 + 2 4.999999533268726e-01 5.000000000000000e-01 4.667312741846175e-08 9.334625483692349e-08 + 3 -9.965671388854774e-01 -9.965672315471739e-01 9.266169642696553e-08 -9.298087825254695e-08 From 1660217b4a7c158c60a94b4d7ec8e82f6af2e2d2 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 17:49:48 -0700 Subject: [PATCH 22/31] Remove MRI constants --- doc/arkode/guide/source/Constants.rst | 78 --------------------------- 1 file changed, 78 deletions(-) diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst index e27a227969..faa8172bf4 100644 --- a/doc/arkode/guide/source/Constants.rst +++ b/doc/arkode/guide/source/Constants.rst @@ -147,84 +147,6 @@ contains the ARKODE output constants. +-----------------------------------------------+------------------------------------------------------------+ | :index:`MRISTEP_IMEX` | Use an ImEx (at the slow time scale) MRI method. | +-----------------------------------------------+------------------------------------------------------------+ - | | | - +-----------------------------------------------+------------------------------------------------------------+ - | **MRI coupling table specification** | | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_FORWARD_EULER` | Use the forward Euler MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_ERK22b` | Use the ERK22b MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_ERK22a` | Use the ERK22a MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_RALSTON2` | Use the second order Ralston MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MIS_MW3` | Use the Knoth-Wolke-3 MIS method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_ERK33a` | Use the ERK33a MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_RALSTON3` | Use the third order Ralston MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_ERK45a` | Use the ERK45a MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_BACKWARD_EULER` | Use the backward Euler MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_IRK21a` | Use the IRK21a MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_IMPLICIT_MIDPOINT` | Use the implicit midpoint MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_ESDIRK34a` | Use the ESDIRK34a MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_MRI_GARK_ESDIRK46a` | Use the ESDIRK46a MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMEX_MRI_GARK_EULER` | Use the Euler IMEX-MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMEX_MRI_GARK_TRAPEZOIDAL` | Use the trapezoidal rule IMEX-MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMEX_MRI_GARK_MIDPOINT` | Use the midpoint rule IMEX-MRI-GARK method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMEX_MRI_GARK3a` | Use the IMEX-MRI-GARK3a method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMEX_MRI_GARK3b` | Use the IMEX-MRI-GARK3b method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_IMEX_MRI_GARK4` | Use the IMEX-MRI-GARK4 method. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_EXPL_TABLE_1` | Use MRIStep's default 1st-order explicit method | - | | (MRI_GARK_FORWARD_EULER). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_EXPL_TABLE_2` | Use MRIStep's default 2nd-order explicit method | - | | (MRI_GARK_ERK22b). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_EXPL_TABLE_3` | Use MRIStep's default 3rd-order explicit method | - | | (MIS_MW3). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_EXPL_TABLE_4` | Use MRIStep's default 4th-order explicit method | - | | (MRI_GARK_ERK45a). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMPL_SD_TABLE_1` | Use MRIStep's default 1st-order solve-decoupled implicit | - | | method (MRI_GARK_BACKWARD_EULER). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMPL_SD_TABLE_2` | Use MRIStep's default 2nd-order solve-decoupled implicit | - | | method (MRI_GARK_IRK21a). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMPL_SD_TABLE_3` | Use MRIStep's default 3rd-order solve-decoupled implicit | - | | method (MRI_GARK_ESDIRK34a). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMPL_SD_TABLE_4` | Use MRIStep's default 4th-order solve-decoupled implicit | - | | method (MRI_GARK_ESDIRK46a). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMEX_SD_TABLE_1` | Use MRIStep's default 1st-order solve-decoupled ImEx | - | | method (IMEX_MRI_GARK_EULER). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMEX_SD_TABLE_2` | Use MRIStep's default 2nd-order solve-decoupled ImEx | - | | method (ARKODE_IMEX_MRI_GARK_TRAPEZOIDAL). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMEX_SD_TABLE_3` | Use MRIStep's default 3rd-order solve-decoupled ImEx | - | | method (IMEX_MRI_GARK3b). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`MRISTEP_DEFAULT_IMEX_SD_TABLE_4` | Use MRIStep's default 4th-order solve-decoupled ImEx | - | | method (IMEX_MRI_GARK4). | - +-----------------------------------------------+------------------------------------------------------------+ From f640b9add810caab11f51cfb3aff33c94626e006 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 17:50:06 -0700 Subject: [PATCH 23/31] Update ERK to use enumerators --- doc/arkode/guide/source/Butcher.rst | 349 +++++++--------------------- 1 file changed, 90 insertions(+), 259 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 49c5d310a0..955a24f35a 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -140,85 +140,78 @@ half-plane indicate an `A-stable` method. Explicit Butcher tables --------------------------- -In the category of explicit Runge--Kutta methods, ARKODE includes -methods that have orders 2 through 9, with embeddings that are of -orders 1 through 8. Each of ARKODE's explicit Butcher tables are -specified via a unique ID and name: +In the category of explicit Runge--Kutta methods, ARKODE includes methods that +have orders 2 through 9, with embeddings that are of orders 1 through 8. +ARKODE's explicit Butcher tables are provided in the enumeration .. c:enum:: ARKODE_ERKTableID -with values specified for each method below (e.g., ``ARKODE_HEUN_EULER_2_1_2``). -A summary of the method is given in :numref:`ARKODE.Butcher.ERK_properties`. +with values specified in :numref:`ARKODE.Butcher.ERK_properties`. .. _ARKODE.Butcher.ERK_properties: .. table:: Explicit Butcher tables. The default method for each order is marked with an asterisk (*). - +------------------------------------------+--------+----------------+-------+ - | Method ID | Stages | Embedded Order | Order | - +==========================================+========+================+=======+ - | ``ARKODE_FORWARD_EULER_1_1`` | 1 | --- | 1* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_RALSTON_3_1_2`` | 3 | 1 | 2* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_HEUN_EULER_2_1_2`` | 2 | 1 | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_RALSTON_EULER_2_1_2`` | 2 | 1 | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2`` | 2 | 1 | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK2_ERK_3_1_2`` | 3 | 1 | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_BOGACKI_SHAMPINE_4_2_3`` | 4 | 2 | 3* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK324L2SA_ERK_4_2_3`` | 4 | 2 | 3 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_SHU_OSHER_3_2_3`` | 3 | 2 | 3 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_KNOTH_WOLKE_3_3`` | 3 | --- | 3 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_SOFRONIOU_SPALETTA_5_3_4`` | 5 | 3 | 4* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ZONNEVELD_5_3_4`` | 5 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK436L2SA_ERK_6_3_4`` | 6 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK437L2SA_ERK_7_3_4`` | 7 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_SAYFY_ABURUB_6_3_4`` | 6 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_TSITOURAS_7_4_5`` | 7 | 4 | 5* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_CASH_KARP_6_4_5`` | 6 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_FEHLBERG_6_4_5`` | 6 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_DORMAND_PRINCE_7_4_5`` | 7 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK548L2SA_ERK_8_4_5`` | 8 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK548L2SAb_ERK_8_4_5`` | 8 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_VERNER_9_5_6`` | 9 | 5 | 6* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_VERNER_8_5_6`` | 8 | 5 | 6 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_VERNER_10_6_7`` | 10 | 6 | 7* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_VERNER_13_7_8`` | 13 | 7 | 8* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_FEHLBERG_13_7_8`` | 13 | 7 | 8 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_VERNER_16_8_9`` | 16 | 8 | 9* | - +------------------------------------------+--------+----------------+-------+ - - -.. _Butcher.Forward_Euler: - -Forward-Euler-1-1 -^^^^^^^^^^^^^^^^^ - -.. index:: Forward-Euler-1-1 ERK method + +------------------------------------------------------+--------+----------------+-------+ + | Method ID | Stages | Embedded Order | Order | + +======================================================+========+================+=======+ + | :c:enumerator:`ARKODE_FORWARD_EULER_1_1` | 1 | --- | 1* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_RALSTON_3_1_2` | 3 | 1 | 2* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_HEUN_EULER_2_1_2` | 2 | 1 | 2 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_RALSTON_EULER_2_1_2` | 2 | 1 | 2 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2` | 2 | 1 | 2 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK2_ERK_3_1_2` | 3 | 1 | 2 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_BOGACKI_SHAMPINE_4_2_3` | 4 | 2 | 3* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK324L2SA_ERK_4_2_3` | 4 | 2 | 3 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_SHU_OSHER_3_2_3` | 3 | 2 | 3 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_KNOTH_WOLKE_3_3` | 3 | --- | 3 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_SOFRONIOU_SPALETTA_5_3_4` | 5 | 3 | 4* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ZONNEVELD_5_3_4` | 5 | 3 | 4 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK436L2SA_ERK_6_3_4` | 6 | 3 | 4 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK437L2SA_ERK_7_3_4` | 7 | 3 | 4 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_SAYFY_ABURUB_6_3_4` | 6 | 3 | 4 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_TSITOURAS_7_4_5` | 7 | 4 | 5* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_CASH_KARP_6_4_5` | 6 | 4 | 5 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_FEHLBERG_6_4_5` | 6 | 4 | 5 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_DORMAND_PRINCE_7_4_5` | 7 | 4 | 5 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK548L2SA_ERK_8_4_5` | 8 | 4 | 5 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK548L2SAb_ERK_8_4_5` | 8 | 4 | 5 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_VERNER_9_5_6` | 9 | 5 | 6* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_VERNER_8_5_6` | 8 | 5 | 6 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_VERNER_10_6_7` | 10 | 6 | 7* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_VERNER_13_7_8` | 13 | 7 | 8* | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_FEHLBERG_13_7_8` | 13 | 7 | 8 | + +------------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_VERNER_16_8_9` | 16 | 8 | 9* | + +------------------------------------------------------+--------+----------------+-------+ + + +.. c:enumerator:: ARKODE_FORWARD_EULER_1_1 Accessible via the constant ``ARKODE_FORWARD_EULER_1_1`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -244,12 +237,7 @@ This is the default 1st order explicit method (from :cite:p:`Euler:68`). Linear stability region for the forward Euler method. -.. _Butcher.Ralston: - -Ralston-3-1-2 -^^^^^^^^^^^^^ - -.. index:: Ralston-3-1-2 ERK method +.. c:enumerator:: ARKODE_RALSTON_3_1_2 Accessible via the constant ``ARKODE_RALSTON_3_1_2`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -284,12 +272,7 @@ This is the default 2nd order explicit method region is outlined in blue; the embedding's region is in red. -.. _Butcher.Heun_Euler: - -Heun-Euler-2-1-2 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: Heun-Euler-2-1-2 ERK method +.. c:enumerator:: ARKODE_HEUN_EULER_2_1_2 Accessible via the constant ``ARKODE_HEUN_EULER_2_1_2`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -322,12 +305,7 @@ Accessible via the string ``"ARKODE_HEUN_EULER_2_1_2"`` to region is outlined in blue; the embedding's region is in red. -.. _Butcher.Ralston_Euler: - -Ralston-Euler-2-1-2 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: Ralston-Euler-2-1-2 ERK method +.. c:enumerator:: ARKODE_RALSTON_EULER_2_1_2 Accessible via the constant ``ARKODE_RALSTON_EULER_2_1_2`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -356,12 +334,7 @@ Accessible via the string ``"ARKODE_RALSTON_EULER_2_1_2"`` to region is outlined in blue; the embedding's region is in red. -.. _Butcher.Explicit_Midpoint_Euler: - -Explicit-Midpoint-Euler-2-1-2 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Explicit-Midpoint-Euler-2-1-2 ERK method +.. c:enumerator:: ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2 Accessible via the constant ``ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -390,12 +363,7 @@ Accessible via the string ``"ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2"`` to region is outlined in blue; the embedding's region is in red. -.. _Butcher.ARK2_ERK: - -ARK2-ERK-3-1-2 -^^^^^^^^^^^^^^ - -.. index:: ARK2-ERK-3-1-2 +.. c:enumerator:: ARKODE_ARK2_ERK_3_1_2 Accessible via the constant ``ARKODE_ARK2_ERK_3_1_2`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -426,12 +394,7 @@ explicit portion of the ARK2 method from :cite:p:`giraldo2013implicit`). region is outlined in blue; the embedding's region is in red. -.. _Butcher.Bogacki_Shampine: - -Bogacki-Shampine-4-2-3 -^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Bogacki-Shampine-4-2-3 ERK method +.. c:enumerator:: ARKODE_BOGACKI_SHAMPINE_4_2_3 Accessible via the constant ``ARKODE_BOGACKI_SHAMPINE_4_2_3`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -463,14 +426,7 @@ explicit method (from :cite:p:`Bogacki:89`). region is outlined in blue; the embedding's region is in red. - - -.. _Butcher.ARK_4_2_3_E: - -ARK324L2SA-ERK-4-2-3 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK324L2SA-ERK-4-2-3 method +.. c:enumerator:: ARKODE_ARK324L2SA_ERK_4_2_3 Accessible via the constant ``ARKODE_ARK324L2SA_ERK_4_2_3`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -503,10 +459,7 @@ method from :cite:p:`KenCarp:03`). region is outlined in blue; the embedding's region is in red. -Shu-Osher-3-2-3 -^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Shu-Osher-3-2-3 ERK method +.. c:enumerator:: ARKODE_SHU_OSHER_3_2_3 Accessible via the constant ``ARKODE_SHU_OSHER_3_2_3`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` or @@ -536,13 +489,7 @@ Accessible via the string ``"ARKODE_SHU_OSHER_3_2_3"`` to region is outlined in blue; the embedding's region is in red. - -.. _Butcher.Knoth_Wolke: - -Knoth-Wolke-3-3 -^^^^^^^^^^^^^^^^^^ - -.. index:: Knoth-Wolke-3-3 ERK method +.. c:enumerator:: ARKODE_KNOTH_WOLKE_3_3 Accessible via the constant ``ARKODE_KNOTH_WOLKE_3_3`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum`, or @@ -571,12 +518,7 @@ This is the default 3th order slow and fast MRIStep method (from Linear stability region for the Knoth-Wolke method -.. _Butcher.Sofroniou_Spaletta: - -Sofroniou-Spaletta-5-3-4 -^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Sofroniou-Spaletta-5-3-4 ERK method +.. c:enumerator:: ARKODE_SOFRONIOU_SPALETTA_5_3_4 Accessible via the constant ``ARKODE_SOFRONIOU_SPALETTA_5_3_4`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -613,14 +555,7 @@ This is the default 4th order explicit method. region is outlined in blue; the embedding's region is in red. - - -.. _Butcher.Zonneveld: - -Zonneveld-5-3-4 -^^^^^^^^^^^^^^^^^^ - -.. index:: Zonneveld-5-3-4 ERK method +.. c:enumerator:: ARKODE_ZONNEVELD_5_3_4 Accessible via the constant ``ARKODE_ZONNEVELD_5_3_4`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum`, or @@ -656,15 +591,7 @@ Accessible via the string ``"ARKODE_ZONNEVELD_5_3_4"`` to region is outlined in blue; the embedding's region is in red. - - - -.. _Butcher.ARK_6_3_4_E: - -ARK436L2SA-ERK-6-3-4 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK436L2SA-ERK-6-3-4 method +.. c:enumerator:: ARKODE_ARK436L2SA_ERK_6_3_4 Accessible via the constant ``ARKODE_ARK436L2SA_ERK_6_3_4`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -702,14 +629,7 @@ This is the explicit portion of the ARK4(3)6L[2]SA method from region is outlined in blue; the embedding's region is in red. - - -.. _Butcher.ARK_7_3_4_E: - -ARK437L2SA-ERK-7-3-4 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK437L2SA-ERK-7-3-4 method +.. c:enumerator:: ARKODE_ARK437L2SA_ERK_7_3_4 Accessible via the constant ``ARKODE_ARK437L2SA_ERK_7_3_4`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -754,14 +674,7 @@ explicit portion of the ARK4(3)7L[2]SA method from :cite:p:`KenCarp:19`. region is outlined in blue; the embedding's region is in red. - - -.. _Butcher.Sayfy_Aburub: - -Sayfy-Aburub-6-3-4 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Sayfy-Aburub-6-3-4 ERK method +.. c:enumerator:: ARKODE_SAYFY_ABURUB_6_3_4 Accessible via the constant ``ARKODE_SAYFY_ABURUB_6_3_4`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -794,12 +707,7 @@ Accessible via the string ``"ARKODE_SAYFY_ABURUB_6_3_4"`` to region is outlined in blue; the embedding's region is in red. -.. _Butcher.Tsitouras: - -Tsitouras-7-4-5 -^^^^^^^^^^^^^^^ - -.. index:: Tsitouras-7-4-5 ERK method +.. c:enumerator:: ARKODE_TSITOURAS_7_4_5 Accessible via the constant ``ARKODE_TSITOURAS_7_4_5`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -844,12 +752,7 @@ This is the default 5th order explicit method (from :cite:p:`Tsitouras:11`). region is outlined in blue; the embedding's region is in red. -.. _Butcher.Cash-Karp: - -Cash-Karp-6-4-5 -^^^^^^^^^^^^^^^^^^ - -.. index:: Cash-Karp-6-4-5 ERK method +.. c:enumerator:: ARKODE_CASH_KARP_6_4_5 Accessible via the constant ``ARKODE_CASH_KARP_6_4_5`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -886,17 +789,7 @@ Accessible via the string ``"ARKODE_CASH_KARP_6_4_5"`` to region is outlined in blue; the embedding's region is in red. - - - - - -.. _Butcher.Fehlberg: - -Fehlberg-6-4-5 -^^^^^^^^^^^^^^^^^ - -.. index:: Fehlberg-6-4-5 ERK method +.. c:enumerator:: ARKODE_FEHLBERG_6_4_5 Accessible via the constant ``ARKODE_FEHLBERG_6_4_5`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -929,15 +822,7 @@ Accessible via the string ``"ARKODE_FEHLBERG_6_4_5"`` to region is outlined in blue; the embedding's region is in red. - - - -.. _Butcher.Dormand_Prince: - -Dormand-Prince-7-4-5 -^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Dormand-Prince-7-4-5 ERK method +.. c:enumerator:: ARKODE_DORMAND_PRINCE_7_4_5 Accessible via the constant ``ARKODE_DORMAND_PRINCE_7_4_5`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -971,15 +856,7 @@ Accessible via the string ``"ARKODE_DORMAND_PRINCE_7_4_5"`` to region is outlined in blue; the embedding's region is in red. - - - -.. _Butcher.ARK_8_4_5_E: - -ARK548L2SA-ERK-8-4-5 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK548L2SA-ERK-8-4-5 method +.. c:enumerator:: ARKODE_ARK548L2SA_ERK_8_4_5 Accessible via the constant ``ARKODE_ARK548L2SA_ERK_8_4_5`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -1026,16 +903,7 @@ This is the explicit portion of the ARK5(4)8L[2]SA method from region is outlined in blue; the embedding's region is in red. - - - - -.. _Butcher.ARK_8_4_5b_E: - -ARK548L2SAb-ERK-8-4-5 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK548L2SAb-ERK-8-4-5 method +.. c:enumerator:: ARKODE_ARK548L2SAb_ERK_8_4_5 Accessible via the constant ``ARKODE_ARK548L2SAb_ERK_8_4_5`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -1083,13 +951,7 @@ explicit portion of the 5th order ARK5(4)8L[2]SA method from region is outlined in blue; the embedding's region is in red. - -.. _Butcher.Verner-6-5b: - -Verner-9-5-6 -^^^^^^^^^^^^^^ - -.. index:: Verner-9-5-6 ERK method +.. c:enumerator:: ARKODE_VERNER_9_5_6 Accessible via the constant ``ARKODE_VERNER_9_5_6`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -1139,14 +1001,7 @@ This is the default 6th order explicit method region is outlined in blue; the embedding's region is in red. - - -.. _Butcher.Verner-6-5: - -Verner-8-5-6 -^^^^^^^^^^^^^^ - -.. index:: Verner-8-5-6 ERK method +.. c:enumerator:: ARKODE_VERNER_8_5_6 Accessible via the constant ``ARKODE_VERNER_8_5_6`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -1185,13 +1040,7 @@ Accessible via the string ``"ARKODE_VERNER_8_5_6"`` to region is outlined in blue; the embedding's region is in red. - -.. _Butcher.Verner-7-6: - -Verner-10-6-7 -^^^^^^^^^^^^^^ - -.. index:: Verner-10-6-7 ERK method +.. c:enumerator:: ARKODE_VERNER_10_6_7 Accessible via the constant ``ARKODE_VERNER_10_6_7`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -1235,13 +1084,7 @@ This is the default 7th order explicit method (from :cite:p:`Ver:10`). region is outlined in blue; the embedding's region is in red. - -.. _Butcher.Verner-8-7: - -Verner-13-7-8 -^^^^^^^^^^^^^^ - -.. index:: Verner-13-7-8 ERK method +.. c:enumerator:: ARKODE_VERNER_13_7_8 Accessible via the constant ``ARKODE_VERNER_13_7_8`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -1294,13 +1137,7 @@ This is the default 8th order explicit method region is outlined in blue; the embedding's region is in red. - -.. _Butcher.Fehlberg-8-7: - -Fehlberg-13-7-8 -^^^^^^^^^^^^^^^^^^ - -.. index:: Fehlberg-13-7-8 ERK method +.. c:enumerator:: ARKODE_FEHLBERG_13_7_8 Accessible via the constant ``ARKODE_FEHLBERG_13_7_8`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` @@ -1345,13 +1182,7 @@ Accessible via the string ``"ARKODE_FEHLBERG_13_7_8"`` to region is outlined in blue; the embedding's region is in red. - -.. _Butcher.Verner-9-8: - -Verner-16-8-9 -^^^^^^^^^^^^^^ - -.. index:: Verner-16-8-9 ERK method +.. c:enumerator:: ARKODE_VERNER_16_8_9 Accessible via the constant ``ARKODE_VERNER_16_8_9`` to :c:func:`ARKStepSetTableNum`, :c:func:`ERKStepSetTableNum` From d2a3a4a6f0f602a1d0daa1183e08e786f72d5075 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 18:02:03 -0700 Subject: [PATCH 24/31] Update DIRK to use enumerators --- doc/arkode/guide/source/Butcher.rst | 363 +++++++--------------------- 1 file changed, 91 insertions(+), 272 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 955a24f35a..733cf76db2 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -1241,88 +1241,79 @@ This is the default 9th order explicit method (from :cite:p:`Ver:10`). Implicit Butcher tables --------------------------- - -In the category of diagonally implicit Runge--Kutta methods, ARKODE -includes methods that have orders 2 through 5, with embeddings that are of -orders 1 through 4. - -Each of ARKODE's diagonally-implicit Butcher tables are -specified via a unique ID and name: +In the category of diagonally implicit Runge--Kutta methods, ARKODE includes +methods that have orders 2 through 5, with embeddings that are of orders 1 +through 4. ARKODE's diagonally-implicit Butcher tables are +provided in the enumeration .. c:enum:: ARKODE_DIRKTableID -with values specified for each method below (e.g., ``ARKODE_SDIRK_2_1_2``). -A summary of the method is given in :numref:`ARKODE.Butcher.DIRK_properties`. +with values specified in :numref:`ARKODE.Butcher.DIRK_properties`. .. _ARKODE.Butcher.DIRK_properties: .. table:: Implicit Butcher tables. The default method for each order is marked with an asterisk (*). - +------------------------------------------+--------+----------------+-------+ - | Method ID | Stages | Embedded Order | Order | - +==========================================+========+================+=======+ - | ``ARKODE_BACKWARD_EULER_1_1`` | 1 | --- | 1* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK2_DIRK_3_1_2`` | 3 | 1 | 2* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_SDIRK_2_1_2`` | 2 | 1 | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_IMPLICIT_MIDPOINT_1_2`` | 1 | --- | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_IMPLICIT_TRAPEZOIDAL_2_2`` | 2 | --- | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_BILLINGTON_3_3_2`` | 3 | 3 | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_TRBDF2_3_3_2`` | 3 | 3 | 2 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK325L2SA_5_2_3`` | 5 | 2 | 3* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK324L2SA_4_2_3`` | 4 | 2 | 3 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK32I5L2SA_5_2_3`` | 5 | 2 | 3 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_KVAERNO_4_2_3`` | 4 | 2 | 3 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK324L2SA_DIRK_4_2_3`` | 4 | 2 | 3 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK436L2SA_6_3_4`` | 6 | 3 | 4* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_CASH_5_2_4`` | 5 | 2 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_CASH_5_3_4`` | 5 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_SDIRK_5_3_4`` | 5 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_KVAERNO_5_3_4`` | 5 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK436L2SA_DIRK_6_3_4`` | 6 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK437L2SA_DIRK_7_3_4`` | 7 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK43I6L2SA_6_3_4`` | 6 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_QESDIRK436L2SA_6_3_4`` | 6 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK437L2SA_7_3_4`` | 7 | 3 | 4 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK547L2SA2_7_4_5`` | 7 | 4 | 5* | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_KVAERNO_7_4_5`` | 7 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK548L2SA_DIRK_8_4_5`` | 8 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` | 8 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - | ``ARKODE_ESDIRK547L2SA_7_4_5`` | 7 | 4 | 5 | - +------------------------------------------+--------+----------------+-------+ - - -.. _Butcher.Backward-Euler: - -Backward-Euler-1-1 -^^^^^^^^^^^^^^^^^^ - -.. index:: Backward-Euler-1-1 method + +-------------------------------------------------+--------+----------------+-------+ + | Method ID | Stages | Embedded Order | Order | + +=================================================+========+================+=======+ + | :c:enumerator:`ARKODE_BACKWARD_EULER_1_1` | 1 | --- | 1* | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK2_DIRK_3_1_2` | 3 | 1 | 2* | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_SDIRK_2_1_2` | 2 | 1 | 2 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_IMPLICIT_MIDPOINT_1_2` | 1 | --- | 2 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_IMPLICIT_TRAPEZOIDAL_2_2` | 2 | --- | 2 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_BILLINGTON_3_3_2` | 3 | 3 | 2 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_TRBDF2_3_3_2` | 3 | 3 | 2 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK325L2SA_5_2_3` | 5 | 2 | 3* | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK324L2SA_4_2_3` | 4 | 2 | 3 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK32I5L2SA_5_2_3` | 5 | 2 | 3 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_KVAERNO_4_2_3` | 4 | 2 | 3 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK324L2SA_DIRK_4_2_3` | 4 | 2 | 3 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK436L2SA_6_3_4` | 6 | 3 | 4* | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_CASH_5_2_4` | 5 | 2 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_CASH_5_3_4` | 5 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_SDIRK_5_3_4` | 5 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_KVAERNO_5_3_4` | 5 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK436L2SA_DIRK_6_3_4` | 6 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK437L2SA_DIRK_7_3_4` | 7 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK43I6L2SA_6_3_4` | 6 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_QESDIRK436L2SA_6_3_4` | 6 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK437L2SA_7_3_4` | 7 | 3 | 4 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK547L2SA2_7_4_5` | 7 | 4 | 5* | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_KVAERNO_7_4_5` | 7 | 4 | 5 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK548L2SA_DIRK_8_4_5` | 8 | 4 | 5 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK548L2SAb_DIRK_8_4_5` | 8 | 4 | 5 | + +-------------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ESDIRK547L2SA_7_4_5` | 7 | 4 | 5 | + +-------------------------------------------------+--------+----------------+-------+ + + +.. c:enumerator:: ARKODE_BACKWARD_EULER_1_1 Accessible via the constant ``ARKODE_BACKWARD_EULER_1_1`` to :c:func:`ARKStepSetTableNum` or @@ -1348,12 +1339,7 @@ This is the default 1st order implicit method. The method is A-, L-, and B-stab Linear stability region for the backward Euler method. -.. _Butcher.ARK2_DIRK: - -ARK2-DIRK-3-1-2 -^^^^^^^^^^^^^^^ - -.. index:: ARK2-DIRK-3-1-2 +.. c:enumerator:: ARKODE_ARK2_DIRK_3_1_2 Accessible via the constant ``ARKODE_ARK2_DIRK_3_1_2`` to :c:func:`ARKStepSetTableNum`, or @@ -1389,12 +1375,7 @@ default 2nd order additive method region is outlined in blue; the embedding's region is in red. -.. _Butcher.SDIRK-2-1: - -SDIRK-2-1-2 -^^^^^^^^^^^^^^ - -.. index:: SDIRK-2-1-2 method +.. c:enumerator:: ARKODE_SDIRK_2_1_2 Accessible via the constant ``ARKODE_SDIRK_2_1_2`` to :c:func:`ARKStepSetTableNum` or @@ -1427,12 +1408,7 @@ Both the method and embedding are A- and B-stable. region is outlined in blue; the embedding's region is in red. -.. _Butcher.Implicit_Midpoint: - -Implicit-Midpoint-1-2 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Implicit-Midpoint-1-2 method +.. c:enumerator:: ARKODE_IMPLICIT_MIDPOINT_1_2 Accessible via the constant ``ARKODE_IMPLICIT_MIDPOINT_1_2`` to :c:func:`ARKStepSetTableNum` or @@ -1458,12 +1434,7 @@ The method is A- and B-stable. Linear stability region for the implicit midpoint method. -.. _Butcher.Implicit_Trapezoidal: - -Implicit-Trapezoidal-2-2 -^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: Implicit-Trapezoidal-2-2 method +.. c:enumerator:: ARKODE_IMPLICIT_TRAPEZOIDAL_2_2 Accessible via the constant ``ARKODE_IMPLICIT_TRAPEZOIDAL_2_2`` to :c:func:`ARKStepSetTableNum` or @@ -1490,12 +1461,7 @@ The method is A-stable. Linear stability region for the implicit trapezoidal method. -.. _Butcher.Billington: - -Billington-3-3-2 -^^^^^^^^^^^^^^^^^^^ - -.. index:: Billington-3-3-2 SDIRK method +.. c:enumerator:: ARKODE_BILLINGTON_3_3_2 Accessible via the constant ``ARKODE_BILLINGTON_3_3_2`` to :c:func:`ARKStepSetTableNum` or @@ -1526,16 +1492,7 @@ Here, the higher-order embedding is less stable than the lower-order method region is outlined in blue; the embedding's region is in red. - - - - -.. _Butcher.TRBDF2: - -TRBDF2-3-3-2 -^^^^^^^^^^^^^^^ - -.. index:: TRBDF2-3-3-2 ESDIRK method +.. c:enumerator:: ARKODE_TRBDF2_3_3_2 Accessible via the constant ``ARKODE_TRBDF2_3_3_2`` to :c:func:`ARKStepSetTableNum` or @@ -1566,13 +1523,7 @@ lower-order method (from :cite:p:`Bank:85`). region is outlined in blue; the embedding's region is in red. - -.. _Butcher.ESDIRK325L2SA: - -ESDIRK325L2SA-5-2-3 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK325L2SA-5-2-3 method +.. c:enumerator:: ARKODE_ESDIRK325L2SA_5_2_3 Accessible via the constant ``ARKODE_ESDIRK325L2SA_5_2_3`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -1595,12 +1546,7 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK324L2SA: - -ESDIRK324L2SA-4-2-3 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK324L2SA-4-2-3 method +.. c:enumerator:: ARKODE_ESDIRK324L2SA_4_2_3 Accessible via the constant ``ARKODE_ESDIRK324L2SA_4_2_3`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -1618,13 +1564,7 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. - -.. _Butcher.ESDIRK32I5L2SA: - -ESDIRK32I5L2SA-5-2-3 -^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK32I5L2SA-5-2-3 method +.. c:enumerator:: ARKODE_ESDIRK32I5L2SA_5_2_3 Accessible via the constant ``ARKODE_ESDIRK32I5L2SA_5_2_3`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -1642,12 +1582,7 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. -.. _Butcher.Kvaerno_4_2_3: - -Kvaerno-4-2-3 -^^^^^^^^^^^^^^^^ - -.. index:: Kvaerno-4-2-3 ESDIRK method +.. c:enumerator:: ARKODE_KVAERNO_4_2_3 Accessible via the constant ``ARKODE_KVAERNO_4_2_3`` to :c:func:`ARKStepSetTableNum` or @@ -1679,16 +1614,7 @@ Both the method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. - - - - -.. _Butcher.ARK_4_2_3_I: - -ARK324L2SA-DIRK-4-2-3 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK324L2SA-DIRK-4-2-3 method +.. c:enumerator:: ARKODE_ARK324L2SA_DIRK_4_2_3 Accessible via the constant ``ARKODE_ARK324L2SA_DIRK_4_2_3`` to :c:func:`ARKStepSetTableNum` or @@ -1726,12 +1652,7 @@ method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK436L2SA: - -ESDIRK436L2SA-6-3-4 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK436L2SA-6-3-4 method +.. c:enumerator:: ARKODE_ESDIRK436L2SA_6_3_4 Accessible via the constant ``ARKODE_ESDIRK436L2SA_6_3_4`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -1753,13 +1674,7 @@ from :cite:p:`KenCarp:16`. Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. - -.. _Butcher.Cash_5_2_4: - -Cash-5-2-4 -^^^^^^^^^^^^^^ - -.. index:: Cash-5-2-4 SDIRK method +.. c:enumerator:: ARKODE_CASH_5_2_4 Accessible via the constant ``ARKODE_CASH_5_2_4`` to :c:func:`ARKStepSetTableNum` or @@ -1792,16 +1707,7 @@ Both the method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. - - - - -.. _Butcher.Cash_5_3_4: - -Cash-5-3-4 -^^^^^^^^^^^ - -.. index:: Cash-5-3-4 SDIRK method +.. c:enumerator:: ARKODE_CASH_5_3_4 Accessible via the constant ``ARKODE_CASH_5_3_4`` to :c:func:`ARKStepSetTableNum` or @@ -1834,15 +1740,7 @@ Both the method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. - - - -.. _Butcher.SDIRK-5-4: - -SDIRK-5-3-4 -^^^^^^^^^^^^^^ - -.. index:: SDIRK-5-3-4 method +.. c:enumerator:: ARKODE_SDIRK_5_3_4 Accessible via the constant ``ARKODE_SDIRK_5_3_4`` to :c:func:`ARKStepSetTableNum` or @@ -1879,18 +1777,7 @@ stability (from :cite:p:`HaWa:91`). region is outlined in blue; the embedding's region is in red. - - - - - - -.. _Butcher.Kvaerno_5_3_4: - -Kvaerno-5-3-4 -^^^^^^^^^^^^^^^^ - -.. index:: Kvaerno-5-3-4 ESDIRK method +.. c:enumerator:: ARKODE_KVAERNO_5_3_4 Accessible via the constant ``ARKODE_KVAERNO_5_3_4`` to :c:func:`ARKStepSetTableNum` or @@ -1929,16 +1816,7 @@ Both the method and embedding are A-stable (from :cite:p:`Kva:04`). region is outlined in blue; the embedding's region is in red. - - - - -.. _Butcher.ARK_6_3_4_I: - -ARK436L2SA-DIRK-6-3-4 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK436L2SA-DIRK-6-3-4 method +.. c:enumerator:: ARKODE_ARK436L2SA_DIRK_6_3_4 Accessible via the constant ``ARKODE_ARK436L2SA_DIRK_6_3_4`` to :c:func:`ARKStepSetTableNum` or @@ -1977,16 +1855,7 @@ Both the method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. - - - - -.. _Butcher.ARK_7_3_4_I: - -ARK437L2SA-DIRK-7-3-4 -^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK437L2SA-DIRK-7-3-4 method +.. c:enumerator:: ARKODE_ARK437L2SA_DIRK_7_3_4 Accessible via the constant ``ARKODE_ARK437L2SA_DIRK_7_3_4`` to :c:func:`ARKStepSetTableNum` or @@ -2026,12 +1895,7 @@ implicit portion of the 4th order ARK4(3)7L[2]SA method from region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK43I6L2SA: - -ESDIRK43I6L2SA-6-3-4 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK43I6L2SA-6-3-4 method +.. c:enumerator:: ARKODE_ESDIRK43I6L2SA_6_3_4 Accessible via the constant ``ARKODE_ESDIRK43I6L2SA_6_3_4`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -2049,12 +1913,7 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. -.. _Butcher.QESDIRK436L2SA: - -QESDIRK436L2SA-6-3-4 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: QESDIRK436L2SA-6-3-4 method +.. c:enumerator:: ARKODE_QESDIRK436L2SA_6_3_4 Accessible via the constant ``ARKODE_QESDIRK436L2SA_6_3_4`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -2072,12 +1931,7 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK437L2SA: - -ESDIRK437L2SA-7-3-4 -^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK437L2SA-7-3-4 method +.. c:enumerator:: ARKODE_ESDIRK437L2SA_7_3_4 Accessible via the constant ``ARKODE_ESDIRK437L2SA_7_3_4`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -2095,10 +1949,7 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. -ESDIRK547L2SA2-7-4-5 -^^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK547L2SA2-7-4-5 method +.. c:enumerator:: ARKODE_ESDIRK547L2SA2_7_4_5 Accessible via the constant ``ARKODE_ESDIRK547L2SA2_7_4_5`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -2120,12 +1971,7 @@ from :cite:p:`KenCarp:19b`. Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. -.. _Butcher.Kvaerno_7_4_5: - -Kvaerno-7-4-5 -^^^^^^^^^^^^^^^^^ - -.. index:: Kvaerno-7-4-5 ESDIRK method +.. c:enumerator:: ARKODE_KVAERNO_7_4_5 Accessible via the constant ``ARKODE_KVAERNO_7_4_5`` to :c:func:`ARKStepSetTableNum` or @@ -2167,17 +2013,7 @@ L-stable (from :cite:p:`Kva:04`). region is outlined in blue; the embedding's region is in red. - - - - - -.. _Butcher.ARK_8_4_5_I: - -ARK548L2SA-ESDIRK-8-4-5 -^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK548L2SA-ESDIRK-8-4-5 method +.. c:enumerator:: ARKODE_ARK548L2SA_DIRK_8_4_5 Accessible via the constant ``ARKODE_ARK548L2SA_DIRK_8_4_5`` for :c:func:`ARKStepSetTableNum` or @@ -2224,14 +2060,7 @@ Both the method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. - - -.. _Butcher.ARK_8_4_5b_I: - -ARK548L2SAb-DIRK-8-4-5 -^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: ARK548L2SAb-DIRK-8-4-5 method +.. c:enumerator:: ARKODE_ARK548L2SAb_DIRK_8_4_5 Accessible via the constant ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` for :c:func:`ARKStepSetTableNum` or @@ -2280,12 +2109,7 @@ Both the method and embedding are A-stable; additionally the method is L-stable region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK547L2SA: - -ESDIRK547L2SA-7-4-5 -^^^^^^^^^^^^^^^^^^^ - -.. index:: ESDIRK547L2SA-7-4-5 method +.. c:enumerator:: ARKODE_ESDIRK547L2SA_7_4_5 Accessible via the constant ``ARKODE_ESDIRK547L2SA_7_4_5`` to :c:func:`ARKStepSetTableNum` or :c:func:`ARKodeButcherTable_LoadDIRK`. @@ -2303,11 +2127,6 @@ Both the method and embedding are A- and L-stable. region is outlined in blue; the embedding's region is in red. -.. _Butcher.ESDIRK547L2SA2: - - - - .. _Butcher.additive: Additive Butcher tables From 9d865f2b3a9a9fba442d2522dedfe1d3e7c8545e Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 18:17:56 -0700 Subject: [PATCH 25/31] Update ARK to use enumerators --- doc/arkode/guide/source/Butcher.rst | 53 ++++++++++------------------- 1 file changed, 18 insertions(+), 35 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 733cf76db2..1f2b77b9b7 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -2137,42 +2137,25 @@ explicit calculations, ARKODE includes methods that have orders 2 through 5, with embeddings that are of orders 1 through 4. These Butcher table pairs are as follows: -* :index:`2nd-order pair `: - :numref:`Butcher.ARK2_ERK` with :numref:`Butcher.ARK2_DIRK`, - corresponding to Butcher tables ``ARKODE_ARK2_ERK_3_1_2`` and - ``ARKODE_ARK2_DIRK_3_1_2`` for :c:func:`ARKStepSetTableNum` - or :c:func:`ARKStepSetTableName`. - -* :index:`3rd-order pair `: - :numref:`Butcher.ARK_4_2_3_E` with :numref:`Butcher.ARK_4_2_3_I`, - corresponding to Butcher tables ``ARKODE_ARK324L2SA_ERK_4_2_3`` and - ``ARKODE_ARK324L2SA_DIRK_4_2_3`` for :c:func:`ARKStepSetTableNum` - or :c:func:`ARKStepSetTableName`. - -* :index:`4th-order pair `: - :numref:`Butcher.ARK_6_3_4_E` with :numref:`Butcher.ARK_6_3_4_I`, - corresponding to Butcher tables ``ARKODE_ARK436L2SA_ERK_6_3_4`` and - ``ARKODE_ARK436L2SA_DIRK_6_3_4`` for :c:func:`ARKStepSetTableNum` - or :c:func:`ARKStepSetTableName`. - -* :index:`4th-order pair `: - :numref:`Butcher.ARK_7_3_4_E` with :numref:`Butcher.ARK_7_3_4_I`, - corresponding to Butcher tables ``ARKODE_ARK437L2SA_ERK_7_3_4`` and - ``ARKODE_ARK437L2SA_DIRK_7_3_4`` for :c:func:`ARKStepSetTableNum` - or :c:func:`ARKStepSetTableName`. - -* :index:`5th-order pair `: - :numref:`Butcher.ARK_8_4_5_E` with :numref:`Butcher.ARK_8_4_5_I`, - corresponding to Butcher tables ``ARKODE_ARK548L2SA_ERK_8_4_5`` and - ``ARKODE_ARK548L2SA_DIRK_8_4_5`` for :c:func:`ARKStepSetTableNum` - or :c:func:`ARKStepSetTableName`. - -* :index:`5th-order pair `: - :numref:`Butcher.ARK_8_4_5b_E` with :numref:`Butcher.ARK_8_4_5b_I`, - corresponding to Butcher tables ``ARKODE_ARK548L2SAb_ERK_8_4_5`` and - ``ARKODE_ARK548L2SAb_DIRK_8_4_5`` for :c:func:`ARKStepSetTableNum` - or :c:func:`ARKStepSetTableName`. +.. _ARKODE.Butcher.ARK_properties: +.. table:: Additive Butcher tables. The default method for each order is marked + with an asterisk (*). + +----------------------------------------------+-----------------------------------------------+--------+----------------+-------+ + | ERK Method ID | DIRK Method ID | Stages | Embedded Order | Order | + +==============================================+===============================================+========+================+=======+ + | :c:enumerator:`ARKODE_ARK2_ERK_3_1_2` | :c:enumerator:`ARKODE_ARK2_DIRK_3_1_2` | 3 | 1 | 2* | + +----------------------------------------------+-----------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK324L2SA_ERK_4_2_3` | :c:enumerator:`ARKODE_ARK324L2SA_DIRK_4_2_3` | 4 | 2 | 3* | + +----------------------------------------------+-----------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK437L2SA_ERK_7_3_4` | :c:enumerator:`ARKODE_ARK437L2SA_DIRK_7_3_4` | 7 | 3 | 4* | + +----------------------------------------------+-----------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK436L2SA_ERK_6_3_4` | :c:enumerator:`ARKODE_ARK436L2SA_DIRK_6_3_4` | 6 | 3 | 4 | + +----------------------------------------------+-----------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK548L2SAb_ERK_8_4_5` | :c:enumerator:`ARKODE_ARK548L2SAb_DIRK_8_4_5` | 8 | 4 | 5* | + +----------------------------------------------+-----------------------------------------------+--------+----------------+-------+ + | :c:enumerator:`ARKODE_ARK548L2SA_ERK_8_4_5` | :c:enumerator:`ARKODE_ARK548L2SA_DIRK_8_4_5` | 8 | 5 | 5 | + +----------------------------------------------+-----------------------------------------------+--------+----------------+-------+ From a1ec42532107b8b42cdb0f0946d365afbbb41085 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 18:29:09 -0700 Subject: [PATCH 26/31] Update SPRK to use enumerators --- doc/arkode/guide/source/Butcher.rst | 109 ++++++++++++++-------------- 1 file changed, 53 insertions(+), 56 deletions(-) diff --git a/doc/arkode/guide/source/Butcher.rst b/doc/arkode/guide/source/Butcher.rst index 1f2b77b9b7..adfd8f93a2 100644 --- a/doc/arkode/guide/source/Butcher.rst +++ b/doc/arkode/guide/source/Butcher.rst @@ -2165,66 +2165,74 @@ Symplectic Partitioned Butcher tables ------------------------------------- In the category of symplectic partitioned Runge-Kutta (SPRK) methods, ARKODE -includes methods that have orders :math:`q = \{1,2,3,4,5,6,8,10\}`. +includes methods that have orders :math:`q = \{1,2,3,4,5,6,8,10\}`. ARKODE's +symplectic partitioned Butcher tables are provided in the enumeration .. c:enum:: ARKODE_SPRKMethodID - Each of the ARKODE SPRK tables are specified via a unique ID and name. - -ARKODE_SPRK_EULER_1_1 -^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 1st-order symplectic Euler method +with values specified in :numref:`ARKODE.Butcher.SPRK_properties`. + +.. _ARKODE.Butcher.SPRK_properties: +.. table:: Symplectic partitioned Butcher tables. The default method for each + order is marked with an asterisk (*). + + +-------------------------------------------------+--------+-------+ + | Method ID | Stages | Order | + +=================================================+========+=======+ + | :c:enumerator:`ARKODE_SPRK_EULER_1_1` | 1 | 1* | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_LEAPFROG_2_2` | 2 | 2* | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_PSEUDO_LEAPFROG_2_2` | 2 | 2 | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_MCLACHLAN_2_2` | 2 | 2 | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_MCLACHLAN_3_3` | 3 | 3* | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_RUTH_3_3` | 3 | 3 | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_MCLACHLAN_4_4` | 4 | 4* | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_CANDY_ROZMUS_4_4` | 4 | 4 | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_MCLACHLAN_5_6` | 6 | 5* | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_YOSHIDA_6_8` | 8 | 6* | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_SUZUKI_UMENO_8_16` | 16 | 8* | + +-------------------------------------------------+--------+-------+ + | :c:enumerator:`ARKODE_SPRK_SOFRONIOU_10_36` | 36 | 10* | + +-------------------------------------------------+--------+-------+ + +.. c:enumerator:: ARKODE_SPRK_EULER_1_1 Accessible via the constant (or string) ``ARKODE_SPRK_EULER_1_1`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. This is the classic Symplectic Euler method and the default 1st order method. -ARKODE_SPRK_LEAPFROG_2_2 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 2nd-order Leapfrog method +.. c:enumerator:: ARKODE_SPRK_LEAPFROG_2_2 Accessible via the constant (or string) ``ARKODE_SPRK_LEAPFROG_2_2`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. This is the classic Leapfrog/Verlet method and the default 2nd order method. -ARKODE_SPRK_PSEUDO_LEAPFROG_2_2 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 2nd-order Pseudo Leapfrog method +.. c:enumerator:: ARKODE_SPRK_PSEUDO_LEAPFROG_2_2 Accessible via the constant (or string) ``ARKODE_SPRK_PSEUDO_LEAPFROG_2_2`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. This is the classic Pseudo Leapfrog/Verlet method. -ARKODE_SPRK_MCLACHLAN_2_2 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 2nd-order McLachlan method +.. c:enumerator:: ARKODE_SPRK_MCLACHLAN_2_2 Accessible via the constant (or string) ``ARKODE_SPRK_MCLACHLAN_2_2`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. This is the 2nd order method given by McLachlan in :cite:p:`Mclachlan:92`. -ARKODE_SPRK_RUTH_3_3 -^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 3rd-order Ruth method - -Accessible via the constant (or string) ``ARKODE_SPRK_RUTH_3_3`` to -:c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. -This is the 3rd order method given by Ruth in :cite:p:`Ruth:93`. - - -ARKODE_SPRK_MCLACHLAN_3_3 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 3rd-order McLachlan method +.. c:enumerator:: ARKODE_SPRK_MCLACHLAN_3_3 Accessible via the constant (or string) ``ARKODE_SPRK_MCLACHLAN_3_3`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. @@ -2232,10 +2240,14 @@ This is the 3rd order method given by McLachlan in :cite:p:`Mclachlan:92` and the default 3rd order method. -ARKODE_SPRK_MCLACHLAN_4_4 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +.. c:enumerator:: ARKODE_SPRK_RUTH_3_3 + +Accessible via the constant (or string) ``ARKODE_SPRK_RUTH_3_3`` to +:c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. +This is the 3rd order method given by Ruth in :cite:p:`Ruth:93`. + -.. index:: 4th-order McLachlan method +.. c:enumerator:: ARKODE_SPRK_MCLACHLAN_4_4 Accessible via the constant (or string) ``ARKODE_SPRK_MCLACHLAN_4_4`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. @@ -2247,20 +2259,14 @@ and the default 4th order method. This method only has coefficients sufficient for single or double precision. -ARKODE_SPRK_CANDY_ROZMUS_4_4 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 4th-order Candy-Rozmus method +.. c:enumerator:: ARKODE_SPRK_CANDY_ROZMUS_4_4 Accessible via the constant (or string) ``ARKODE_SPRK_CANDY_ROZMUS_4_4`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. This is the 4th order method given by Candy and Rozmus in :cite:p:`CandyRozmus:91`. -ARKODE_SPRK_MCLACHLAN_5_6 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 5th-order McLachlan method +.. c:enumerator:: ARKODE_SPRK_MCLACHLAN_5_6 Accessible via the constant (or string) ``ARKODE_SPRK_MCLACHLAN_5_6`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. @@ -2272,10 +2278,7 @@ and the default 5th order method. This method only has coefficients sufficient for single or double precision. -ARKODE_SPRK_YOSHIDA_6_8 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 6th-order Yoshida method +.. c:enumerator:: ARKODE_SPRK_YOSHIDA_6_8 Accessible via the constant (or string) ``ARKODE_SPRK_YOSHIDA_6_8`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. @@ -2283,10 +2286,7 @@ This is the 6th order method given by Yoshida in :cite:p:`Yoshida:90` and the 6th order method. -ARKODE_SPRK_SUZUKI_UMENO_8_16 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 8th-order Suzuki-Umeno method +.. c:enumerator:: ARKODE_SPRK_SUZUKI_UMENO_8_16 Accessible via the constant (or string) ``ARKODE_SPRK_SUZUKI_UMENO_8_16`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. @@ -2294,10 +2294,7 @@ This is the 8th order method given by Suzuki and Umeno in :cite:p:`Suzuki:93` and the default 8th order method. -ARKODE_SPRK_SOFRONIOU_10_36 -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.. index:: 10th-order Sofroniou-Spaletta method +.. c:enumerator:: ARKODE_SPRK_SOFRONIOU_10_36 Accessible via the constant (or string) ``ARKODE_SPRK_SOFRONIOU_10_36`` to :c:func:`ARKodeSPRKTable_Load` or :c:func:`ARKodeSPRKTable_LoadByName`. From 641746ec1f89cfee52aea97d5e7bdb873df30ed6 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 18:59:25 -0700 Subject: [PATCH 27/31] Fix broken refs --- doc/arkode/guide/source/Mathematics.rst | 17 +++++------------ doc/shared/Changelog.rst | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/doc/arkode/guide/source/Mathematics.rst b/doc/arkode/guide/source/Mathematics.rst index 9d9835c53d..2c9d8b1cb6 100644 --- a/doc/arkode/guide/source/Mathematics.rst +++ b/doc/arkode/guide/source/Mathematics.rst @@ -392,13 +392,9 @@ In this scenario, the coefficients :math:`A^I=0`, :math:`c^I=0`, methods reduce to classical :index:`explicit Runge--Kutta methods` (ERK). For these classes of methods, ARKODE provides coefficients with orders of accuracy :math:`q = \{2,3,4,5,6,7,8,9\}`, with embeddings -of orders :math:`p = \{1,2,3,4,5,6,7,8\}`. These default to the methods in -sections -:numref:`Butcher.Heun_Euler`, -:numref:`Butcher.Bogacki_Shampine`, :numref:`Butcher.Zonneveld`, -:numref:`Butcher.Cash-Karp`, :numref:`Butcher.Verner-6-5`, and -:numref:`Butcher.Fehlberg-8-7`, respectively. As with ARK -methods, user-defined ERK tables are supported. +of orders :math:`p = \{1,2,3,4,5,6,7,8\}`; the tables for these methods are +given in section :numref:`Butcher.explicit`. As with ARK methods, user-defined +ERK tables are supported. Alternately, for stiff problems the user may specify that :math:`f^E = 0`, so the equation :eq:`ARKODE_IMEX_IVP` reduces to the non-split IVP @@ -413,11 +409,8 @@ in :eq:`ARKODE_ARK`, and the ARK methods reduce to classical :index:`diagonally-implicit Runge--Kutta methods` (DIRK). For these classes of methods, ARKODE provides tables with orders of accuracy :math:`q = \{2,3,4,5\}`, with embeddings of orders -:math:`p = \{1,2,3,4\}`. These default to the methods -:numref:`Butcher.SDIRK-2-1`, :numref:`Butcher.ARK_4_2_3_I`, -:numref:`Butcher.SDIRK-5-4`, and :numref:`Butcher.ARK_8_4_5_I`, -respectively. Again, user-defined DIRK tables are supported. - +:math:`p = \{1,2,3,4\}`; the tables for these methods are given in section +:numref:`Butcher.implicit`. Again, user-defined DIRK tables are supported. .. _ARKODE.Mathematics.ERK: diff --git a/doc/shared/Changelog.rst b/doc/shared/Changelog.rst index bc9d5c1ad9..686ed622e1 100644 --- a/doc/shared/Changelog.rst +++ b/doc/shared/Changelog.rst @@ -510,8 +510,8 @@ or :c:func:`MRIStepSetInterpolateStopTime`. Added the second order IMEX method from :cite:p:`giraldo2013implicit` as the default second order IMEX method in ARKStep. The explicit table is given by -``ARKODE_ARK2_ERK_3_1_2`` (see :ref:`Butcher.ARK2_ERK`) and the implicit -table by ``ARKODE_ARK2_DIRK_3_1_2`` (see :ref:`Butcher.ARK2_DIRK`). +:c:enumerator:`ARKODE_ARK2_ERK_3_1_2` and the implicit table by +:c:enumerator:`ARKODE_ARK2_DIRK_3_1_2`. Updated the F2003 utility routines :c:func:`SUNDIALSFileOpen` and :c:func:`SUNDIALSFileClose` to support user specification of ``stdout`` and From 58206dd81e1d07c622540f51b4dfb1020e9caeab Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Mon, 16 Sep 2024 18:59:54 -0700 Subject: [PATCH 28/31] Remove old constants --- doc/arkode/guide/source/Constants.rst | 65 --------------------------- 1 file changed, 65 deletions(-) diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst index faa8172bf4..105f69e1a7 100644 --- a/doc/arkode/guide/source/Constants.rst +++ b/doc/arkode/guide/source/Constants.rst @@ -74,71 +74,6 @@ contains the ARKODE output constants. +-----------------------------------------------+------------------------------------------------------------+ | | | +-----------------------------------------------+------------------------------------------------------------+ - | **ImEx Butcher table specification** | | - +-----------------------------------------------+------------------------------------------------------------+ - | ARKODE_ARK2_ERK_3_1_2 & | Use the :index:`ARK-3-1-2 ARK method`. | - | ARKODE_ARK2_DIRK_3_1_2 | | - +-----------------------------------------------+------------------------------------------------------------+ - | ARKODE_ARK324L2SA_ERK_4_2_3 & | Use the :index:`ARK-4-2-3 ARK method`. | - | ARKODE_ARK324L2SA_DIRK_4_2_3 | | - +-----------------------------------------------+------------------------------------------------------------+ - | ARKODE_ARK436L2SA_ERK_6_3_4 & | Use the :index:`ARK-6-3-4 ARK method`. | - | ARKODE_ARK436L2SA_DIRK_6_3_4 | | - +-----------------------------------------------+------------------------------------------------------------+ - | ARKODE_ARK437L2SA_ERK_7_3_4 & | Use the :index:`ARK-7-3-4 ARK method`. | - | ARKODE_ARK437L2SA_DIRK_7_3_4 | | - +-----------------------------------------------+------------------------------------------------------------+ - | ARKODE_ARK548L2SA_ERK_8_4_5 & | Use the :index:`ARK-8-4-5 ARK method`. | - | ARKODE_ARK548L2SA_DIRK_8_4_5 | | - +-----------------------------------------------+------------------------------------------------------------+ - | ARKODE_ARK548L2SAb_ERK_8_4_5 & | Use the :index:`ARK-8-4-5b ARK method`. | - | ARKODE_ARK548L2SAb_DIRK_8_4_5 | | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_2` & | Use ARKStep's default second-order ARK method | - | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_2` | (ARKODE_ARK2_ERK_3_1_2 and ARKODE_ARK2_DIRK_3_1_2). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_3` & | Use ARKStep's default third-order ARK method | - | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_3` | (ARKODE_ARK324L2SA_ERK_4_2_3 and | - | | ARKODE_ARK324L2SA_DIRK_4_2_3). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_4` & | Use ARKStep's default fourth-order ARK method | - | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_4` | (ARKODE_ARK437L2SA_ERK_7_3_4 and | - | | ARKODE_ARK437L2SA_DIRK_7_3_4). | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKSTEP_DEFAULT_ARK_ETABLE_5` & | Use ARKStep's default fifth-order ARK method | - | :index:`ARKSTEP_DEFAULT_ARK_ITABLE_5` | (ARKODE_ARK548L2SAb_ERK_8_4_5 and | - | | ARKODE_ARK548L2SAb_DIRK_8_4_5). | - +-----------------------------------------------+------------------------------------------------------------+ - | | | - +-----------------------------------------------+------------------------------------------------------------+ - | **Symplectic Method storage specification** | | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_EULER_1_1` | Symplectic Euler 1st order method with 1 stage. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_LEAPFROG_2_2` | Symplectic Leapfrog 2nd order method with 2 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_PSEUDO_LEAPFROG_2_2` | Symplectic Pseudo Leapfrog 2nd order method with 2 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_RUTH_3_3` | Symplectic Ruth 3rd order method with 3 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_MCLACHLAN_2_2` | Symplectic McLachlan 2nd order method with 2 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_MCLACHLAN_3_3` | Symplectic McLachlan 3rd order method with 3 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_CANDY_ROZMUS_4_4` | Symplectic Candy-Rozmus 4th order method with 4 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_MCLACHLAN_4_4` | Symplectic McLachlan 4th order method with 4 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_MCLACHLAN_5_6` | Symplectic McLachlan 5th order method with 6 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_YOSHIDA_6_8` | Symplectic Yoshida 6th order method with 8 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_SUZUKI_UMENO_8_16` | Symplectic McLachlan 8th order method with 16 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | :index:`ARKODE_SPRK_SOFRONIOU_10_36` | Symplectic Sofroniou 10th order method with 36 stages. | - +-----------------------------------------------+------------------------------------------------------------+ - | | | - +-----------------------------------------------+------------------------------------------------------------+ | **MRI method types** | | +-----------------------------------------------+------------------------------------------------------------+ | :index:`MRISTEP_EXPLICIT` | Use an explicit (at the slow time scale) MRI method. | From 49cabed887656e7090de0ece87b3877e0d21b5d2 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Tue, 17 Sep 2024 18:16:33 -0700 Subject: [PATCH 29/31] Correct types of default tables --- include/arkode/arkode_arkstep.h | 44 ++++++++++++++++----------------- include/arkode/arkode_erkstep.h | 18 +++++++------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h index 5e491afb37..35aa1c2494 100644 --- a/include/arkode/arkode_arkstep.h +++ b/include/arkode/arkode_arkstep.h @@ -35,32 +35,32 @@ extern "C" { /* Default Butcher tables for each method/order */ /* explicit */ -static const int ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; -static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2; -static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; -static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; -static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5; -static const int ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6; -static const int ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7; -static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8; -static const int ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9; /* implicit */ -static const int ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1; -static const int ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2; -static const int ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3; -static const int ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4; -static const int ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5; /* ImEx */ -static const int ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2; -static const int ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3; -static const int ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4; -static const int ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5; -static const int ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2; -static const int ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3; -static const int ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4; -static const int ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4; +static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4; +static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5; /* ------------------- * Exported Functions diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h index c8a5b883e6..614e296437 100644 --- a/include/arkode/arkode_erkstep.h +++ b/include/arkode/arkode_erkstep.h @@ -32,15 +32,15 @@ extern "C" { /* Default Butcher tables for each order */ -static const int ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1; -static const int ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2; -static const int ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; -static const int ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; -static const int ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5; -static const int ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6; -static const int ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7; -static const int ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8; -static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8; +static const ARKODE_ERKTableID ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9; /* ------------------- * Exported Functions From 6666fe7f0684e9ba6f1db5683fe2b4ef0b3b0d77 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Tue, 17 Sep 2024 18:48:44 -0700 Subject: [PATCH 30/31] Bring back default tables to constants docs --- doc/arkode/guide/source/Constants.rst | 77 +++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) diff --git a/doc/arkode/guide/source/Constants.rst b/doc/arkode/guide/source/Constants.rst index 105f69e1a7..e3147c17b9 100644 --- a/doc/arkode/guide/source/Constants.rst +++ b/doc/arkode/guide/source/Constants.rst @@ -74,6 +74,83 @@ contains the ARKODE output constants. +-----------------------------------------------+------------------------------------------------------------+ | | | +-----------------------------------------------+------------------------------------------------------------+ + | **Default explicit Butcher tables** | | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_1` | Use ARKStep's default first-order ERK method | + | | :c:enumerator:`ARKODE_FORWARD_EULER_1_1`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_2` | Use ARKStep's default second-order ERK method | + | | :c:enumerator:`ARKODE_RALSTON_3_1_2`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_3` | Use ARKStep's default third-order ERK method | + | | :c:enumerator:`ARKODE_BOGACKI_SHAMPINE_4_2_3`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_4` | Use ARKStep's default fourth-order ERK method | + | | :c:enumerator:`ARKODE_SOFRONIOU_SPALETTA_5_3_4`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_5` | Use ARKStep's default fifth-order ERK method | + | | :c:enumerator:`ARKODE_TSITOURAS_7_4_5`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_6` | Use ARKStep's default sixth-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_9_5_6`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_7` | Use ARKStep's default seventh-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_10_6_7`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_8` | Use ARKStep's default eighth-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_13_7_8`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_ERK_9` | Use ARKStep's default ninth-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_16_8_9`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_1` | Use ERKStep's default first-order ERK method | + | | :c:enumerator:`ARKODE_FORWARD_EULER_1_1`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_2` | Use ERKStep's default second-order ERK method | + | | :c:enumerator:`ARKODE_RALSTON_3_1_2`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_3` | Use ERKStep's default third-order ERK method | + | | :c:enumerator:`ARKODE_BOGACKI_SHAMPINE_4_2_3`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_4` | Use ERKStep's default fourth-order ERK method | + | | :c:enumerator:`ARKODE_SOFRONIOU_SPALETTA_5_3_4`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_5` | Use ERKStep's default fifth-order ERK method | + | | :c:enumerator:`ARKODE_TSITOURAS_7_4_5`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_6` | Use ERKStep's default sixth-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_9_5_6`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_7` | Use ERKStep's default seventh-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_10_6_7`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_8` | Use ERKStep's default eighth-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_13_7_8`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ERKSTEP_DEFAULT_9` | Use ERKStep's default ninth-order ERK method | + | | :c:enumerator:`ARKODE_VERNER_16_8_9`. | + +-----------------------------------------------+------------------------------------------------------------+ + | | | + +-----------------------------------------------+------------------------------------------------------------+ + | **Default implicit Butcher tables** | | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_DIRK_1` | Use ARKStep's default first-order DIRK method | + | | :c:enumerator:`ARKODE_BACKWARD_EULER_1_1`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_DIRK_2` | Use ARKStep's default second-order DIRK method | + | | :c:enumerator:`ARKODE_ARK2_DIRK_3_1_2`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_DIRK_3` | Use ARKStep's default third-order DIRK method | + | | :c:enumerator:`ARKODE_ESDIRK325L2SA_5_2_3`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_DIRK_4` | Use ARKStep's default fourth-order DIRK method | + | | :c:enumerator:`ARKODE_ESDIRK436L2SA_6_3_4`. | + +-----------------------------------------------+------------------------------------------------------------+ + | :index:`ARKSTEP_DEFAULT_DIRK_5` | Use ARKStep's default fifth-order DIRK method | + | | :c:enumerator:`ARKODE_ESDIRK547L2SA2_7_4_5`. | + +-----------------------------------------------+------------------------------------------------------------+ + | | | + +-----------------------------------------------+------------------------------------------------------------+ | **MRI method types** | | +-----------------------------------------------+------------------------------------------------------------+ | :index:`MRISTEP_EXPLICIT` | Use an explicit (at the slow time scale) MRI method. | From 9fefa0df82398e053e3b4c17c0aca34b34b8e893 Mon Sep 17 00:00:00 2001 From: Steven Roberts Date: Tue, 24 Sep 2024 17:44:09 -0700 Subject: [PATCH 31/31] Revert default table constants to int --- include/arkode/arkode_arkstep.h | 48 ++++++++++++++++++--------------- include/arkode/arkode_erkstep.h | 18 ++++++------- 2 files changed, 35 insertions(+), 31 deletions(-) diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h index 35aa1c2494..4736d74f63 100644 --- a/include/arkode/arkode_arkstep.h +++ b/include/arkode/arkode_arkstep.h @@ -34,33 +34,37 @@ extern "C" { /* Default Butcher tables for each method/order */ +/* Ideally these defaults would be declared with types ARKODE_ERKTableID and + * ARKODE_DIRKTableID, but this causes swig to unnecessarily append `C_INT` to + * the variable names */ + /* explicit */ -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9; +static const int ARKSTEP_DEFAULT_ERK_1 = ARKODE_FORWARD_EULER_1_1; +static const int ARKSTEP_DEFAULT_ERK_2 = ARKODE_RALSTON_3_1_2; +static const int ARKSTEP_DEFAULT_ERK_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; +static const int ARKSTEP_DEFAULT_ERK_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; +static const int ARKSTEP_DEFAULT_ERK_5 = ARKODE_TSITOURAS_7_4_5; +static const int ARKSTEP_DEFAULT_ERK_6 = ARKODE_VERNER_9_5_6; +static const int ARKSTEP_DEFAULT_ERK_7 = ARKODE_VERNER_10_6_7; +static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8; +static const int ARKSTEP_DEFAULT_ERK_9 = ARKODE_VERNER_16_8_9; /* implicit */ -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5; +static const int ARKSTEP_DEFAULT_DIRK_1 = ARKODE_BACKWARD_EULER_1_1; +static const int ARKSTEP_DEFAULT_DIRK_2 = ARKODE_ARK2_DIRK_3_1_2; +static const int ARKSTEP_DEFAULT_DIRK_3 = ARKODE_ESDIRK325L2SA_5_2_3; +static const int ARKSTEP_DEFAULT_DIRK_4 = ARKODE_ESDIRK436L2SA_6_3_4; +static const int ARKSTEP_DEFAULT_DIRK_5 = ARKODE_ESDIRK547L2SA2_7_4_5; /* ImEx */ -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4; -static const ARKODE_ERKTableID ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4; -static const ARKODE_DIRKTableID ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5; +static const int ARKSTEP_DEFAULT_ARK_ETABLE_2 = ARKODE_ARK2_ERK_3_1_2; +static const int ARKSTEP_DEFAULT_ARK_ETABLE_3 = ARKODE_ARK324L2SA_ERK_4_2_3; +static const int ARKSTEP_DEFAULT_ARK_ETABLE_4 = ARKODE_ARK437L2SA_ERK_7_3_4; +static const int ARKSTEP_DEFAULT_ARK_ETABLE_5 = ARKODE_ARK548L2SAb_ERK_8_4_5; +static const int ARKSTEP_DEFAULT_ARK_ITABLE_2 = ARKODE_ARK2_DIRK_3_1_2; +static const int ARKSTEP_DEFAULT_ARK_ITABLE_3 = ARKODE_ARK324L2SA_DIRK_4_2_3; +static const int ARKSTEP_DEFAULT_ARK_ITABLE_4 = ARKODE_ARK437L2SA_DIRK_7_3_4; +static const int ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5; /* ------------------- * Exported Functions diff --git a/include/arkode/arkode_erkstep.h b/include/arkode/arkode_erkstep.h index 614e296437..c8a5b883e6 100644 --- a/include/arkode/arkode_erkstep.h +++ b/include/arkode/arkode_erkstep.h @@ -32,15 +32,15 @@ extern "C" { /* Default Butcher tables for each order */ -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8; -static const ARKODE_ERKTableID ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9; +static const int ERKSTEP_DEFAULT_1 = ARKODE_FORWARD_EULER_1_1; +static const int ERKSTEP_DEFAULT_2 = ARKODE_RALSTON_3_1_2; +static const int ERKSTEP_DEFAULT_3 = ARKODE_BOGACKI_SHAMPINE_4_2_3; +static const int ERKSTEP_DEFAULT_4 = ARKODE_SOFRONIOU_SPALETTA_5_3_4; +static const int ERKSTEP_DEFAULT_5 = ARKODE_TSITOURAS_7_4_5; +static const int ERKSTEP_DEFAULT_6 = ARKODE_VERNER_9_5_6; +static const int ERKSTEP_DEFAULT_7 = ARKODE_VERNER_10_6_7; +static const int ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8; +static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9; /* ------------------- * Exported Functions