Updated SAPHIRE based on updates to SAAPPHIIRE

niemasd · Aug 20, 2020 · 657e601 · 657e601
1 parent 93845c3
commit 657e601
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/.travis_tests/test_TransmissionTimeSample_SAPHIREGEMF.json b/.travis_tests/test_TransmissionTimeSample_SAPHIREGEMF.json
@@ -60,6 +60,7 @@
     "saphire_i_to_r":                6,
     "saphire_a_to_r":                7,
     "saphire_h_to_r":                8,
+    "saphire_s_to_e_by_e":           10,
     "saphire_s_to_e_by_p":           11,
     "saphire_s_to_e_by_i":           12,
     "saphire_s_to_e_by_a":           13,

diff --git a/modules/FAVITES_ModuleList.json b/modules/FAVITES_ModuleList.json
@@ -702,7 +702,7 @@
         },
 
         "SAPHIREGEMF": {
-            "req": ["gemf_path", "end_time", "saphire_freq_s", "saphire_freq_e", "saphire_freq_p", "saphire_freq_i", "saphire_freq_a", "saphire_freq_h", "saphire_freq_r", "saphire_s_to_e_seed", "saphire_e_to_p", "saphire_p_to_i", "saphire_p_to_a", "saphire_i_to_h", "saphire_i_to_r", "saphire_a_to_r", "saphire_h_to_r", "saphire_s_to_e_by_p", "saphire_s_to_e_by_i", "saphire_s_to_e_by_a"],
+            "req": ["gemf_path", "end_time", "saphire_freq_s", "saphire_freq_e", "saphire_freq_p", "saphire_freq_i", "saphire_freq_a", "saphire_freq_h", "saphire_freq_r", "saphire_s_to_e_seed", "saphire_e_to_p", "saphire_p_to_i", "saphire_p_to_a", "saphire_i_to_h", "saphire_i_to_r", "saphire_a_to_r", "saphire_h_to_r", "saphire_s_to_e_by_e", "saphire_s_to_e_by_p", "saphire_s_to_e_by_i", "saphire_s_to_e_by_a"],
 
             "dep": ["EndCriteria_GEMF", "TransmissionNodeSample_GEMF"]
         },

diff --git a/modules/TransmissionTimeSample_SAPHIREGEMF.py b/modules/TransmissionTimeSample_SAPHIREGEMF.py
@@ -49,6 +49,7 @@ def init():
         GC.saapphiire_a1_to_a2 = GC.C_INT_MAX
         GC.saapphiire_a2_to_r = GC.saphire_a_to_r
         GC.saapphiire_h_to_r = GC.saphire_h_to_r
+        GC.saapphiire_s_to_e_by_e  = GC.saphire_s_to_e_by_e
         GC.saapphiire_s_to_e_by_p1 = 0
         GC.saapphiire_s_to_e_by_p2 = GC.saphire_s_to_e_by_p
         GC.saapphiire_s_to_e_by_i1 = 0