swutch

hannorein · Jun 8, 2016 · c9a3875 · c9a3875
1 parent 1ced503
commit c9a3875
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/rebound/simulation.py b/rebound/simulation.py
@@ -56,7 +56,7 @@ class reb_collision(Structure):
 class reb_simulation_integrator_hermes(Structure):
     _fields_ = [("mini", c_void_p),
                 ("global", c_void_p),
-                ("switch_radius", c_double),
+                ("hill_switch_factor", c_double),
                 ("radius_switch_factor", c_double),
                 ("mini_active", c_int),
                 ("collision_this_global_dt", c_int),

diff --git a/rebound/tests/test_hybarid.py b/rebound/tests/test_hybarid.py
@@ -38,7 +38,7 @@ def test_close_encounter(self):
         sim.add(dust)
         sim.integrator = "hermes"
         sim.gravity = "basic"
-        sim.ri_hermes.switch_radius = 2.
+        sim.ri_hermes.hill_switch_factor = 2.
         P = sim.particles[1].P
         sim.dt = 1e-4*P
         for i in range(1000):
@@ -75,7 +75,7 @@ def test_planetesimal_collision(self):
 
         sim.integrator = "hermes"
         #sim.gravity = "basic"
-        sim.ri_hermes.switch_radius = 3.
+        sim.ri_hermes.hill_switch_factor = 3.
         sim.ri_hermes.radius_switch_factor = 20.
         sim.dt = 0.0001
         sim.testparticle_type = 1
@@ -99,7 +99,7 @@ def test_massive_ejection(self):
 
         sim.integrator = "hermes"
         #sim.gravity = "basic"
-        sim.ri_hermes.switch_radius = 3.
+        sim.ri_hermes.hill_switch_factor = 3.
         sim.ri_hermes.radius_switch_factor = 20.
         sim.dt = 0.001
         sim.testparticle_type = 1