Removed changesets from PR #547

LLNL · Sep 6, 2024 · 6f59400 · 6f59400
1 parent 1bdd79e
commit 6f59400
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 135 deletions.
diff --git a/include/arkode/arkode_arkstep.h b/include/arkode/arkode_arkstep.h
@@ -36,32 +36,31 @@ 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_2 = ARKODE_HEUN_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;
-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_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_7 = ARKODE_VERNER_10_6_7;
-static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8;
+static const int ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_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_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 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;
 
 /*    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_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_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 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;
 
 /* -------------------
  * Exported Functions

diff --git a/include/arkode/arkode_butcher_erk.h b/include/arkode/arkode_butcher_erk.h
@@ -52,9 +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_MAX_ERK_NUM = ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2
 } ARKODE_ERKTableID;
 
 /* Accessor routine to load built-in ERK table */

diff --git 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_RALSTON_3_1_2;
+static const int ERKSTEP_DEFAULT_2 = ARKODE_HEUN_EULER_2_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_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_7 = ARKODE_VERNER_10_6_7;
-static const int ERKSTEP_DEFAULT_8 = ARKODE_VERNER_13_7_8;
+static const int ERKSTEP_DEFAULT_8 = ARKODE_FEHLBERG_13_7_8;
 static const int ERKSTEP_DEFAULT_9 = ARKODE_VERNER_16_8_9;
 
 /* -------------------

diff --git a/src/arkode/arkode_butcher_erk.def b/src/arkode/arkode_butcher_erk.def
@@ -39,7 +39,6 @@
      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
@@ -51,7 +50,6 @@
      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
@@ -82,29 +80,6 @@ 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;
@@ -449,58 +424,6 @@ 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;

diff --git 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_RALSTON_3_1_2
+ integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_2 = ARKODE_HEUN_EULER_2_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_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_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_7 = ARKODE_VERNER_10_6_7
- integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8
+ integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_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_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_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_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_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_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_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_ARK437L2SA_DIRK_7_3_4
- integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5
+ 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
  public :: FARKStepCreate
  public :: FARKStepReInit
  public :: FARKStepSetExplicit

diff --git a/src/arkode/fmod_int32/farkode_mod.f90 b/src/arkode/fmod_int32/farkode_mod.f90
@@ -365,9 +365,7 @@ 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_RALSTON_3_1_2
-  enumerator :: ARKODE_TSITOURAS_7_4_5
-  enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_TSITOURAS_7_4_5
+  enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2
  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, &
@@ -376,8 +374,7 @@ 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_RALSTON_3_1_2, ARKODE_TSITOURAS_7_4_5, &
-    ARKODE_MAX_ERK_NUM
+    ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, 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
@@ -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_RALSTON_3_1_2
+ integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_2 = ARKODE_HEUN_EULER_2_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_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_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_7 = ARKODE_VERNER_10_6_7
- integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_VERNER_13_7_8
+ integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ERK_8 = ARKODE_FEHLBERG_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_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_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_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_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_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_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_ARK437L2SA_DIRK_7_3_4
- integer(C_INT), parameter, public :: ARKSTEP_DEFAULT_ARK_ITABLE_5 = ARKODE_ARK548L2SAb_DIRK_8_4_5
+ 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
  public :: FARKStepCreate
  public :: FARKStepReInit
  public :: FARKStepSetExplicit

diff --git a/src/arkode/fmod_int64/farkode_mod.f90 b/src/arkode/fmod_int64/farkode_mod.f90
@@ -365,9 +365,7 @@ 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_RALSTON_3_1_2
-  enumerator :: ARKODE_TSITOURAS_7_4_5
-  enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_TSITOURAS_7_4_5
+  enumerator :: ARKODE_MAX_ERK_NUM = ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2
  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, &
@@ -376,8 +374,7 @@ 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_RALSTON_3_1_2, ARKODE_TSITOURAS_7_4_5, &
-    ARKODE_MAX_ERK_NUM
+    ARKODE_RALSTON_EULER_2_1_2, ARKODE_EXPLICIT_MIDPOINT_EULER_2_1_2, ARKODE_MAX_ERK_NUM
  public :: FARKodeButcherTable_LoadERK
  public :: FARKodeButcherTable_LoadERKByName
  public :: FARKodeButcherTable_ERKIDToName