Merge branch 'oblate_coord_rot' of github.com:MintonGroup/swiftest in…

…to oblate_coord_rot
MintonGroup · Feb 23, 2024 · a26f354 · a26f354
2 parents e490e92 + 36c92a4
commit a26f354
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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,