diff --git a/main.py b/main.py index b205110..fdf199e 100755 --- a/main.py +++ b/main.py @@ -22,19 +22,19 @@ def main(): x3 = np.array([np.cos(psi[2]), 0., np.sin(psi[2])])*a[2] q = np.array([x1, x2, x3]) - v1 = np.array([0., -1./3*np.sqrt(G*(m[0]+m[1])*a[0]*(1-e[0]**2)*(1+e[0])**2/np.sum(q[0]**2)), 0.]) - v2 = np.array([0., 1./3*np.sqrt(G*(m[0]+m[1])*a[1]*(1-e[1]**2)*(1+e[1])**2/np.sum(q[1]**2)), 0.]) - v3 = np.array([0., np.sqrt(G*(m[0]+m[1])*(2./np.sqrt(np.sum(x3**2))-1./a[2])), 0.]) + v1 = np.array([0., -np.sqrt(G*m[1]**2/((m[0]+m[1])*np.sqrt(np.sum((q[0]-q[1])**2)))), 0.]) + v2 = np.array([0., np.sqrt(G*m[0]**2/((m[0]+m[1])*np.sqrt(np.sum((q[0]-q[1])**2)))), 0.]) + v3 = np.array([0., np.sqrt(G*(m[0]+m[1])*(2./np.sqrt(np.sum(q[2]**2))-1./a[2])), 0.]) v = np.array([v1, v2, v3]) bodylist = [] - for i in range(3): + for i in range(2): bodylist.append(Body(m[i], q[i], v[i])) dyn_syst = System(bodylist) dyn_syst.COMShift() - duration, step = 10*3e7, 5e5 - E, L = frogleap(duration, step, dyn_syst, recover_param=True, display=True) + duration, step = 100*3e7, 1e5 + E, L = frogleap(duration, step, dyn_syst, recover_param=True)#, display=True) fig1 = plt.figure(figsize=(30,15)) ax1 = fig1.add_subplot(111) diff --git a/plots/2bodies_Em.png b/plots/2bodies_Em.png new file mode 100644 index 0000000..2510e2d Binary files /dev/null and b/plots/2bodies_Em.png differ diff --git a/plots/2bodies_L2.png b/plots/2bodies_L2.png new file mode 100644 index 0000000..d2bd65a Binary files /dev/null and b/plots/2bodies_L2.png differ diff --git a/plots/2bodies_dynsyst.gif b/plots/2bodies_dynsyst.gif new file mode 100644 index 0000000..4ecbc15 Binary files /dev/null and b/plots/2bodies_dynsyst.gif differ diff --git a/plots/3bodies_Em.png b/plots/3bodies_Em.png new file mode 100644 index 0000000..453b1ae Binary files /dev/null and b/plots/3bodies_Em.png differ diff --git a/plots/3bodies_L2.png b/plots/3bodies_L2.png new file mode 100644 index 0000000..6cbdd92 Binary files /dev/null and b/plots/3bodies_L2.png differ diff --git a/plots/Em.png b/plots/Em.png deleted file mode 100644 index 9461630..0000000 Binary files a/plots/Em.png and /dev/null differ diff --git a/plots/L2.png b/plots/L2.png deleted file mode 100644 index f2ea86e..0000000 Binary files a/plots/L2.png and /dev/null differ diff --git a/plots/dynsyst.gif b/plots/dynsyst.gif deleted file mode 100644 index 93093df..0000000 Binary files a/plots/dynsyst.gif and /dev/null differ