Tibeuleu/KozaiLidov
1
0
Fork 0
Code Activity

Merge remote-tracking branch 'origin/main' into main

Browse Source 
# Conflicts:
#	lib/objects.py
#	main.py
This commit is contained in:
Alex_Hubert
2022-01-07 18:47:02 +01:00
parent 6a3ae9b527 4387a8bf15
commit 7a915919a8
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/LeapFrog.py
View File

@@ -67,7 +67,7 @@ def leapfrog(dyn_syst, bin_syst, duration, dt, recover_param=False, display=Fals
d.on_running(dyn_syst, step=step, label="{0:.2f} years".format(j*dt/yr)) d.on_running(dyn_syst, step=step, label="{0:.2f} years".format(j*dt/yr))
if display: if display:
d.close() d.close()
if not savename is None: if gif:
system("convert -delay 5 -loop 0 tmp/??????.png tmp/temp.gif && rm tmp/??????.png") system("convert -delay 5 -loop 0 tmp/??????.png tmp/temp.gif && rm tmp/??????.png")
system("convert tmp/temp.gif -fuzz 10% -layers Optimize plots/{0:s}_dynsyst.gif".format(savename)) system("convert tmp/temp.gif -fuzz 10% -layers Optimize plots/{0:s}_dynsyst.gif".format(savename))

2
lib/hermite.py
View File

@@ -114,7 +114,7 @@ def hermite(dyn_syst, bin_syst, duration, dt, recover_param=False, display=False
d.on_running(dyn_syst, step=step, label="{0:.2f} years".format(j*dt/yr)) d.on_running(dyn_syst, step=step, label="{0:.2f} years".format(j*dt/yr))
if display: if display:
d.close() d.close()
if not savename is None: if gif:
system("convert -delay 5 -loop 0 tmp/??????.png tmp/temp.gif && rm tmp/??????.png") system("convert -delay 5 -loop 0 tmp/??????.png tmp/temp.gif && rm tmp/??????.png")
system("convert tmp/temp.gif -fuzz 10% -layers Optimize plots/{0:s}_dynsyst.gif".format(savename)) system("convert tmp/temp.gif -fuzz 10% -layers Optimize plots/{0:s}_dynsyst.gif".format(savename))

2
main_concurrent.py
View File

@@ -29,7 +29,7 @@ def main():
v = np.array([v1, v2, v3],dtype=np.longdouble) v = np.array([v1, v2, v3],dtype=np.longdouble)
#integration parameters #integration parameters
duration, step = 5000.*yr, np.array([10./(365.25)],dtype=np.longdouble)*yr #integration time and step in seconds duration, step = 100.*yr, np.array([1./(365.25)],dtype=np.longdouble)*yr #integration time and step in seconds
step = np.sort(step)[::-1] step = np.sort(step)[::-1]
integrator = "leapfrog" integrator = "leapfrog"
n_bodies = 3 n_bodies = 3