diff --git a/lib/objects.py b/lib/objects.py index e09c3e2..d6fcdcb 100755 --- a/lib/objects.py +++ b/lib/objects.py @@ -17,10 +17,10 @@ class Body: self.p = velocity*mass def __repr__(self): # Called upon "print(body)" - return r"Body of mass: {0:.2f} $M_\odot$, position: {1}, velocity: {2}".format(self.m/Ms, self.q, self.v) + return r"Body of mass: {0:.1e} $M_\odot$, position: {1}, velocity: {2}".format(self.m/Ms, self.q, self.v) def __str__(self): # Called upon "str(body)" - return r"Body of mass: {0:.2f} $M_\odot$".format(self.m/Ms) + return r"Body of mass: {0:.1e} $M_\odot$".format(self.m/Ms) class System(Body): diff --git a/main.py b/main.py index b7352aa..eef2fbd 100755 --- a/main.py +++ b/main.py @@ -25,7 +25,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 diff --git a/plots/2bodies_leapfrog_dEm.png b/plots/2bodies_leapfrog_dEm.png index 64c4594..61428be 100644 Binary files a/plots/2bodies_leapfrog_dEm.png and b/plots/2bodies_leapfrog_dEm.png differ diff --git a/plots/2bodies_leapfrog_dL2.png b/plots/2bodies_leapfrog_dL2.png index 07f1a8e..d7f1abc 100644 Binary files a/plots/2bodies_leapfrog_dL2.png and b/plots/2bodies_leapfrog_dL2.png differ diff --git a/plots/3bodies_leapfrog_dEm.png b/plots/3bodies_leapfrog_dEm.png index e5ca97a..fc05309 100644 Binary files a/plots/3bodies_leapfrog_dEm.png and b/plots/3bodies_leapfrog_dEm.png differ diff --git a/plots/3bodies_leapfrog_dL2.png b/plots/3bodies_leapfrog_dL2.png index 19c1ee1..ba84c86 100644 Binary files a/plots/3bodies_leapfrog_dL2.png and b/plots/3bodies_leapfrog_dL2.png differ diff --git a/plots/3bodies_mass_leapfrog_dEm.png b/plots/3bodies_mass_leapfrog_dEm.png deleted file mode 100644 index 9c59db8..0000000 Binary files a/plots/3bodies_mass_leapfrog_dEm.png and /dev/null differ diff --git a/plots/3bodies_mass_leapfrog_dL2.png b/plots/3bodies_mass_leapfrog_dL2.png deleted file mode 100644 index 12e140f..0000000 Binary files a/plots/3bodies_mass_leapfrog_dL2.png and /dev/null differ diff --git a/plots/3bodies_mass_leapfrog_dynsyst.gif b/plots/3bodies_mass_leapfrog_dynsyst.gif deleted file mode 100644 index 2e39d2c..0000000 Binary files a/plots/3bodies_mass_leapfrog_dynsyst.gif and /dev/null differ