diff --git a/nshms.yml b/nshms.yml index 73c71994af26aa6ad7d3ab7f38d40cbc6eed91e5..574db9485440b6873361d3d0c18756905df55bfa 100644 --- a/nshms.yml +++ b/nshms.yml @@ -28,7 +28,7 @@ nshms: # Alaska 2023 NSHM - repo: nshm-alaska - tag: 3.a.4 + tag: 3.b.0 year: 2023 deployment: baseHref: /ws/nshmp/alaska-2023/dynamic diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java index c63e0ee9ebc8d1aceae934ccca0a3bd8434c49b7..ef91cad4e72fc662afa90e56f0f28d830b875c1d 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java @@ -95,7 +95,7 @@ class NshmTests { // run single model NshmModel nshmModel = - NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2007")); + NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023")); NshmTestUtils.writeExpecteds(nshmModel); nshmModel.exec.shutdown(); diff --git a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json index 83d332dae2caae089e1c77471ad18ad39d26544e..a2c3881afcde50f136a97242eb87e2e3863a52db 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 1.2615842429019486, - 0.9383592096170968, - 0.6760215795791461, - 0.4713810460860991, - 0.32029625569216547, - 0.21012351815199612, - 0.1356648346484374, - 0.08463230910191964, - 0.05123358104798512, - 0.029738786860500847, - 0.016432986750746212, - 0.00855770088369556, - 0.004134965402032497, - 0.0018118108199287226, - 6.996082951662977E-4, - 2.30827495214501E-4, - 5.9284859181381745E-5, - 1.0960825773825155E-5, - 9.217340883903793E-7, - 2.0907853755126197E-8 + 1.2054555515762317, + 0.9028091000448486, + 0.6554279343728451, + 0.46052017062111844, + 0.31504620864065486, + 0.2079541835539892, + 0.13510318879263483, + 0.08496232958033866, + 0.051988775702767866, + 0.03058328207332198, + 0.017133029172456044, + 0.009013906892259086, + 0.004368018380152508, + 0.0019023603631335424, + 7.253479503041852E-4, + 2.3667610679091529E-4, + 6.079243246974544E-5, + 1.1568716022798483E-5, + 1.6034782240213744E-6, + 1.1096198331547104E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.3457661287381385, - 0.24838464468482954, - 0.17357128415555415, - 0.11753446246847218, - 0.07656075717806037, - 0.04807631693037619, - 0.028768353443308227, - 0.016449976609192774, - 0.00895472388473917, - 0.004602364525387139, - 0.002220218566012676, - 9.817297049010728E-4, - 3.8087716168010806E-4, - 1.283610730555308E-4, - 3.350888500477047E-5, - 5.787780763336049E-6, - 4.3931374975021854E-7, - 4.720584647601226E-9, + 0.3371108932441851, + 0.2428827404264187, + 0.1700051034253081, + 0.11507904464560197, + 0.07471229502795965, + 0.04659280256752296, + 0.027601845311792588, + 0.015568934707478702, + 0.008266059302624659, + 0.004025039806025589, + 0.0017531377367981885, + 6.604483605952785E-4, + 2.0523962859475266E-4, + 5.1304185369589736E-5, + 8.741628947536682E-6, + 9.886449176534945E-7, + 6.195012341136178E-8, + 8.89217501634637E-10, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.650599038839652, - 1.2900103492257151, - 0.9804920327694434, - 0.7213834761755992, - 0.5132175300899672, - 0.3531304493874114, - 0.2350988908684388, - 0.1505718248265313, - 0.09320043612706938, - 0.05564412774747659, - 0.032138627849108196, - 0.017493261822567552, - 0.009017743585550138, - 0.004190365032808127, - 0.0017319095447165395, - 6.097185700601331E-4, - 1.7538540736905476E-4, - 3.7458047757017104E-5, - 5.402043972846191E-6, - 4.046750346474048E-7 + 1.6613397322177998, + 1.3121797388956014, + 1.0090469580101904, + 0.7525216690797255, + 0.5439798420102854, + 0.3812565494437257, + 0.25908605437802307, + 0.169679716746282, + 0.1075073404471398, + 0.06575591056475857, + 0.03895452425045244, + 0.021852972874971333, + 0.011716931825404021, + 0.0057565723343294024, + 0.002563576391088447, + 9.95539192815906E-4, + 3.276678830082032E-4, + 8.712092747041926E-5, + 1.8142977661841078E-5, + 2.759261195157371E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.0757077904678423, - 1.683608601555616, - 1.325101890193446, - 1.0158751346574915, - 0.7513022286688694, - 0.5420210010226033, - 0.3786754230405975, - 0.2555003549922808, - 0.16697002937691352, - 0.1054142373908318, - 0.0643925286741262, - 0.037978471426693874, - 0.021500347546327635, - 0.011552232178058655, - 0.005797947709065342, - 0.002660018000785944, - 0.0010991976981982116, - 3.997161046281381E-4, - 1.232267396667013E-4, - 3.088944438776804E-5 + 2.0597886225761406, + 1.6847130528576506, + 1.337415178531517, + 1.0346301300938567, + 0.7730618961287371, + 0.5641017389284263, + 0.39915557576688454, + 0.2730852917126187, + 0.18105910040060283, + 0.11600033979770014, + 0.07191096104453407, + 0.04305649762836622, + 0.024769936656981944, + 0.013546053314537834, + 0.006925308465892441, + 0.0032307592796199233, + 0.0013501537731989938, + 4.936418890740649E-4, + 1.5205241845669444E-4, + 3.792182882476171E-5 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json index b756e7c5fb8252515800b85a82d62c3042edff3e..f835d18677a90c584609eebcb12af4ea4774336f 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.6196382558919875, - 0.4647273733911618, - 0.33515470132126635, - 0.2304612817844076, - 0.15077219292528188, - 0.0920769190251641, - 0.05346400910340463, - 0.02888564102141107, - 0.014670080309338631, - 0.006941288300558665, - 0.0030481349096795497, - 0.0012305343925437442, - 4.4920972567651335E-4, - 1.4492138711031473E-4, - 3.9719191614628566E-5, - 8.765784533359538E-6, - 1.3499135727595292E-6, - 1.245261066228383E-7, - 4.8832912315695995E-9, - 5.67781840686854E-12 + 0.510900405696668, + 0.38428885297556936, + 0.27835250548079427, + 0.1922805944002878, + 0.12619235442902255, + 0.0770875336643894, + 0.04460654390653453, + 0.02392502922877578, + 0.012017752029005603, + 0.0056001591343033345, + 0.002410845201230143, + 9.492184164185979E-4, + 3.3672214835945435E-4, + 1.051656859796978E-4, + 2.801427769382648E-5, + 6.0923215137596925E-6, + 9.25254984409327E-7, + 8.670585871169395E-8, + 3.778898501352082E-9, + 2.959441369126757E-11 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.21865212843262138, - 0.15392742092956463, - 0.1030818593209404, - 0.06526765298852284, - 0.038664381056685924, - 0.021439872686424558, - 0.010948734282680624, - 0.005155675978878741, - 0.002210942654296783, - 8.440425192567741E-4, - 2.8327390015893156E-4, - 8.085344394261335E-5, - 1.910076753278105E-5, - 3.6818176278703955E-6, - 4.924645901865877E-7, - 4.717359749984972E-8, - 1.7916876650015264E-9, - 1.8537181269284467E-11, + 0.18748273265144783, + 0.13135989752846303, + 0.08699321223907233, + 0.054168134029258304, + 0.03141629624936587, + 0.01699285477358581, + 0.008424393609266499, + 0.003830549825149108, + 0.0015752224901363146, + 5.700104588547456E-4, + 1.788606495229429E-4, + 4.740122515630051E-5, + 1.0186207073551547E-5, + 1.839820538692405E-6, + 2.512200645267704E-7, + 2.349733097166489E-8, + 8.084303599442336E-10, + 6.8911467896809755E-12, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.7475163946708244, - 0.5782201303821156, - 0.43374816981262504, - 0.3134921999370521, - 0.2175412851489576, - 0.14462016531771119, - 0.09196468350886472, - 0.0554187021796056, - 0.03164571373876152, - 0.016959846067666474, - 0.008517062102200185, - 0.0038828191180088952, - 0.0016258713931112958, - 5.865224565960323E-4, - 1.7732309553070204E-4, - 4.132285582455685E-5, - 6.583313169166081E-6, - 5.3604267495583E-7, - 1.5438820775479772E-8, - 9.113249524228849E-12 + 0.6317924751072215, + 0.4882923239010733, + 0.36592358465803315, + 0.26402717801876485, + 0.1826372881899886, + 0.12077324627493127, + 0.07622935704029506, + 0.045521269061182576, + 0.025731129837292626, + 0.013629882451863095, + 0.006750199446670263, + 0.003024547672717661, + 0.0012432076275650347, + 4.4077108985418796E-4, + 1.31612939228522E-4, + 3.058751434281435E-5, + 4.977732203000428E-6, + 4.608283729801913E-7, + 2.4782232268501392E-8, + 9.386366965413837E-10 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.9142702136534497, - 0.7311196284697029, - 0.5659009002922903, - 0.4253626979589311, - 0.306832013896455, - 0.21462338104651174, - 0.1441916033417995, - 0.09259434067692504, - 0.05684713131776023, - 0.03310026306520289, - 0.018189464990300115, - 0.009358320484798847, - 0.004466570878578641, - 0.0019481881286521824, - 7.564448614729615E-4, - 2.507225068230701E-4, - 6.785187877335699E-5, - 1.3861464017224865E-5, - 1.7566834600877285E-6, - 1.0262479659205378E-7 + 0.7752948291688881, + 0.6194243339359888, + 0.4787621598336898, + 0.35909784903118513, + 0.25817237596808235, + 0.1797105618464373, + 0.11993489664944947, + 0.07639555986360248, + 0.046494128306174, + 0.026827442756605358, + 0.0145978111541393, + 0.007424829870419156, + 0.003496408767658234, + 0.0015029928180070365, + 5.75879040769705E-4, + 1.891956085566876E-4, + 5.111961625126819E-5, + 1.0593460107111633E-5, + 1.4403282380160421E-6, + 1.1559160576604646E-7 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json index 2d0ef98de1649885d095b3af7479244e3f952b69..a33dee004524784548564bd4821846c662330c99 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.4313778377018505, - 0.32171408713962235, - 0.22766659474359094, - 0.1504372696994509, - 0.09182418615238931, - 0.05013792920968455, - 0.02484645499659234, - 0.010824576134177567, - 0.004201789685114441, - 0.001444617697075677, - 4.4906008048283056E-4, - 1.2915038687202012E-4, - 3.566071389848609E-5, - 9.66308722922416E-6, - 2.4961104757325976E-6, - 5.528704296645165E-7, - 8.506614750944165E-8, - 7.825206511661106E-9, - 3.050308848780185E-10, - 3.305406343798575E-13 + 0.3296794357638688, + 0.2484854277220137, + 0.17979668553520037, + 0.1231876185475268, + 0.07927817701242552, + 0.04685576321795804, + 0.026085641380535023, + 0.013597527147089032, + 0.006886035844357587, + 0.003451416202798706, + 0.0017365648631554448, + 8.628446666122591E-4, + 4.0884607420007033E-4, + 1.7637232732508956E-4, + 6.599735019381921E-5, + 2.0557183857072948E-5, + 4.820051473646981E-6, + 7.510233127519178E-7, + 5.781553857768471E-8, + 5.310018847258364E-10 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.18962915881210457, - 0.13231371115570228, - 0.08610643118963475, - 0.051892338625982595, - 0.028537233663045707, - 0.014239684720859703, - 0.0062649462490160365, - 0.00241237714984334, - 7.944636007803003E-4, - 2.1454550111671568E-4, - 4.602990327356596E-5, - 7.83143791332141E-6, - 1.2137506120029192E-6, - 2.134559261756078E-7, - 3.1072109211074423E-8, - 3.016093263994769E-9, - 1.1327510629538606E-10, - 1.171375342300075E-12, + 0.14998217374488668, + 0.10624794650730177, + 0.07081319398869801, + 0.044339329604761404, + 0.02597975521863052, + 0.014357358688259391, + 0.007430793769581358, + 0.003661814086647199, + 0.0017338007286361733, + 7.89060965557094E-4, + 3.441419867501983E-4, + 1.4026509530308466E-4, + 5.0902292097982576E-5, + 1.6053119766506015E-5, + 3.924192563508301E-6, + 7.119861788279011E-7, + 7.54058074585313E-8, + 2.9446262800098265E-9, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.4757531048462467, - 0.35266996176351034, - 0.2469593860668163, - 0.1616873493660174, - 0.09784988454723532, - 0.05404035789354679, - 0.02703998501732486, - 0.012155679100316914, - 0.005008017912703153, - 0.0019404994398230322, - 7.455595723911906E-4, - 2.8302771904016935E-4, - 1.0835402071906951E-4, - 3.7637805874516714E-5, - 1.114635366789293E-5, - 2.552603791176247E-6, - 3.992080159958039E-7, - 3.157394772999823E-8, - 8.434768915898015E-10, - 1.518262424728918E-14 + 0.3715716748091074, + 0.28066027957952866, + 0.20208588638854036, + 0.13761916319998063, + 0.08808837335281947, + 0.052955991456289, + 0.03028782966591698, + 0.01677394525487418, + 0.009293443452510475, + 0.005210479932584493, + 0.0029453609749909887, + 0.0016014076514413098, + 8.251028586919217E-4, + 3.754123972723159E-4, + 1.4511530287201178E-4, + 4.43204875863051E-5, + 9.946699017148776E-6, + 1.394430570948944E-6, + 8.728241476126261E-8, + 4.48142653366506E-11 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.5704953859298876, - 0.4437213553851962, - 0.3263595023248932, - 0.22722168177533936, - 0.14683381044750907, - 0.08866350738890147, - 0.04903268835666581, - 0.0246107504174729, - 0.011320133323436204, - 0.004823889722871732, - 0.0019681509391436583, - 7.967751364689861E-4, - 3.237413285243801E-4, - 1.2933830719544261E-4, - 4.8194216128967275E-5, - 1.5622674096979026E-5, - 4.155937685659817E-6, - 8.324719689471659E-7, - 1.0224084912621536E-7, - 5.625629449124282E-9 + 0.4451569250114386, + 0.35080633843090747, + 0.2632284461199974, + 0.18848079761119294, + 0.12675819034620045, + 0.08097061612061728, + 0.048779367993652525, + 0.028026639976523486, + 0.0158386790983621, + 0.009006432557536696, + 0.00521730636589344, + 0.003035869788895011, + 0.0017205081554241399, + 9.171730891083757E-4, + 4.4277633445149664E-4, + 1.8492301874170028E-4, + 6.417920601452256E-5, + 1.7588998998730946E-5, + 3.4540968632416897E-6, + 3.9737990095510676E-7 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json index c4a281bef4adfc2d06389b7f359e608b42688e5d..a5fdb9762725273b48e5693443f11e6b4d7782c2 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 1.176908540550347, - 0.8208233581137089, - 0.5608508101739277, - 0.3780179685146586, - 0.2542598409165238, - 0.16917780348522699, - 0.11294295931467835, - 0.073722117804931, - 0.046777664497678076, - 0.028368372878628624, - 0.016355499151888928, - 0.008955293539927325, - 0.0046389365589518256, - 0.0022383012020234447, - 9.776344055948182E-4, - 3.746585024088629E-4, - 1.1591326337356405E-4, - 2.790214869235525E-5, - 3.8192695305906244E-6, - 1.0303190011247954E-7 + 1.1563620076198489, + 0.8108764450280195, + 0.5567165204469949, + 0.37661611971515363, + 0.2537526455080179, + 0.16872404946018202, + 0.11239265813984663, + 0.07322616517880996, + 0.046438555153854436, + 0.02812554769186281, + 0.01608095588479048, + 0.008588053357425615, + 0.00422780593447085, + 0.0018807393425480342, + 7.384029864058869E-4, + 2.5143038412483776E-4, + 6.889623213888918E-5, + 1.4191160404183603E-5, + 2.2058054212325666E-6, + 2.713664261232649E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.31585740279172414, - 0.22752216393943692, - 0.1619880184582906, - 0.11353524841440556, - 0.07744822882212148, - 0.05105020560668116, - 0.031884914628459785, - 0.01886568890594263, - 0.010600150425812393, - 0.005671712474112049, - 0.0028941080239190163, - 0.00137752788229627, - 5.841323250201333E-4, - 2.147457349350808E-4, - 6.215649233673115E-5, - 1.2905321585208716E-5, - 1.1378495909293443E-6, - 1.3766689358264892E-9, + 0.31656209313044414, + 0.2272621600728691, + 0.16079658976985173, + 0.11155444042021773, + 0.07492654394850826, + 0.048362753995579474, + 0.02942877550773362, + 0.016867048098076293, + 0.009045902081159954, + 0.004456027136211509, + 0.001971744673640637, + 7.571835371149252E-4, + 2.3968075695000925E-4, + 6.006249984803165E-5, + 9.479306830402176E-6, + 7.551063889629073E-7, + 7.428233573779028E-9, + 1.537150078678922E-12, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.5034307466950545, - 1.0805171170029173, - 0.7544799774564752, - 0.5138142501636522, - 0.3443152625048115, - 0.22887645996181114, - 0.15174002843690823, - 0.10009206552445549, - 0.06597199794140735, - 0.043042722004507386, - 0.027461128914096924, - 0.016571451799852914, - 0.009494611300455823, - 0.004984690159164352, - 0.0023718010355281757, - 9.842895410203168E-4, - 3.449774349079049E-4, - 9.629999705677543E-5, - 2.001118550075276E-5, - 2.3770997488716338E-6 + 1.5818370153080572, + 1.15195237687201, + 0.8138919707236263, + 0.5601403780003567, + 0.37902095287167564, + 0.25437765683926533, + 0.1702785334332962, + 0.11325322795459268, + 0.07494686466250117, + 0.048808282955205555, + 0.030950349697415405, + 0.018547690434692298, + 0.010586599286993823, + 0.005571167887112225, + 0.0026836680617469944, + 0.0011429570458595906, + 4.1854882952960075E-4, + 1.2605159742794266E-4, + 3.0066353915399692E-5, + 5.060803399396689E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.063423441388135, - 1.5589241847024704, - 1.1312002146300024, - 0.7973967348533983, - 0.5442070033657663, - 0.3682646414675749, - 0.24680614045371113, - 0.16431427664239498, - 0.10935187626815537, - 0.07252433742372369, - 0.047682743666931954, - 0.0306406864137029, - 0.01893825650229503, - 0.011128788688833834, - 0.006174774347195005, - 0.003201219312554629, - 0.0015381039040949045, - 6.735981150328402E-4, - 2.594293825980931E-4, - 8.590272784161787E-5 + 2.1168323151757766, + 1.619134652764648, + 1.1884029735633264, + 0.8460325924471094, + 0.5822456895819994, + 0.3966484344333076, + 0.26734789151385235, + 0.17886421327210064, + 0.11940851221022791, + 0.07915770139847726, + 0.05176159061518673, + 0.03292045995221985, + 0.020051569247233968, + 0.011548368691057699, + 0.006219947395163814, + 0.0030801315530267297, + 0.0013832551915340975, + 5.529275798222957E-4, + 1.897919664865184E-4, + 5.4220863714955954E-5 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json index 020462d5e42283b7c2d6ec55e0725252b4aa0054..5ff1d9c30e4803d4541c9db715abcc93e086f6ee 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.9259421700329372, - 0.6911902478500314, - 0.499021687508618, - 0.3455932345732604, - 0.23000664637486753, - 0.14589377205639995, - 0.09094276760302598, - 0.05542764660241408, - 0.03362197329682248, - 0.020207895425829576, - 0.011981056932043259, - 0.006947708719071577, - 0.0038786079198037966, - 0.0020336307445430056, - 9.689658090147044E-4, - 4.0646279656521956E-4, - 1.3997872413314347E-4, - 3.824125846524706E-5, - 7.220289593649039E-6, - 3.629072189207283E-7 + 0.8624988882547628, + 0.6472038402537325, + 0.468798523237819, + 0.3249931784422643, + 0.21614765221154933, + 0.13692308978396975, + 0.08526634558368971, + 0.051917167527009776, + 0.031401678787367826, + 0.018704499768109915, + 0.010853076598661733, + 0.0060351375071976705, + 0.003144682836288346, + 0.0014944667785689214, + 6.292435175727221E-4, + 2.30234042577736E-4, + 6.881233587613072E-5, + 1.5998082832802966E-5, + 2.649577548643775E-6, + 4.014907449262735E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.3340451128495938, - 0.2402390996086935, - 0.1654731998507521, - 0.1093335080055822, - 0.06917970490014463, - 0.042303039810019, - 0.02495270793698638, - 0.014430661699758016, - 0.008249630250781311, - 0.004650503742844747, - 0.0025559636408638876, - 0.0013234563403727222, - 6.121932964071722E-4, - 2.457353273351528E-4, - 7.878615502455529E-5, - 1.9315414318946888E-5, - 2.4643445956028307E-6, - 6.191041311229892E-8, + 0.3126588566525009, + 0.22384852229891194, + 0.15333729382235833, + 0.1005611680443073, + 0.0629307352710108, + 0.03787240486336315, + 0.021835924148281102, + 0.012211171018503013, + 0.0066077365531162875, + 0.0033852123288059238, + 0.001590823906862249, + 6.560277393366681E-4, + 2.246083439434495E-4, + 6.193155215116131E-5, + 1.1380982693630809E-5, + 1.1110857635807404E-6, + 1.7343952315951334E-8, + 2.523164424762348E-12, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.0438437531884004, - 0.7871737649475408, - 0.5753658427008509, - 0.4052257545466524, - 0.27576667119783166, - 0.18284334057232535, - 0.11939475676868819, - 0.07709072447612689, - 0.04977045213177592, - 0.03211912764867072, - 0.020703332746107465, - 0.012973631412375165, - 0.00788217518955861, - 0.004447462352455574, - 0.0022926936020270117, - 0.0010408584019984107, - 4.054154032726833E-4, - 1.2971943506718671E-4, - 3.24844146930463E-5, - 5.468079737390506E-6 + 1.0184441401188133, + 0.7742487034943588, + 0.5696408003395111, + 0.40387528981894416, + 0.27720847215705513, + 0.18584749097970993, + 0.12287217142784773, + 0.08023021839846606, + 0.05213704873242693, + 0.033625554509036225, + 0.021495837049199648, + 0.013274709337847324, + 0.007919264656362564, + 0.004381231102996308, + 0.0022200157850415713, + 9.966711776906911E-4, + 3.876304918572317E-4, + 1.2604851344386937E-4, + 3.334943264206746E-5, + 6.21245814503021E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 1.3443261255177081, - 1.0457899329600795, - 0.7873955061337173, - 0.5759790969543808, - 0.40556588286821943, - 0.27985575503832166, - 0.18889214642795488, - 0.12524337244075345, - 0.082329178597031, - 0.053757393975203696, - 0.03497981212601005, - 0.022611470166100458, - 0.014387242175845825, - 0.008886652570417517, - 0.005250410017100082, - 0.0029218727414770315, - 0.001518016796450839, - 7.257251922275029E-4, - 3.0997418564093066E-4, - 1.1525467849178263E-4 + 1.2931353838341548, + 1.0141345146204543, + 0.7682627367624675, + 0.5646006018842363, + 0.3993460524940104, + 0.27702237173213, + 0.1881853689781778, + 0.1256154363285379, + 0.08299093544987085, + 0.05424141437253935, + 0.03510790091261592, + 0.0224043218206043, + 0.01396219381803346, + 0.00836805507647081, + 0.004732888236227226, + 0.0024691893686298256, + 0.0011699365781911882, + 4.949755080134131E-4, + 1.8203861819997193E-4, + 5.664939647060594E-5 ] } } \ No newline at end of file