cleanup

hannorein · Oct 26, 2023 · 92a1cca · 92a1cca
1 parent b918134
commit 92a1cca
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/rebound/simulation.py b/rebound/simulation.py
@@ -281,7 +281,8 @@ class reb_dp7(Structure):
                 ("p5", POINTER(c_double)),
                 ("p6", POINTER(c_double))]
 
-class reb_collision(Structure):
+# Note: name conflict with exception "Collision"
+class CollisionS(Structure):
     _fields_ = [("p1", c_int),
                 ("p2", c_int),
                 ("gb", Vec6d),
@@ -2578,7 +2579,7 @@ class IntegratorWHFast512(Structure):
                 ("_heartbeat", CFUNCTYPE(None,POINTER(Simulation))),
                 ("_display_heartbeat", CFUNCTYPE(None,POINTER(Simulation))),
                 ("_coefficient_of_restitution", CFUNCTYPE(c_double,POINTER(Simulation), c_double)),
-                ("_collision_resolve", CFUNCTYPE(c_int,POINTER(Simulation), reb_collision)),
+                ("_collision_resolve", CFUNCTYPE(c_int,POINTER(Simulation), CollisionS)),
                 ("_free_particle_ap", CFUNCTYPE(None, POINTER(Particle))),
                 ("_extras_cleanup", CFUNCTYPE(None, POINTER(Simulation))),
                 ("extras", c_void_p),
@@ -2590,7 +2591,7 @@ class IntegratorWHFast512(Structure):
 ODEDER = CFUNCTYPE(None,POINTER(ODE), POINTER(c_double), POINTER(c_double), c_double)
 ODESCALE = CFUNCTYPE(None,POINTER(ODE), POINTER(c_double), POINTER(c_double))
 CORFF = CFUNCTYPE(c_double,POINTER_REB_SIM, c_double)
-COLRFF = CFUNCTYPE(c_int, POINTER_REB_SIM, reb_collision)
+COLRFF = CFUNCTYPE(c_int, POINTER_REB_SIM, CollisionS)
 MERCURIUSLF = CFUNCTYPE(c_double, POINTER_REB_SIM, c_double, c_double)
 FPA = CFUNCTYPE(None, POINTER(Particle))