Merge remote-tracking branch 'origin/main' into main

# Conflicts:
#	lib/objects.py
#	plots/2bodies_leapfrog_dEm.png
#	plots/2bodies_leapfrog_dL2.png

lib/objects.py

@@ -8,7 +8,6 @@ import numpy as np
 from lib.plots import DynamicUpdate
 from lib.units import *
 
-
 class Body:
 
     def __init__(self, mass, position, velocity):
@@ -29,7 +28,6 @@ class Body:
     def __str__(self): # Called upon "str(body)"
         return r"Body of mass: {0:.2f} $M_\odot$".format(self.m/Ms)
 
-
 class System(Body):
 
     def __init__(self, bodylist, blackstyle=True):

main.py

@@ -27,7 +27,7 @@ def main():
     v = np.array([v1, v2, v3])
 
     #integration parameters
-    duration, step = 100*yr, np.array([1./(365.25*2.), 1./365.25])*yr #integration time and step in years
+    duration, step = 100*yr, np.array([1./(365.25*4.), 1./(365.25*2.), 1./365.25])*yr #integration time and step in years
     integrator = "leapfrog"
     n_bodies = 2
     display = False