More tweaks. Cut down on the simulation time so there is less dead sp…

…ace in the movies

examples/Fragmentation/Fragmentation_Movie.py

@@ -39,6 +39,7 @@
 available_movie_styles = ["disruption_headon", "disruption_off_axis", "supercatastrophic_headon", "supercatastrophic_off_axis","hitandrun_disrupt", "hitandrun_pure"]
 movie_title_list = ["Head-on Disruption", "Off-axis Disruption", "Head-on Supercatastrophic", "Off-axis Supercatastrophic", "Hit and Run w/ Runner Disruption", "Pure Hit and Run"]
 movie_titles = dict(zip(available_movie_styles, movie_title_list))
+num_movie_frames = 1200
 
 # These initial conditions were generated by trial and error
 names = ["Target","Projectile"]
@@ -127,7 +128,7 @@ def encounter_combiner(sim):
     ds = xr.combine_nested([data,enc],concat_dim='time').sortby("time").interpolate_na(dim="time")
 
     # Interpolate in time to make a smooth, constant time step dataset 
-    smooth_time =  np.linspace(start=tgood.isel(time=0), stop=ds.time[-1], num=2400)
+    smooth_time = np.linspace(start=tgood.isel(time=0), stop=ds.time[-1], num=num_movie_frames)
     ds = ds.interp(time=smooth_time)
 
     return ds
@@ -236,7 +237,7 @@ def data_stream(self, frame=0):
         minimum_fragment_gmass = 0.2 * body_Gmass[style][1] # Make the minimum fragment mass a fraction of the smallest body
         gmtiny = 0.99 * body_Gmass[style][1] # Make GMTINY just smaller than the smallest original body. This will prevent runaway collisional cascades
         sim.set_parameter(collision_model="fraggle", encounter_save="both", gmtiny=gmtiny, minimum_fragment_gmass=minimum_fragment_gmass, verbose=False)
-        sim.run(dt=1e-3, tstop=1.0e-3, istep_out=1, dump_cadence=0)
+        sim.run(dt=5e-4, tstop=5.0e-4, istep_out=1, dump_cadence=0)
 
         print("Generating animation")
         anim = AnimatedScatter(sim,movie_filename,movie_titles[style],style,nskip=1)

src/fraggle/fraggle_generate.f90

@@ -247,7 +247,9 @@ module subroutine fraggle_generate_pos_vec(collider)
       integer(I4B) :: i, j, loop
       logical :: lcat, lhitandrun
       integer(I4B), parameter :: MAXLOOP = 20000
-      real(DP), parameter :: rdistance_scale_factor = 0.01_DP ! Scale factor to apply to distance scaling in the event of overlap
+      real(DP), parameter :: rdistance_scale_factor = 0.05_DP ! Scale factor to apply to distance scaling of cloud centers in the event of overlap
+                                                              ! The distance is chosen to be close to the original locations of the impactors
+                                                              ! but far enough apart to prevent a collisional cascade between fragments 
 
       associate(fragments => collider%fragments, impactors => collider%impactors, nfrag => collider%fragments%nbody)
          lcat = (impactors%regime == COLLRESOLVE_REGIME_SUPERCATASTROPHIC)