From a0503df7afcb71cf10fac33de3fb0840f61bc0e6 Mon Sep 17 00:00:00 2001 From: Austin Blevins Date: Fri, 14 Jan 2022 17:12:16 -0500 Subject: [PATCH 1/3] testing: revert quasimc from requiring degrees back to xy --- examples/global-lunar-bombardment/basins.in | 74 +++++++++ .../global-lunar-bombardment/craterlist.in | 148 +++++++++--------- .../global-lunar-bombardment/ctem_driver.py | 22 --- 3 files changed, 148 insertions(+), 96 deletions(-) create mode 100644 examples/global-lunar-bombardment/basins.in diff --git a/examples/global-lunar-bombardment/basins.in b/examples/global-lunar-bombardment/basins.in new file mode 100644 index 00000000..88f9479e --- /dev/null +++ b/examples/global-lunar-bombardment/basins.in @@ -0,0 +1,74 @@ +#Dcrat(m) vel(m/s) ang(deg) xoffset(km) yoffset(km) t(Ga) +2050000 18300.0 45.0 -2908888.89 -1848000.0 4.31 +690000 18300.0 45.0 889777.778 -157422.222 4.309 +264656 18300.0 45.0 1186318.17 -534322.694 4.308 +326000 18300.0 45.0 8555.55556 27377.7778 4.307 +330000 18300.0 45.0 -152288.889 386711.111 4.306 +260000 18300.0 45.0 -311422.222 246400.0 4.305 +410000 18300.0 45.0 53044.4444 485955.556 4.304 +374000 18300.0 45.0 -2429777.78 1351777.78 4.303 +880000 18300.0 45.0 1642666.67 -1214888.89 4.302 +450000 18300.0 45.0 410666.667 -1830888.89 4.301 +835450 18300.0 45.0 -263040.07 -637522.098 4.3 +730000 18300.0 45.0 458577.778 -263511.111 4.295 +308094 18300.0 45.0 -2519567.44 2028565.87 4.29 +319231 18300.0 45.0 2800767.24 -1122736.77 4.28 +220000 18300.0 45.0 2522177.78 -1274777.78 4.27 +378676 18300.0 45.0 2109715.64 -2774575.25 4.263 +290000 18300.0 45.0 -1570800.0 947955.556 4.262 +212469 18300.0 45.0 -1130569.41 -547599.551 4.261 +886977 18300.0 45.0 1482572.48 -62471.4873 4.26 +359054 18300.0 45.0 -2906174.32 859038.234 4.257 +350250 18300.0 45.0 -774571.654 -1897853.22 4.24 +311641 18300.0 45.0 2791733.77 -1961595.46 4.234 +205004 18300.0 45.0 -1854181.15 1376770.88 4.233 +275673 18300.0 45.0 -1856978.34 -962586.498 4.232 +314000 18300.0 45.0 3062888.89 1690577.78 4.231 +393547 18300.0 45.0 -2706368.89 460362.231 4.23 +315767 18300.0 45.0 -2096692.02 1757288.99 4.229 +210000 18300.0 45.0 287466.667 1221733.33 4.228 +255770 18300.0 45.0 2556030.11 -672915.097 4.226 +240785 18300.0 45.0 2111330.34 -673236.652 4.225 +226910 18300.0 45.0 -2035711.33 1441522.25 4.224 +250897 18300.0 45.0 1931105.19 -1077483.55 4.222 +658628 18300.0 45.0 322727.54 924805.964 4.22 +221894 18300.0 45.0 1794255.96 -399012.867 4.216 +245208 18300.0 45.0 3016756.71 -1607613.72 4.213 +211558 18300.0 45.0 -120713.901 -769825.757 4.21 +216511 18300.0 45.0 -90181.5496 -1115976.46 4.205 +333285 18300.0 45.0 -1661485.97 1175981.78 4.2 +220895 18300.0 45.0 -1691872.37 1973120.21 4.195 +210024 18300.0 45.0 -2611928.38 -482937.546 4.19 +233749 18300.0 45.0 3065058.83 -1312407.74 4.186 +199964 18300.0 45.0 -941029.635 -1524104.18 4.183 +265187 18300.0 45.0 1686465.17 1381789.57 4.18 +221563 18300.0 45.0 2615864.61 1555419.06 4.176 +370000 18300.0 45.0 400400.0 164266.667 4.173 +914999 18300.0 45.0 593195.937 -495024.054 4.17 +582285 18300.0 45.0 2994510.92 627952.666 4.141 +233783 18300.0 45.0 -1175349.83 -171471.453 4.14 +475882 18300.0 45.0 -2596129.71 -1234252.24 4.139 +320524 18300.0 45.0 2311567.75 -1964057.8 4.132 +231696 18300.0 45.0 2820529.3 1747190.24 4.131 +635875 18300.0 45.0 -1603265.73 -1714462.72 4.13 +330791 18300.0 45.0 2414988.84 186292.831 4.128 +205592 18300.0 45.0 -2841219.74 -1210629.78 4.12 +417139 18300.0 45.0 -2694487.95 -152049.734 4.11 +218802 18300.0 45.0 2683743.19 -346053.467 4.1 +628680 18300.0 45.0 2545646.5 940690.222 4.094 +401559 18300.0 45.0 2516183.2 894136.07 4.093 +220531 18300.0 45.0 -252682.598 -2008658.54 4.092 +207028 18300.0 45.0 2054901.26 2407038.61 4.091 +407689 18300.0 45.0 -679255.178 -844843.612 4.09 +549393 18300.0 45.0 -2210021.5 69289.6604 4.089 +603126 18300.0 45.0 1402675.35 1958745.73 4.08 +204083 18300.0 45.0 1543412.32 2107205.15 4.076 +252194 18300.0 45.0 1866228.89 -2349248.81 4.074 +299358 18300.0 45.0 -1177173.74 -2299092.71 4.073 +372000 18300.0 45.0 1129333.33 564666.667 4.071 +1091521 18300.0 45.0 1024041.73 580965.114 4.07 +1113841 18300.0 45.0 -297849.189 1145194.64 3.87 +312747 18300.0 45.0 2284910.03 -2562054.13 3.86 +928472 18300.0 45.0 -1617968.16 -675359.22 3.81 +205511 18300.0 45.0 1382863.9 -926935.011 3.7 +233931 18300.0 45.0 -533541.384 1523910.2 3.65 \ No newline at end of file diff --git a/examples/global-lunar-bombardment/craterlist.in b/examples/global-lunar-bombardment/craterlist.in index 86be1cc8..88f9479e 100644 --- a/examples/global-lunar-bombardment/craterlist.in +++ b/examples/global-lunar-bombardment/craterlist.in @@ -1,74 +1,74 @@ -# Dcrat(m) vel(m/s) ang(deg) lat(lunar_deg) long(lunar_deg) t(Ga) -2050000 18.3e3 45.0 -54.0 190.0 4.31 -690000 18.3e3 45.0 -4.6 52.0 4.309 -264656 18.3e3 45.0 -15.61332546 69.3302824 4.308 -326000 18.3e3 45.0 0.8 0.5 4.307 -330000 18.3e3 45.0 11.3 351.1 4.306 -260000 18.3e3 45.0 7.2 341.8 4.305 -410000 18.3e3 45.0 14.2 3.1 4.304 -374000 18.3e3 45.0 39.5 218.0 4.303 -880000 18.3e3 45.0 -35.5 96.0 4.302 -450000 18.3e3 45.0 -53.5 24.0 4.301 -835450 18.3e3 45.0 -18.62889246 344.6275284 4.3 -730000 18.3e3 45.0 -7.7 26.8 4.295 -308094 18.3e3 45.0 59.27627528 212.7525524 4.29 -319231 18.3e3 45.0 -32.80724329 163.6812023 4.28 -220000 18.3e3 45.0 -37.25 147.4 4.27 -378676 18.3e3 45.0 -81.07525086 123.29507 4.263 -290000 18.3e3 45.0 27.7 268.2 4.262 -212469 18.3e3 45.0 -16.00128558 293.9277616 4.261 -886977 18.3e3 45.0 -1.825465537 86.643846 4.26 -359054 18.3e3 45.0 25.10176659 190.1586435 4.257 -350250 18.3e3 45.0 -55.45675 314.7328254 4.24 -311641 18.3e3 45.0 -57.31934795 163.1532724 4.234 -205004 18.3e3 45.0 40.23031791 251.638764 4.233 -275673 18.3e3 45.0 -28.12752755 251.4752918 4.232 -314000 18.3e3 45.0 49.4 179.0 4.231 -393547 18.3e3 45.0 13.45214311 201.8355846 4.23 -315767 18.3e3 45.0 51.34935346 237.4660505 4.229 -210000 18.3e3 45.0 35.7 16.8 4.228 -255770 18.3e3 45.0 -19.66310347 149.3783832 4.226 -240785 18.3e3 45.0 -19.67249958 123.3894353 4.225 -226910 18.3e3 45.0 42.1224033 241.0298572 4.224 -250897 18.3e3 45.0 -31.48490896 112.8567971 4.222 -658628 18.3e3 45.0 27.02355091 18.8607004 4.22 -221894 18.3e3 45.0 -11.6594669 104.8591143 4.216 -245208 18.3e3 45.0 -46.9757255 176.3039635 4.213 -211558 18.3e3 45.0 -22.49490849 352.9452915 4.21 -216511 18.3e3 45.0 -32.60970161 354.7296497 4.205 -333285 18.3e3 45.0 34.36310409 262.9001708 4.2 -220895 18.3e3 45.0 57.65611017 261.1243421 4.195 -210024 18.3e3 45.0 -14.1118114 207.354835 4.19 -233749 18.3e3 45.0 -38.34957695 179.1268146 4.186 -199964 18.3e3 45.0 -44.53551179 305.0047616 4.183 -265187 18.3e3 45.0 40.37696785 98.55965302 4.18 -221563 18.3e3 45.0 45.45055682 152.8752047 4.176 -370000 18.3e3 45.0 4.8 23.4 4.173 -914999 18.3e3 45.0 -14.46498859 34.667295 4.17 -582285 18.3e3 45.0 18.3492662 175.0038852 4.141 -233783 18.3e3 45.0 -5.010529467 291.3107245 4.14 -475882 18.3e3 45.0 -36.06581235 208.2781341 4.139 -320524 18.3e3 45.0 -57.39129925 135.0916217 4.132 -231696 18.3e3 45.0 51.05426018 164.8361278 4.131 -635875 18.3e3 45.0 -50.09793662 266.3026523 4.13 -330791 18.3e3 45.0 5.443621698 141.1357112 4.128 -205592 18.3e3 45.0 -35.37554544 193.9546907 4.12 -417139 18.3e3 45.0 -4.44301171 202.529925 4.11 -218802 18.3e3 45.0 -10.11195196 156.8421346 4.1 -628680 18.3e3 45.0 27.48770128 148.7715485 4.094 -401559 18.3e3 45.0 26.12735269 147.0496675 4.093 -220531 18.3e3 45.0 -58.69456785 -14.7671648 4.092 -207028 18.3e3 45.0 70.33554386 120.0916322 4.091 -407689 18.3e3 45.0 -24.68698867 320.3032688 4.09 -549393 18.3e3 45.0 2.02469787 230.8428995 4.089 -603126 18.3e3 45.0 57.23607662 81.9745336 4.08 -204083 18.3e3 45.0 61.5741765 90.19942127 4.076 -252194 18.3e3 45.0 -68.64688088 109.0653245 4.074 -299358 18.3e3 45.0 -67.18128041 291.2041322 4.073 -372000 18.3e3 45.0 16.5 66 4.071 -1091521 18.3e3 45.0 16.97625333 59.8465947 4.07 -1113841 18.3e3 45.0 33.46347978 342.5932292 3.87 -312747 18.3e3 45.0 -74.8652181 133.5337028 3.86 -928472 18.3e3 45.0 -19.73452267 265.4434194 3.81 -205511 18.3e3 45.0 -27.0857633 80.81672154 3.7 -233931 18.3e3 45.0 44.52984365 328.81901 3.65 \ No newline at end of file +#Dcrat(m) vel(m/s) ang(deg) xoffset(km) yoffset(km) t(Ga) +2050000 18300.0 45.0 -2908888.89 -1848000.0 4.31 +690000 18300.0 45.0 889777.778 -157422.222 4.309 +264656 18300.0 45.0 1186318.17 -534322.694 4.308 +326000 18300.0 45.0 8555.55556 27377.7778 4.307 +330000 18300.0 45.0 -152288.889 386711.111 4.306 +260000 18300.0 45.0 -311422.222 246400.0 4.305 +410000 18300.0 45.0 53044.4444 485955.556 4.304 +374000 18300.0 45.0 -2429777.78 1351777.78 4.303 +880000 18300.0 45.0 1642666.67 -1214888.89 4.302 +450000 18300.0 45.0 410666.667 -1830888.89 4.301 +835450 18300.0 45.0 -263040.07 -637522.098 4.3 +730000 18300.0 45.0 458577.778 -263511.111 4.295 +308094 18300.0 45.0 -2519567.44 2028565.87 4.29 +319231 18300.0 45.0 2800767.24 -1122736.77 4.28 +220000 18300.0 45.0 2522177.78 -1274777.78 4.27 +378676 18300.0 45.0 2109715.64 -2774575.25 4.263 +290000 18300.0 45.0 -1570800.0 947955.556 4.262 +212469 18300.0 45.0 -1130569.41 -547599.551 4.261 +886977 18300.0 45.0 1482572.48 -62471.4873 4.26 +359054 18300.0 45.0 -2906174.32 859038.234 4.257 +350250 18300.0 45.0 -774571.654 -1897853.22 4.24 +311641 18300.0 45.0 2791733.77 -1961595.46 4.234 +205004 18300.0 45.0 -1854181.15 1376770.88 4.233 +275673 18300.0 45.0 -1856978.34 -962586.498 4.232 +314000 18300.0 45.0 3062888.89 1690577.78 4.231 +393547 18300.0 45.0 -2706368.89 460362.231 4.23 +315767 18300.0 45.0 -2096692.02 1757288.99 4.229 +210000 18300.0 45.0 287466.667 1221733.33 4.228 +255770 18300.0 45.0 2556030.11 -672915.097 4.226 +240785 18300.0 45.0 2111330.34 -673236.652 4.225 +226910 18300.0 45.0 -2035711.33 1441522.25 4.224 +250897 18300.0 45.0 1931105.19 -1077483.55 4.222 +658628 18300.0 45.0 322727.54 924805.964 4.22 +221894 18300.0 45.0 1794255.96 -399012.867 4.216 +245208 18300.0 45.0 3016756.71 -1607613.72 4.213 +211558 18300.0 45.0 -120713.901 -769825.757 4.21 +216511 18300.0 45.0 -90181.5496 -1115976.46 4.205 +333285 18300.0 45.0 -1661485.97 1175981.78 4.2 +220895 18300.0 45.0 -1691872.37 1973120.21 4.195 +210024 18300.0 45.0 -2611928.38 -482937.546 4.19 +233749 18300.0 45.0 3065058.83 -1312407.74 4.186 +199964 18300.0 45.0 -941029.635 -1524104.18 4.183 +265187 18300.0 45.0 1686465.17 1381789.57 4.18 +221563 18300.0 45.0 2615864.61 1555419.06 4.176 +370000 18300.0 45.0 400400.0 164266.667 4.173 +914999 18300.0 45.0 593195.937 -495024.054 4.17 +582285 18300.0 45.0 2994510.92 627952.666 4.141 +233783 18300.0 45.0 -1175349.83 -171471.453 4.14 +475882 18300.0 45.0 -2596129.71 -1234252.24 4.139 +320524 18300.0 45.0 2311567.75 -1964057.8 4.132 +231696 18300.0 45.0 2820529.3 1747190.24 4.131 +635875 18300.0 45.0 -1603265.73 -1714462.72 4.13 +330791 18300.0 45.0 2414988.84 186292.831 4.128 +205592 18300.0 45.0 -2841219.74 -1210629.78 4.12 +417139 18300.0 45.0 -2694487.95 -152049.734 4.11 +218802 18300.0 45.0 2683743.19 -346053.467 4.1 +628680 18300.0 45.0 2545646.5 940690.222 4.094 +401559 18300.0 45.0 2516183.2 894136.07 4.093 +220531 18300.0 45.0 -252682.598 -2008658.54 4.092 +207028 18300.0 45.0 2054901.26 2407038.61 4.091 +407689 18300.0 45.0 -679255.178 -844843.612 4.09 +549393 18300.0 45.0 -2210021.5 69289.6604 4.089 +603126 18300.0 45.0 1402675.35 1958745.73 4.08 +204083 18300.0 45.0 1543412.32 2107205.15 4.076 +252194 18300.0 45.0 1866228.89 -2349248.81 4.074 +299358 18300.0 45.0 -1177173.74 -2299092.71 4.073 +372000 18300.0 45.0 1129333.33 564666.667 4.071 +1091521 18300.0 45.0 1024041.73 580965.114 4.07 +1113841 18300.0 45.0 -297849.189 1145194.64 3.87 +312747 18300.0 45.0 2284910.03 -2562054.13 3.86 +928472 18300.0 45.0 -1617968.16 -675359.22 3.81 +205511 18300.0 45.0 1382863.9 -926935.011 3.7 +233931 18300.0 45.0 -533541.384 1523910.2 3.65 \ 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 897be89e..7665387e 100755 --- a/examples/global-lunar-bombardment/ctem_driver.py +++ b/examples/global-lunar-bombardment/ctem_driver.py @@ -92,29 +92,7 @@ ynew = df['log(Di)'].values interp = interp1d(xnew, ynew, fill_value='extrapolate') rclist[:,0] = numpy.exp(interp(numpy.log(rclist[:,0]))) - - #Convert latitude and longitude to y- and x-offset - for lat in range(0, len(rclist[:,3])): - if numpy.abs(rclist[lat,3]) > 90.0: - 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] * ((parameters['pix'] * (parameters['gridsize']/2)) / 90.0) - for lon in range(0, len(rclist[:,4])): - if numpy.abs(rclist[lon,4]) > 360.0: - print("Non-physical longitude on line %i of craterlist.in. Please enter a value between -360 and 360 degrees." %(lon+1)) - quit() - else: - if rclist[lon,4] < -180.0: - rclist[lon,4] = 360.0 - numpy.abs(rclist[lon,4]) - elif rclist[lon,4] > 180.0: - rclist[lon,4] = -(360.0 - rclist[lon,4]) - else: - rclist[lon,4] = rclist[lon,4] - - 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') rclist = rclist[rclist[:,5].argsort()] From 66816b75d5e3e7b67140ec913296ea773e2ed759 Mon Sep 17 00:00:00 2001 From: Austin Blevins Date: Wed, 19 Jan 2022 12:06:23 -0500 Subject: [PATCH 2/3] fixed order craterlist.in is read in crater_populate --- examples/global-lunar-bombardment/craterlist.in | 2 +- src/crater/crater_populate.f90 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/global-lunar-bombardment/craterlist.in b/examples/global-lunar-bombardment/craterlist.in index 88f9479e..bf096d1d 100644 --- a/examples/global-lunar-bombardment/craterlist.in +++ b/examples/global-lunar-bombardment/craterlist.in @@ -1,4 +1,4 @@ -#Dcrat(m) vel(m/s) ang(deg) xoffset(km) yoffset(km) t(Ga) +#Dcrat(m) vel(m/s) ang(deg) xoffset(m) yoffset(m) t(Ga) 2050000 18300.0 45.0 -2908888.89 -1848000.0 4.31 690000 18300.0 45.0 889777.778 -157422.222 4.309 264656 18300.0 45.0 1186318.17 -534322.694 4.308 diff --git a/src/crater/crater_populate.f90 b/src/crater/crater_populate.f90 index d9985848..a0530cc0 100644 --- a/src/crater/crater_populate.f90 +++ b/src/crater/crater_populate.f90 @@ -163,8 +163,8 @@ subroutine crater_populate(user,surf,crater,domain,prod,production_list,vdist,nt user%testimp = rclist(1, rccount) user%testvel = rclist(2, rccount) user%testang = rclist(3, rccount) - user%testxoffset = rclist(5, rccount) !x-offset is longitude - user%testyoffset = rclist(4, rccount) !y-offset is latitude + user%testxoffset = rclist(4, rccount) + user%testyoffset = rclist(5, rccount) end if end if ! generate random crater From 338cd230ebd7b672783f7f4014082bb7a30929fa Mon Sep 17 00:00:00 2001 From: David A Minton Date: Thu, 27 Jan 2022 17:03:09 -0500 Subject: [PATCH 3/3] Fixed bug in ejecta_table_define that was causing the root finding algorithm to fail to determine the ejection radious of the first element of the ejecta table --- src/ejecta/ejecta_table_define.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ejecta/ejecta_table_define.f90 b/src/ejecta/ejecta_table_define.f90 index 2e5c2d2e..6a400d34 100644 --- a/src/ejecta/ejecta_table_define.f90 +++ b/src/ejecta/ejecta_table_define.f90 @@ -48,7 +48,7 @@ subroutine ejecta_table_define(user,crater,domain,ejb,ejtble,melt) ! We go out a factor of 3 to get the discontinuous ejecta thickness domain%ejbres = (log(crater%ejdis) - log(crater%ejrad)) / EJBTABSIZE lrad = crater%ejrad - erad = crater%ejrad / 2 + erad = crater%rad ejtble = EJBTABSIZE firstrun = .true. thick = 0._DP