From beb09a385272df52b08d5717c6d08a1e2d958edd Mon Sep 17 00:00:00 2001 From: Austin Blevins Date: Mon, 19 Apr 2021 18:42:22 -0400 Subject: [PATCH] Quasi-MC craters are emplaced at the given lat and long independent of pixel size. --- examples/global-lunar-bombardment/craterlist.in | 16 +++------------- examples/global-lunar-bombardment/ctem_driver.py | 4 ++-- src/crater/crater_populate.f90 | 2 +- 3 files changed, 6 insertions(+), 16 deletions(-) diff --git a/examples/global-lunar-bombardment/craterlist.in b/examples/global-lunar-bombardment/craterlist.in index 04a821cf..7e7529d7 100644 --- a/examples/global-lunar-bombardment/craterlist.in +++ b/examples/global-lunar-bombardment/craterlist.in @@ -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 \ No newline at end of file +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 \ No newline at end of file diff --git a/examples/global-lunar-bombardment/ctem_driver.py b/examples/global-lunar-bombardment/ctem_driver.py index ea3e738a..ab995412 100644 --- a/examples/global-lunar-bombardment/ctem_driver.py +++ b/examples/global-lunar-bombardment/ctem_driver.py @@ -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: @@ -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') diff --git a/src/crater/crater_populate.f90 b/src/crater/crater_populate.f90 index bec41e7f..ab8e9540 100644 --- 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 ", crater%timestamp + write(*,*) "Real crater at ", crater%timestamp user%testflag = .true. user%testimp = rclist(1, rccount) user%testvel = rclist(2, rccount)