diff --git a/lib/plots.py b/lib/plots.py index 0ac5b63..09bd66c 100755 --- a/lib/plots.py +++ b/lib/plots.py @@ -92,7 +92,7 @@ class DynamicUpdate(): self.fig.savefig("tmp/{0:06d}.png".format(step),bbox_inches="tight") def close(self): - self.fig.close() + plt.close() #Example def __call__(self): @@ -117,7 +117,7 @@ def display_parameters(E,L,parameters,savename=""): bodies = "" for body in dyn_syst.bodylist: bodies += str(body)+" ; " - title = "Relative difference of the {} "+"for a system composed of {0:s} \nintegrated with {1:s} for a duration of {2:.2f} years with a step of {3:.2e} years.".format(bodies, integrator, duration/yr, step/yr) + title = "Relative difference of the {} "+"for a system composed of {0:s}\n integrated with {1:s} for a duration of {2:.2f} years with a step of {3:.2e} years.".format(bodies, integrator, duration/yr, step/yr) fig1 = plt.figure(figsize=(15,7)) ax1 = fig1.add_subplot(111) ax1.plot(np.arange(E.shape[0])*step/yr, np.abs((E-E[0])/E[0]), label=r"$\left|\frac{\delta E_m}{E_m(t=0)}\right|$") diff --git a/main.py b/main.py index c98b629..f471659 100755 --- a/main.py +++ b/main.py @@ -25,16 +25,16 @@ def main(): v = np.array([v1, v2, v3]) bodylist = [] - for i in range(2): + for i in range(3): bodylist.append(Body(m[i], q[i], v[i])) dyn_syst = System(bodylist) dyn_syst.COMShift() duration, step = 100*yr, 1e4 - #E, L = dyn_syst.leapfrog(duration, step, recover_param=True)#, display=True) - E, L = dyn_syst.hermite(duration,step, recover_param=True)#, display=True) + #E, L = dyn_syst.leapfrog(duration, step, recover_param=True, display=True) + E, L = dyn_syst.hermite(duration,step, recover_param=True, display=True) parameters = [duration, step, dyn_syst, "hermite"] - display_parameters(E, L, parameters=parameters, savename="2bodies_hermite") + display_parameters(E, L, parameters=parameters, savename="3bodies_hermite") return 0 diff --git a/plots/2bodies_hermite_dEm.png b/plots/2bodies_hermite_dEm.png index 0cc3719..f32d3fe 100644 Binary files a/plots/2bodies_hermite_dEm.png and b/plots/2bodies_hermite_dEm.png differ diff --git a/plots/2bodies_hermite_dL2.png b/plots/2bodies_hermite_dL2.png index 16a9d84..a917c0d 100644 Binary files a/plots/2bodies_hermite_dL2.png and b/plots/2bodies_hermite_dL2.png differ diff --git a/plots/2bodies_leapfrog_dEm.png b/plots/2bodies_leapfrog_dEm.png index cb62e51..7135334 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 e292f66..a2f2629 100644 Binary files a/plots/2bodies_leapfrog_dL2.png and b/plots/2bodies_leapfrog_dL2.png differ diff --git a/plots/3bodies_hermite_dEm.png b/plots/3bodies_hermite_dEm.png index 4d72ff3..2fd1269 100644 Binary files a/plots/3bodies_hermite_dEm.png and b/plots/3bodies_hermite_dEm.png differ diff --git a/plots/3bodies_hermite_dL2.png b/plots/3bodies_hermite_dL2.png index bcf22c0..2f8c857 100644 Binary files a/plots/3bodies_hermite_dL2.png and b/plots/3bodies_hermite_dL2.png differ diff --git a/plots/3bodies_hermite_dynsyst.gif b/plots/3bodies_hermite_dynsyst.gif index b5504c0..1515106 100644 Binary files a/plots/3bodies_hermite_dynsyst.gif and b/plots/3bodies_hermite_dynsyst.gif differ diff --git a/plots/3bodies_leapfrog_Em.png b/plots/3bodies_leapfrog_Em.png deleted file mode 100644 index 00bbfb8..0000000 Binary files a/plots/3bodies_leapfrog_Em.png and /dev/null differ diff --git a/plots/3bodies_leapfrog_L2.png b/plots/3bodies_leapfrog_L2.png deleted file mode 100644 index b649b4a..0000000 Binary files a/plots/3bodies_leapfrog_L2.png and /dev/null differ diff --git a/plots/3bodies_leapfrog_dEm.png b/plots/3bodies_leapfrog_dEm.png new file mode 100644 index 0000000..8a46925 Binary files /dev/null and b/plots/3bodies_leapfrog_dEm.png differ diff --git a/plots/3bodies_leapfrog_dL2.png b/plots/3bodies_leapfrog_dL2.png new file mode 100644 index 0000000..b9f1b77 Binary files /dev/null and b/plots/3bodies_leapfrog_dL2.png differ diff --git a/plots/3bodies_leapfrog_dynsyst.gif b/plots/3bodies_leapfrog_dynsyst.gif index 7d6ab1e..fde4db1 100644 Binary files a/plots/3bodies_leapfrog_dynsyst.gif and b/plots/3bodies_leapfrog_dynsyst.gif differ