diff --git a/lib/LeapFrog.py b/lib/LeapFrog.py index 43e943e..3d882f3 100644 --- a/lib/LeapFrog.py +++ b/lib/LeapFrog.py @@ -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)) if display: 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 tmp/temp.gif -fuzz 10% -layers Optimize plots/{0:s}_dynsyst.gif".format(savename)) diff --git a/lib/hermite.py b/lib/hermite.py index 8d1cfdd..4ae1aa5 100644 --- a/lib/hermite.py +++ b/lib/hermite.py @@ -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)) if display: 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 tmp/temp.gif -fuzz 10% -layers Optimize plots/{0:s}_dynsyst.gif".format(savename)) diff --git a/main_concurrent.py b/main_concurrent.py index 94e8f14..ec93d96 100755 --- a/main_concurrent.py +++ b/main_concurrent.py @@ -29,7 +29,7 @@ def main(): v = np.array([v1, v2, v3],dtype=np.longdouble) #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] integrator = "leapfrog" n_bodies = 3