Added sorting of real crater list

MintonGroup · Apr 5, 2021 · 8db3811 · 8db3811
1 parent 354734b
commit 8db3811
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/examples/global-lunar-bombardment/craterlist.in b/examples/global-lunar-bombardment/craterlist.in
@@ -1,3 +1,4 @@
 #  imp   vel   ang   xoff  yoff  t_Ga
-90856.5  15.0e3   90.0  -5.17529e5  1.037286e6  0.4
-18095.0  15.0e3   90.0  -9.38629e5  1.3466084e6 0.2
+90856.5  15.0e3   90.0  -5.17529e5  1.037286e6  0.02
+18095.0  15.0e3   90.0  -9.38629e5  1.3466084e6 0.03
+32432.1  15.0e3   90.0  -2.19298e5  1.24e6      0.025
diff --git a/examples/global-lunar-bombardment/ctem_driver.py b/examples/global-lunar-bombardment/ctem_driver.py
@@ -81,6 +81,7 @@
     craterlistfile = parameters['workingdir'] + parameters['realcraterlist']
     rclist = ctem_io_readers.read_formatted_ascii(craterlistfile, skip_lines = 0)
     rclist[:,5] = (parameters['interval'] * parameters['numintervals']) - craterproduction.Tscale(rclist[:,5], 'NPF_Moon')
+    rclist = rclist[rclist[:,5].argsort()]
     ctem_io_writers.write_realcraters(parameters, rclist)
 
 #Create impactor production population

diff --git a/src/crater/crater_populate.f90 b/src/crater/crater_populate.f90
@@ -144,7 +144,7 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt
       !if in quasiMC mode: check to see if it's time for a real crater
       if (user%doquasimc) then
          if (crater%timestamp > user%rctime) then
-            write(*,*) "Real crater at time ", rclist(6, rccount)
+            write(*,*) "Real crater at time ", crater%timestamp
             user%testflag = .true.
             user%testimp = rclist(1, rccount)
             user%testvel = rclist(2, rccount)