diff --git a/examples/global-lunar-bombardment/craterlist.in b/examples/global-lunar-bombardment/craterlist.in index 7c342404..a8302f68 100644 --- a/examples/global-lunar-bombardment/craterlist.in +++ b/examples/global-lunar-bombardment/craterlist.in @@ -1,33 +1,74 @@ # Dcrat(m) vel(m/s) ang(deg) lat(lunar_deg) yoff(lunar_deg) t(Ga) -2400000 18.3e3 45.0 -53.0 191.0 4.31 -690000 18.3e3 45.0 -21.3 343.4 4.309 -334000 18.3e3 45.0 58.9 213.4 4.29 -342000 18.3e3 45.0 -32.8 163.8 4.28 -378000 18.3e3 45.0 -81.0 123.0 4.258 -430000 18.3e3 45.0 -16.0 293.0 4.259 -878000 18.3e3 45.0 -2.5 86.9 4.26 -600000 18.3e3 45.0 25.1 190.6 4.257 -361000 18.3e3 45.0 -55.7 314.8 4.24 -452000 18.3e3 45.0 13.4 201.8 4.23 -672000 18.3e3 45.0 51.2 237.5 4.231 -312000 18.3e3 45.0 -57.3 163.1 4.229 -923000 18.3e3 45.0 25.4 18.8 4.22 -351000 18.3e3 45.0 34.2 263.0 4.20 -885000 18.3e3 45.0 -15.6 35.1 4.17 -460000 18.3e3 45.0 -5.0 291.3 4.141 -582000 18.3e3 45.0 18.35 175.2 4.14 -492000 18.3e3 45.0 -36.1 208.3 4.139 -331000 18.3e3 45.0 5.5 141.1 4.128 -321000 18.3e3 45.0 -57.4 135.1 4.129 -650000 18.3e3 45.0 -49.8 265.4 4.13 -417000 18.3e3 45.0 -4.4 202.2 4.11 -816000 18.3e3 45.0 -23.8 320.8 4.091 -582000 18.3e3 45.0 2.0 231.0 4.092 -640000 18.3e3 45.0 27.3 148.8 4.09 -421000 18.3e3 45.0 26.1 147.0 4.089 -618000 18.3e3 45.0 57.26 82.0 4.08 -1076000 18.3e3 45.0 16.8 58.4 4.07 -1321000 18.3e3 45.0 37.0 341.5 3.87 -326000 18.3e3 45.0 -74.9 133.5 3.86 -937000 18.3e3 45.0 -20.1 265.2 3.81 -252000 18.3e3 45.0 44.8 328.4 3.65 +2050000 18.3e3 45.0 -54.0 190.0 0.0149 +690000 18.3e3 45.0 -4.6 52.0 0.0147 +264656 18.3e3 45.0 -15.61332546 69.3302824 0.0145 +326000 18.3e3 45.0 0.8 0.5 0.0143 +330000 18.3e3 45.0 11.3 351.1 0.0141 +260000 18.3e3 45.0 7.2 341.8 0.0139 +410000 18.3e3 45.0 14.2 3.1 0.0137 +374000 18.3e3 45.0 39.5 218.0 0.0135 +880000 18.3e3 45.0 -35.5 96.0 0.0133 +450000 18.3e3 45.0 -53.5 24.0 0.0131 +835450 18.3e3 45.0 -18.62889246 344.6275284 0.0129 +730000 18.3e3 45.0 -7.7 26.8 0.0127 +308094 18.3e3 45.0 59.27627528 212.7525524 0.0125 +319231 18.3e3 45.0 -32.80724329 163.6812023 0.0123 +220000 18.3e3 45.0 -37.25 147.4 0.0121 +378676 18.3e3 45.0 -81.07525086 123.29507 0.0119 +290000 18.3e3 45.0 27.7 268.2 0.0117 +212469 18.3e3 45.0 -16.00128558 293.9277616 0.0115 +886977 18.3e3 45.0 -1.825465537 86.643846 0.0113 +359054 18.3e3 45.0 25.10176659 190.1586435 0.0111 +350250 18.3e3 45.0 -55.45675 314.7328254 0.0109 +311641 18.3e3 45.0 -57.31934795 163.1532724 0.0107 +205004 18.3e3 45.0 40.23031791 251.638764 0.0105 +275673 18.3e3 45.0 -28.12752755 251.4752918 0.0103 +314000 18.3e3 45.0 49.4 179.0 0.0101 +393547 18.3e3 45.0 13.45214311 201.8355846 0.0099 +315767 18.3e3 45.0 51.34935346 237.4660505 0.0097 +210000 18.3e3 45.0 35.7 16.8 0.0095 +255770 18.3e3 45.0 -19.66310347 149.3783832 0.0093 +240785 18.3e3 45.0 -19.67249958 123.3894353 0.0091 +226910 18.3e3 45.0 42.1224033 241.0298572 0.0089 +250897 18.3e3 45.0 -31.48490896 112.8567971 0.0087 +658628 18.3e3 45.0 27.02355091 18.8607004 0.0085 +221894 18.3e3 45.0 -11.6594669 104.8591143 0.0083 +245208 18.3e3 45.0 -46.9757255 176.3039635 0.0081 +211558 18.3e3 45.0 -22.49490849 352.9452915 0.0079 +216511 18.3e3 45.0 -32.60970161 354.7296497 0.0077 +333285 18.3e3 45.0 34.36310409 262.9001708 0.0075 +220895 18.3e3 45.0 57.65611017 261.1243421 0.0073 +210024 18.3e3 45.0 -14.1118114 207.354835 0.0071 +233749 18.3e3 45.0 -38.34957695 179.1268146 0.0069 +199964 18.3e3 45.0 -44.53551179 305.0047616 0.0067 +265187 18.3e3 45.0 40.37696785 98.55965302 0.0065 +221563 18.3e3 45.0 45.45055682 152.8752047 0.0063 +370000 18.3e3 45.0 4.8 23.4 0.0061 +914999 18.3e3 45.0 -14.46498859 34.667295 0.0059 +582285 18.3e3 45.0 18.3492662 175.0038852 0.0057 +233783 18.3e3 45.0 -5.010529467 291.3107245 0.0055 +475882 18.3e3 45.0 -36.06581235 208.2781341 0.0053 +320524 18.3e3 45.0 -57.39129925 135.0916217 0.0051 +231696 18.3e3 45.0 51.05426018 164.8361278 0.0049 +635875 18.3e3 45.0 -50.09793662 266.3026523 0.0047 +330791 18.3e3 45.0 5.443621698 141.1357112 0.0045 +205592 18.3e3 45.0 -35.37554544 193.9546907 0.0043 +417139 18.3e3 45.0 -4.44301171 202.529925 0.0041 +218802 18.3e3 45.0 -10.11195196 156.8421346 0.0039 +628680 18.3e3 45.0 27.48770128 148.7715485 0.0037 +401559 18.3e3 45.0 26.12735269 147.0496675 0.0035 +220531 18.3e3 45.0 -58.69456785 -14.7671648 0.0033 +207028 18.3e3 45.0 70.33554386 120.0916322 0.0031 +407689 18.3e3 45.0 -24.68698867 320.3032688 0.0029 +549393 18.3e3 45.0 2.02469787 230.8428995 0.0027 +603126 18.3e3 45.0 57.23607662 81.9745336 0.0025 +204083 18.3e3 45.0 61.5741765 90.19942127 0.0023 +252194 18.3e3 45.0 -68.64688088 109.0653245 0.0021 +299358 18.3e3 45.0 -67.18128041 291.2041322 0.0019 +372000 18.3e3 45.0 16.5 66 0.0017 +1091521 18.3e3 45.0 16.97625333 59.8465947 0.0015 +1113841 18.3e3 45.0 33.46347978 342.5932292 0.0013 +312747 18.3e3 45.0 -74.8652181 133.5337028 0.0011 +928472 18.3e3 45.0 -19.73452267 265.4434194 0.0009 +205511 18.3e3 45.0 -27.0857633 80.81672154 0.0007 +233931 18.3e3 45.0 44.52984365 328.81901 0.0005 \ No newline at end of file diff --git a/examples/global-lunar-bombardment/ctem.in b/examples/global-lunar-bombardment/ctem.in index acaabd04..ddb86989 100755 --- a/examples/global-lunar-bombardment/ctem.in +++ b/examples/global-lunar-bombardment/ctem.in @@ -2,22 +2,22 @@ ! Testing input. These are used to perform non-Monte Carlo tests. -testflag F ! Set to T to create a single crater with user-defined impactor properties -testimp 186296.7168337693 ! Diameter of test impactor (m) +testflag T ! Set to T to create a single crater with user-defined impactor properties +testimp 15000.0 ! Diameter of test impactor (m) testvel 18.3e3 ! Velocity of test crater (m/s) testang 45.0 ! Impact angle of test crater (deg) - Default 90.0 -testxoffset -5.124646221681263e6 ! x-axis offset of crater center from grid center (m) - Default 0.0 -testyoffset -1.6071375724799227e6 ! y-axis offset of crater center from grid center (m) - Default 0.0 +testxoffset 0.0 ! x-axis offset of crater center from grid center (m) - Default 0.0 +testyoffset 0.0 ! y-axis offset of crater center from grid center (m) - Default 0.0 tallyonly F ! Tally the craters without generating any craters testtally F -quasimc T ! MC run constrained by non-MC 'real' craters given in a list +quasimc F ! MC run constrained by non-MC 'real' craters given in a list realcraterlist craterlist.in ! list of 'real' craters for Quasi-MC runs ! IDL driver in uts -interval 6.280 -numintervals 100 ! Total number of intervals (total time = interval * numintervals) <--when runtype is 'single' +interval 1.0 +numintervals 1 ! Total number of intervals (total time = interval * numintervals) <--when runtype is 'single' restart F ! Restart a previous run impfile NPFextrap.dat ! Impactor SFD rate file (col 1: Dimp (m), col 2: ! impactors > D (m**(-2) y**(-1)) popupconsole F ! Pop up console window every output interval @@ -60,7 +60,7 @@ doseismic F ! Perform seismic shaking calcul ! Optional inputF These have internally set default values that work reasonable well. Comment them out with deplimit 9e99 ! Depth limit for craters (m) - Default is to ignore. -maxcrat 0.10e0 ! Fraction of gridsize that maximum crater can be - Default 1.0 +maxcrat 1.0e-2 ! Fraction of gridsize that maximum crater can be - Default 1.0 killatmaxcrater F ! Stop the run if a crater larger than the maximum is produced - Default F basinimp 35.0e3 ! Size of impactor to switch to lunar basin scaling law - Default is to ignore docollapse T ! Do slope collapse - Default T diff --git a/examples/global-lunar-bombardment/scale.ipynb b/examples/global-lunar-bombardment/scale.ipynb index ccf1059f..c7ad8e41 100644 --- a/examples/global-lunar-bombardment/scale.ipynb +++ b/examples/global-lunar-bombardment/scale.ipynb @@ -146,7 +146,7 @@ { "data": { "text/plain": [ - "[]" + "[]" ] }, "execution_count": 4, @@ -178,7 +178,7 @@ { "data": { "text/plain": [ - "[]" + "[]" ] }, "execution_count": 5, @@ -228,22 +228,22 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 9, "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "192832.5674475569" + "15258.479128540499" ] }, - "execution_count": 8, + "execution_count": 9, "metadata": {}, "output_type": "execute_result" } ], "source": [ - "np.exp(interp(np.log(2491870))) #crater size as input; impactor size as output" + "np.exp(interp(np.log(200000))) #crater size as input; impactor size as output" ] }, { diff --git a/examples/morphology_test_cases/complex/ctem.in b/examples/morphology_test_cases/complex/ctem.in index 6ec3a12d..d2a29ffb 100755 --- a/examples/morphology_test_cases/complex/ctem.in +++ b/examples/morphology_test_cases/complex/ctem.in @@ -3,9 +3,9 @@ ! Testing input. These are used to perform non-Monte Carlo tests. testflag T ! Set to T to create a single crater with user-defined impactor properties -testimp 6.444e3 ! 100km crater ! Diameter of test impactor (m) -testvel 15.0e3 ! Velocity of test crater (m/s) -testang 90.0 ! Impact angle of test crater (deg) - Default 90.0 +testimp 15000 ! Diameter of test impactor (m) +testvel 18.3e3 ! Velocity of test crater (m/s) +testang 45.0 ! Impact angle of test crater (deg) - Default 90.0 testxoffset 0.0e0 ! x-axis offset of crater center from grid center (m) - Default 0.0 testyoffset 0.0e0 ! y-axis offset of crater center from grid center (m) - Default 0.0 tallyonly F ! Tally the craters without generating any craters @@ -36,7 +36,7 @@ runtype single ! Run type: options are normal / seed 33790 ! Random number generator seed gridsize 2000 ! Size of grid in pixels numlayers 10 ! Number of perched layers -pix 2.0e2 ! Pixel size (m) +pix 3.08e3 ! Pixel size (m) mat rock ! Material (rock or ice) ! Bedrock scaling parameters mu_b 0.55e0 ! Experimentally derived parameter for bedrock crater scaling law @@ -60,7 +60,7 @@ doseismic F ! Perform seismic shaking calcul ! Optional inputF These have internally set default values that work reasonable well. Comment them out with deplimit 9e99 ! Depth limit for craters (m) - Default is to ignore. -maxcrat 1.00e0 ! Fraction of gridsize that maximum crater can be - Default 1.0 +maxcrat 1.00e-98 ! Fraction of gridsize that maximum crater can be - Default 1.0 killatmaxcrater F ! Stop the run if a crater larger than the maximum is produced - Default F basinimp 35.0e3 ! Size of impactor to switch to lunar basin scaling law - Default is to ignore docollapse T ! Do slope collapse - Default T