From 36c92a450f09c16ee40dec14013fa5a2f7475cfd Mon Sep 17 00:00:00 2001 From: David Minton Date: Thu, 22 Feb 2024 17:35:40 -0500 Subject: [PATCH] Set the default collision_model to MERGE as stated in the documentation --- examples/Basic_Simulation/basic_simulation.py | 1 - swiftest/simulation_class.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/examples/Basic_Simulation/basic_simulation.py b/examples/Basic_Simulation/basic_simulation.py index bee49ac8b..01dcc8b18 100755 --- a/examples/Basic_Simulation/basic_simulation.py +++ b/examples/Basic_Simulation/basic_simulation.py @@ -36,7 +36,6 @@ from numpy.random import default_rng # Initialize the simulation object as a variable. Arguments may be defined here or through the sim.run() method. -#sim = swiftest.Simulation(fragmentation=True, minimum_fragment_mass = 2.5e-11, mtiny=2.5e-8) sim = swiftest.Simulation() sim.clean() rng = default_rng(seed=123) diff --git a/swiftest/simulation_class.py b/swiftest/simulation_class.py index 3075f1609..5b5d8a1a3 100644 --- a/swiftest/simulation_class.py +++ b/swiftest/simulation_class.py @@ -784,7 +784,7 @@ def set_parameter(self, "nfrag_reduction": 30.0, "close_encounter_check": True, "general_relativity": True, - "collision_model": "FRAGGLE", + "collision_model": "MERGE", "minimum_fragment_mass": None, "minimum_fragment_gmass": None, "rotation": True,