Merge branch 'debug'

MintonGroup · Aug 20, 2021 · a2e0f4e · a2e0f4e
2 parents cd9221a + b1f15a5
commit a2e0f4e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/examples/symba_chambers_2013/aescattermovie.py b/examples/symba_chambers_2013/aescattermovie.py
@@ -31,7 +31,6 @@ def __init__(self, ds, param):
                       'Hit and run fragment' : 'xkcd:baby poop green'}
 
         # Setup the figure and axes...
-        #self.stream = self.data_stream(0)
         fig = plt.figure(figsize=(8,4.5), dpi=300)
         plt.tight_layout(pad=0)
         # set up the figure

diff --git a/examples/symba_chambers_2013/param.in b/examples/symba_chambers_2013/param.in
@@ -8,8 +8,8 @@ CB_IN          sun_MsunAUYR.in
 PL_IN          pl_chambers_2013.in
 TP_IN          tp.in
 IN_TYPE        ASCII
-ISTEP_OUT      625              ! output cadence 
-ISTEP_DUMP     625             ! system dump cadence
+ISTEP_OUT      6250              ! output cadence 
+ISTEP_DUMP     6250            ! system dump cadence
 BIN_OUT        bin.dat
 PARTICLE_OUT   particle.dat
 OUT_TYPE       REAL8              ! double precision real output

diff --git a/examples/symba_clement_2018/aescattermovie.py b/examples/symba_clement_2018/aescattermovie.py
@@ -31,7 +31,6 @@ def __init__(self, ds, param):
                       'Hit and run fragment' : 'xkcd:baby poop green'}
 
         # Setup the figure and axes...
-        #self.stream = self.data_stream(0)
         fig = plt.figure(figsize=(8,4.5), dpi=300)
         plt.tight_layout(pad=0)
         # set up the figure

diff --git a/examples/symba_clement_2018/param.in b/examples/symba_clement_2018/param.in
@@ -19,15 +19,14 @@ CHK_CLOSE      yes                ! check for planetary close encounters
 CHK_RMAX       100000.0            ! discard outside of
 EXTRA_FORCE    no                 ! no extra user-defined forces
 BIG_DISCARD    no                 ! output all planets if anything discarded
-DISCARD_OUT    discard.out
 RHILL_PRESENT  yes                ! Hill's sphere radii in input file
 MU2KG          1.98847e30         ! (M_sun-> kg)
 DU2M           1.495979e11        ! distance unit to meters (AU --> m)
 TU2S           3.15569259747e7    ! time unit to seconds (years --> seconds)
 GMTINY         1e-10		  
 ENERGY         yes
-ENERGY_OUT     energy.dat
-ENERGY_OUT     energy.dat
 ROTATION       yes
 FRAGMENTATION  yes
+DISCARD_OUT    discard.out
 SEED           8 12261555 871132 92734722 21132443 36344777 4334443 219291656 3848566
+ENERGY_OUT     energy.out
diff --git a/examples/symba_mars_disk/aescattermovie.py b/examples/symba_mars_disk/aescattermovie.py
@@ -5,12 +5,14 @@
 from matplotlib import animation
 import matplotlib.colors as mcolors
 
-radscale = 50
+titletext = "High M - High e"
+radscale = 1000
 RMars = 3389500.0
 xmin = 1.0
 xmax = 10.0
 ymin = 1e-6
 ymax = 1.0
+framejump = 1
 
 class AnimatedScatter(object):
     """An animated scatter plot using matplotlib.animations.FuncAnimation."""
@@ -28,7 +30,6 @@ def __init__(self, ds, param):
                       'Supercatastrophic' : 'xkcd:shocking pink',
                       'Hit and run fragment' : 'xkcd:baby poop green'}
 
-        self.stream = self.data_stream(frame)
         # Setup the figure and axes...
         fig = plt.figure(figsize=(8,4.5), dpi=300)
         plt.tight_layout(pad=0)
@@ -63,7 +64,7 @@ def setup_plot(self):
         self.title = self.ax.text(0.50, 1.05, "", bbox={'facecolor': 'w', 'alpha': 0.5, 'pad': 5}, transform=self.ax.transAxes,
                         ha="center")
 
-        self.title.set_text(f'Time = ${t / 24 / 3600:4.1f}$ days with ${npl:f}$ particles')
+        self.title.set_text(f"{titletext} - Time = ${t / 24 / 3600:4.1f}$ days with ${npl:f}$ particles")
         slist = self.scatters(pl, radmarker, origin)
         self.s0 = slist[0]
         self.s1 = slist[1]
@@ -92,9 +93,9 @@ def data_stream(self, frame=0):
 
     def update(self,frame):
         """Update the scatter plot."""
-        t, name, GMass, Radius, npl, pl, radmarker, origin = next(self.data_stream(frame))
+        t, name, GMass, Radius, npl, pl, radmarker, origin = next(self.data_stream(framejump * frame))
 
-        self.title.set_text(f'Time = ${t / 24 / 3600:4.1f}$ days with ${npl:4.0f}$ particles')
+        self.title.set_text(f"{titletext} - Time = ${t / 24 / 3600:4.1f}$ days with ${npl:4.0f}$ particles")
 
         # We need to return the updated artist for FuncAnimation to draw..
         # Note that it expects a sequence of artists, thus the trailing comma.

diff --git a/examples/symba_mars_disk/param.in b/examples/symba_mars_disk/param.in
@@ -1,13 +1,13 @@
 !Parameter file for the SyMBA-RINGMOONS test
 T0             0.0 
-TSTOP          6000000.0 
+TSTOP          100000000.0 
 DT             600.0
 CB_IN          cb.in
 PL_IN          mars.in
 TP_IN          tp.in
 IN_TYPE        ASCII
-ISTEP_OUT      1
-ISTEP_DUMP     1
+ISTEP_OUT      100
+ISTEP_DUMP     100
 BIN_OUT        bin.dat
 PARTICLE_OUT   particle.dat
 OUT_TYPE       REAL8
@@ -32,3 +32,4 @@ DU2M           1.0
 TU2S           1.0
 SEED           2 3080983 2220830
 DISCARD_OUT    discard.out
+ENERGY_OUT     energy.out