From d4c88a1474b39084e9baf7234543ae0707a3443d Mon Sep 17 00:00:00 2001 From: David Minton Date: Wed, 31 Jan 2024 11:19:31 -0500 Subject: [PATCH] Rearranged the set_parameter methods to make sure the units don't get messed up during processing of arguments --- swiftest/simulation_class.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/swiftest/simulation_class.py b/swiftest/simulation_class.py index b8218924d..723e1c690 100644 --- a/swiftest/simulation_class.py +++ b/swiftest/simulation_class.py @@ -786,7 +786,7 @@ def set_parameter(self, "general_relativity": True, "collision_model": "FRAGGLE", "minimum_fragment_mass": None, - "minimum_fragment_gmass": 0.0, + "minimum_fragment_gmass": None, "rotation": True, "compute_conservation_values": False, "extra_force": False, @@ -819,8 +819,8 @@ def set_parameter(self, # Setters returning parameter dictionary values param_dict = {} - param_dict.update(self.set_integrator(**kwargs)) param_dict.update(self.set_unit_system(**kwargs)) + param_dict.update(self.set_integrator(**kwargs)) param_dict.update(self.set_simulation_time(**kwargs)) param_dict.update(self.set_init_cond_files(**kwargs)) param_dict.update(self.set_output_files(**kwargs)) @@ -851,12 +851,12 @@ def get_parameter(self, # Getters returning parameter dictionary values param_dict = {} + param_dict.update(self.get_unit_system(**kwargs)) param_dict.update(self.get_integrator(**kwargs)) param_dict.update(self.get_simulation_time(**kwargs)) param_dict.update(self.get_init_cond_files(**kwargs)) param_dict.update(self.get_output_files(**kwargs)) param_dict.update(self.get_distance_range(**kwargs)) - param_dict.update(self.get_unit_system(**kwargs)) param_dict.update(self.get_feature(**kwargs)) self.get_ephemeris_date(**kwargs)