minor modification + system clas update comshift
This commit is contained in:
@@ -32,9 +32,6 @@ def LP(dyn_syst, dt):
|
||||
Kick(dyn_syst, dt)
|
||||
Drift(dyn_syst, dt / 2)
|
||||
dyn_syst.time = dyn_syst.time + dt
|
||||
for body in dyn_syst.bodylist:
|
||||
body.p = body.v * body.m
|
||||
|
||||
|
||||
def leapfrog(dyn_syst, bin_syst, duration, dt, recover_param=False, display=False, savename=None):
|
||||
if display:
|
||||
|
||||
@@ -77,8 +77,6 @@ def HPC(dyn_syst, dt): # update position and velocities of bodies in system wit
|
||||
Update_jp(dyn_syst)
|
||||
Correct(dyn_syst, dt)
|
||||
dyn_syst.time = dyn_syst.time + dt
|
||||
for body in dyn_syst.bodylist:
|
||||
body.p = body.v * body.m
|
||||
|
||||
|
||||
def hermite(dyn_syst, duration, dt, recover_param=False, display=False, savename=None):
|
||||
|
||||
@@ -14,7 +14,6 @@ class Body:
|
||||
self.m = mass
|
||||
self.q = position
|
||||
self.v = velocity
|
||||
self.p = velocity * mass
|
||||
self.a = np.zeros(3)
|
||||
self.ap = np.zeros(3)
|
||||
self.j = np.zeros(3)
|
||||
@@ -28,6 +27,10 @@ class Body:
|
||||
def __str__(self): # Called upon "str(body)"
|
||||
return r"Body of mass: {0:.1e} $M_\odot$".format(self.m/Ms)
|
||||
|
||||
@property
|
||||
def p(self):
|
||||
return self.v*self.m
|
||||
|
||||
class System(Body):
|
||||
|
||||
def __init__(self, bodylist, main = False, blackstyle=True):
|
||||
@@ -121,7 +124,6 @@ class System(Body):
|
||||
|
||||
@property
|
||||
def mu(self):
|
||||
sum = 0
|
||||
prod = 1
|
||||
for body in self.bodylist:
|
||||
prod = prod * body.m
|
||||
|
||||
Reference in New Issue
Block a user