renaming for consistency

hannorein · Aug 21, 2019 · 08e5ac0 · 08e5ac0
1 parent 710b86f
commit 08e5ac0
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 36 deletions.
diff --git a/rebound/simulation.py b/rebound/simulation.py
@@ -29,8 +29,8 @@
 WHFAST_COORDINATES = {"jacobi": 0, "democraticheliocentric": 1, "whds": 2}
 SABA_TYPES = {
         "1": 0x0, "2": 0x1, "3": 0x2, "4": 0x3,
-        "1cm": 0x100, "2cm": 0x101, "3cm": 0x102, "4cm": 0x103,
-        "1cl": 0x200, "2cl": 0x201, "3cl": 0x202, "4cl": 0x203,
+        "cm1": 0x100, "cm2": 0x101, "cm3": 0x102, "cm4": 0x103,
+        "cl1": 0x200, "cl2": 0x201, "cl3": 0x202, "cl4": 0x203,
         "10,4": 0x4, "8,6,4": 0x5, "10,6,4": 0x6,
         }
 

diff --git a/rebound/tests/test_saba.py b/rebound/tests/test_saba.py
@@ -5,31 +5,31 @@
 
 sabasettings1 = [ # type, relative error
         ["SABA2",1e-10], 
-        ["SABA2CM",1e-10], 
-        ["SABA2CL",1e-10], 
+        ["SABACM2",1e-10], 
+        ["SABACL2",1e-10], 
         ["SABA3",2e-11], 
-        ["SABA3CM",2e-11], 
-        ["SABA3CL",2e-11], 
+        ["SABACM3",2e-11], 
+        ["SABACL3",2e-11], 
         ["SABA4",2e-11], 
-        ["SABA4CM",2e-11], 
-        ["SABA4CL",2e-11], 
+        ["SABACM4",2e-11], 
+        ["SABACL4",2e-11], 
         ["SABA10,4",5e-13], 
         ["SABA8,6,4",5e-13], 
         ["SABA10,6,4",5e-13], 
         ]
 sabasettings2 = [ # type, relative error
         ["SABA1",2e-14], 
-        ["SABA1CM",4e-14], 
-        ["SABA1CL",4e-14], 
+        ["SABACM4",4e-14], 
+        ["SABACL4",4e-14], 
         ["SABA2",4e-14], 
-        ["SABA2CM",4e-14], 
-        ["SABA2CL",4e-14], 
+        ["SABACM4",4e-14], 
+        ["SABACL4",4e-14], 
         ["SABA3",4e-14], 
-        ["SABA3CM",4e-14], 
-        ["SABA3CL",4e-14], 
+        ["SABACM4",4e-14], 
+        ["SABACL4",4e-14], 
         ["SABA4",4e-14], 
-        ["SABA4CM",4e-14], 
-        ["SABA4CL",4e-14], 
+        ["SABACM4",4e-14], 
+        ["SABACL4",4e-14], 
         ["SABA10,4",3e-14], 
         ["SABA8,6,4",3e-14], 
         ["SABA10,6,4",3e-14], 

diff --git a/src/integrator_saba.c b/src/integrator_saba.c
@@ -47,20 +47,20 @@
 static int reb_saba_stages(const int type){
     switch(type){
         case REB_SABA_1:
-        case REB_SABA_1CM:
-        case REB_SABA_1CL:
+        case REB_SABA_CM_1:
+        case REB_SABA_CL_1:
             return 1;
         case REB_SABA_2:
-        case REB_SABA_2CM:
-        case REB_SABA_2CL:
+        case REB_SABA_CM_2:
+        case REB_SABA_CL_2:
             return 2;
         case REB_SABA_3:
-        case REB_SABA_3CM:
-        case REB_SABA_3CL:
+        case REB_SABA_CM_3:
+        case REB_SABA_CL_3:
             return 3;
         case REB_SABA_4:
-        case REB_SABA_4CM:
-        case REB_SABA_4CL:
+        case REB_SABA_CM_4:
+        case REB_SABA_CL_4:
             return 4;
         case REB_SABA_10_4:
         case REB_SABA_8_6_4:
@@ -102,10 +102,10 @@ const static double reb_saba_d[7][4] = {
          0.2170703479789911017143385924306336714532, -0.01737538195906509300561788011852699719871, }, //ABA(10,6,4)
 };
 const static double reb_saba_cc[4] = {
-        0.08333333333333333333333333333333333333333,  // SABA1C
-        0.01116454968463011276968973577058865137738,  // SABA2C
-        0.005634593363122809402267823769797538671562, // SABA3C
-        0.003396775048208601331532157783492144,       // SABA4C
+        0.08333333333333333333333333333333333333333,  // SABAC1
+        0.01116454968463011276968973577058865137738,  // SABAC2
+        0.005634593363122809402267823769797538671562, // SABAC3
+        0.003396775048208601331532157783492144,       // SABAC4
 }; 
 
 

diff --git a/src/rebound.h b/src/rebound.h
@@ -306,14 +306,14 @@ struct reb_simulation_integrator_saba {
         REB_SABA_2 = 0x1, // SABA2
         REB_SABA_3 = 0x2, // SABA3
         REB_SABA_4 = 0x3, // SABA4
-        REB_SABA_1CM = 0x100, // SABA1CM (Modified kick corrector)
-        REB_SABA_2CM = 0x101, // SABA2CM (Modified kick corrector)
-        REB_SABA_3CM = 0x102, // SABA3CM (Modified kick corrector)
-        REB_SABA_4CM = 0x103, // SABA4CM (Modified kick corrector)
-        REB_SABA_1CL = 0x200, // SABA1CL (lazy corrector)
-        REB_SABA_2CL = 0x201, // SABA2CL (lazy corrector)
-        REB_SABA_3CL = 0x202, // SABA3CL (lazy corrector)
-        REB_SABA_4CL = 0x203, // SABA4CL (lazy corrector)
+        REB_SABA_CM_1 = 0x100, // SABACM1 (Modified kick corrector)
+        REB_SABA_CM_2 = 0x101, // SABACM2 (Modified kick corrector)
+        REB_SABA_CM_3 = 0x102, // SABACM3 (Modified kick corrector)
+        REB_SABA_CM_4 = 0x103, // SABACM4 (Modified kick corrector)
+        REB_SABA_CL_1 = 0x200, // SABACL1 (lazy corrector)
+        REB_SABA_CL_2 = 0x201, // SABACL2 (lazy corrector)
+        REB_SABA_CL_3 = 0x202, // SABACL3 (lazy corrector)
+        REB_SABA_CL_4 = 0x203, // SABACL4 (lazy corrector)
         REB_SABA_10_4 = 0x4,  // ABA(10,4), 7 stage
         REB_SABA_8_6_4 = 0x5, // ABA(8,6,4), 7 stage
         REB_SABA_10_6_4 = 0x6,// ABA(10,6,4), 8 stage, default