diff --git a/lib/objects.py b/lib/objects.py index 42fdff7..a919b5a 100755 --- a/lib/objects.py +++ b/lib/objects.py @@ -85,37 +85,3 @@ class System: def __str__(self): # Called upon "str(system)" return str([str(body) for body in self.bodylist]) - - -if __name__ == "__main__": - # initialisation mass - m1 = 10 - m2 = 1 - m3 = 1 - - # initialisation position - q1 = np.array([0, 0, 0]) - q2 = np.array([1, 0, 0]) - q3 = np.array([2, 0, 0]) - - # initialisation velocity - v1 = np.array([0, 0, 0]) - v2 = np.array([1, 1, 0]) - v3 = np.array([2, 0, 0]) - - - star1 = Body(m1,q1,v1) - star2 = Body(m2,q2,v2) - star3 = Body(m3,q3,v3) - - Lbodylist = [star1,star2] - - array = np.zeros((len(Lbodylist),3)) - array[0]=star3.q - - - tribody = System([star1,star2,star3]) - - print("list=",Lbodylist) - - print(tribody.Lval(Lbodylist)) diff --git a/main.py b/main.py index f3820aa..8236eab 100755 --- a/main.py +++ b/main.py @@ -27,7 +27,7 @@ def main(): v = np.array([v1, v2, v3]) bodylist = [] - for i in range(2): # For a system of 2 objects + for i in range(m.shape[0]): bodylist.append(Body(m[i], q[i], v[i])) dyn_syst = System(bodylist) dyn_syst.COMShift() diff --git a/plots/Em.png b/plots/Em.png index 28a7d13..db9d12a 100644 Binary files a/plots/Em.png and b/plots/Em.png differ diff --git a/plots/L2.png b/plots/L2.png index 78e061f..347d221 100644 Binary files a/plots/L2.png and b/plots/L2.png differ