From dde82e5bb7cc7e468a273b9c0d96ffab73e314b0 Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 9 Jan 2023 18:22:51 -0500 Subject: [PATCH] Fixed issues getting the rotation variables set --- python/swiftest/swiftest/init_cond.py | 9 ++++----- python/swiftest/swiftest/simulation_class.py | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/python/swiftest/swiftest/init_cond.py b/python/swiftest/swiftest/init_cond.py index 6f513b274..caeae710f 100644 --- a/python/swiftest/swiftest/init_cond.py +++ b/python/swiftest/swiftest/init_cond.py @@ -282,11 +282,10 @@ def vec2xr(param: Dict, **kwargs: Any): # Check for valid keyword arguments kwargs = {k:kwargs[k] for k,v in kwargs.items() if v is not None} - if param['ROTATION']: - if "rot" not in kwargs and "Gmass" in kwargs: - kwargs['rot'] = np.zeros((len(kwargs['Gmass']),3)) - if "Ip" not in kwargs and "Gmass" in kwargs: - kwargs['Ip'] = np.full((len(kwargs['Gmass']),3), 0.4) + if "rot" not in kwargs and "Gmass" in kwargs: + kwargs['rot'] = np.zeros((len(kwargs['Gmass']),3)) + if "Ip" not in kwargs and "Gmass" in kwargs: + kwargs['Ip'] = np.full((len(kwargs['Gmass']),3), 0.4) if "time" not in kwargs: kwargs["time"] = np.array([0.0]) diff --git a/python/swiftest/swiftest/simulation_class.py b/python/swiftest/swiftest/simulation_class.py index f06bf5872..02680c136 100644 --- a/python/swiftest/swiftest/simulation_class.py +++ b/python/swiftest/swiftest/simulation_class.py @@ -777,10 +777,10 @@ def set_parameter(self, verbose: bool = True, **kwargs): "mtiny": None, "close_encounter_check": True, "general_relativity": True, - "collision_model": "MERGE", + "collision_model": "FRAGGLE", "minimum_fragment_mass": None, "minimum_fragment_gmass": 0.0, - "rotation": False, + "rotation": True, "compute_conservation_values": False, "extra_force": False, "big_discard": False,