From 5b1355fbd112da2381cc667d1f58983ac337a7a2 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 1 Dec 2022 11:31:45 -0500 Subject: [PATCH] Fixed issues getting dump_cadence set properly on the Python side --- python/swiftest/swiftest/io.py | 7 ++++--- python/swiftest/swiftest/simulation_class.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/python/swiftest/swiftest/io.py b/python/swiftest/swiftest/io.py index 5d1f72ad6..92eeec73e 100644 --- a/python/swiftest/swiftest/io.py +++ b/python/swiftest/swiftest/io.py @@ -30,7 +30,8 @@ "SEED", "INTERACTION_LOOPS", "ENCOUNTER_CHECK", - "TSTART") + "TSTART", + "DUMP_CADENCE") # This list defines features that are booleans, so must be converted to/from string when writing/reading from file bool_param = ["RESTART", @@ -46,7 +47,7 @@ "YARKOVSKY", "YORP"] -int_param = ["ISTEP_OUT", "ISTEP_DUMP"] +int_param = ["ISTEP_OUT", "DUMP_CADENCE"] float_param = ["T0", "TSTART", "TSTOP", "DT", "CHK_RMIN", "CHK_RMAX", "CHK_EJECT", "CHK_QMIN", "DU2M", "MU2KG", "TU2S", "MIN_GMFRAG", "GMTINY"] @@ -409,7 +410,7 @@ def write_labeled_param(param, param_file_name): 'TSTOP', 'DT', 'ISTEP_OUT', - 'ISTEP_DUMP', + 'DUMP_CADENCE', 'NC_IN', 'PL_IN', 'TP_IN', diff --git a/python/swiftest/swiftest/simulation_class.py b/python/swiftest/swiftest/simulation_class.py index 8abf27d27..709e7e45d 100644 --- a/python/swiftest/swiftest/simulation_class.py +++ b/python/swiftest/swiftest/simulation_class.py @@ -628,10 +628,10 @@ def set_simulation_time(self, if dump_cadence is None: dump_cadence = self.param.pop("DUMP_CADENCE", 1) - self.param['DUMP_CADENCE'] = dump_cadence else: update_list.append("dump_cadence") - + self.param['DUMP_CADENCE'] = dump_cadence + time_dict = self.get_simulation_time(update_list, verbose=verbose) return time_dict