Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Quasi-MC craters are emplaced at the given lat and long independent of pixel size.
  • Loading branch information
Austin Blevins committed Apr 19, 2021
1 parent d0b981b commit beb09a3
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
16 changes: 3 additions & 13 deletions examples/global-lunar-bombardment/craterlist.in
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
# Dcrat(m) vel(m/s) ang(deg) lat(lunar_deg) yoff(lunar_deg) t(Ga)
900000 18.3e3 45.0 0.0 0.0 0.09
400000 18.3e3 45.0 30.0 -30.0 0.02
400000 18.3e3 45.0 -30.0 30.0 0.045
400000 18.3e3 45.0 30.0 30.0 0.04
400000 18.3e3 45.0 -30.0 -30.0 0.035
400000 18.3e3 45.0 60.0 0.0 0.03
400000 18.3e3 45.0 0.0 -20.0 0.01
500000 18.3e3 45.0 90.0 50.0 0.05
800000 18.3e3 45.0 -90.0 -115.0 0.08
600000 18.3e3 45.0 65.0 180.0 0.06
300000 18.3e3 45.0 -40.0 -180.0 0.01
700000 18.3e3 45.0 20.0 -310.0 0.07
500000 18.3e3 45.0 -70.0 350.0 0.056
2400000 18.3e3 45.0 -53.0 191.0 0.0431
1321000 18.3e3 45.0 37.0 341.5 0.0387
252000 18.3e3 45.0 44.8 328.4 0.0365
4 changes: 2 additions & 2 deletions examples/global-lunar-bombardment/ctem_driver.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
print("non-physical latitude on line %i of craterlist.in. Please enter a value between -90 and 90 degrees." %(lat+1))
quit()
else:
rclist[lat,3] = rclist[lat,3] * 3.42222222e4 #this calculation assumes the area being modeled is equal to the surface area of the Moon
rclist[lat,3] = rclist[lat,3] * ((parameters['pix'] * (parameters['gridsize']/2)) / 90.0)

for lon in range(0, len(rclist[:,4])):
if numpy.abs(rclist[lon,4]) > 360.0:
Expand All @@ -113,7 +113,7 @@
else:
rclist[lon,4] = rclist[lon,4]

rclist[:,4] = rclist[:,4] * 1.71111111e4 #this calculation assumes the area being modeled is equal to the surface area of the Moon
rclist[:,4] = rclist[:,4] * ((parameters['pix'] * (parameters['gridsize']/2)) / 180.0)

#Convert age in Ga to "interval time"
rclist[:,5] = (parameters['interval'] * parameters['numintervals']) - craterproduction.Tscale(rclist[:,5], 'NPF_Moon')
Expand Down
2 changes: 1 addition & 1 deletion src/crater/crater_populate.f90
Original file line number Diff line number Diff line change
Expand Up @@ -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 ", crater%timestamp
write(*,*) "Real crater at ", crater%timestamp
user%testflag = .true.
user%testimp = rclist(1, rccount)
user%testvel = rclist(2, rccount)
Expand Down

0 comments on commit beb09a3

Please sign in to comment.