diff --git a/nshms.yml b/nshms.yml index a6fa81f3255d95d8255d972062c9843effa4bc8a..a0033acb631e407c89e0c6a605c61e082ee74567 100644 --- a/nshms.yml +++ b/nshms.yml @@ -27,7 +27,7 @@ nshms: # Alaska 2023 NSHM - repo: nshm-alaska - tag: 3.b.6 + tag: 3.b.7 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 d9c9eb6734faf5543934ca52c8fa2ce1a1e6cbcb..1a886f348fae575930f3455464a8cd27728a0018 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java @@ -101,7 +101,7 @@ class NshmTests { // run single model NshmModel nshmModel = - NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023")); + NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023")); NshmTestUtils.writeExpecteds(nshmModel, Optional.empty()); 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 3bcaf76a4c1edc94be6bbd4b49787c56534e168d..e214bc0427cc7f39a5f0d8d65288fec0941640d7 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.3483161597751254, - 1.0053938058219476, - 0.72805735920565, - 0.5113665433663438, - 0.35039252407129956, - 0.23199565867316382, - 0.15133906471153358, - 0.09570580564529482, - 0.05899977096675741, - 0.03502470591826315, - 0.01982499714941363, - 0.010556058057219882, - 0.00519399449111, - 0.0023086626017720683, - 9.031413014626345E-4, - 3.047183235845139E-4, - 8.267752992048807E-5, - 1.7285571830972633E-5, - 2.68099626197172E-6, - 3.007629001140805E-7 + 1.3537468328928346, + 1.0103154427598815, + 0.7323786350946773, + 0.5150449703517822, + 0.35345412134723325, + 0.2344910294085141, + 0.15334907120509234, + 0.09727623638180859, + 0.060176238499631794, + 0.03585826525074532, + 0.020380445279889404, + 0.010900794198883759, + 0.005388442426619103, + 0.002404954255789383, + 9.441273563210114E-4, + 3.193844266082103E-4, + 8.673259516301395E-5, + 1.8036535042472592E-5, + 2.799179550215747E-6, + 3.013028621585243E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,22 +69,22 @@ 0.7929925155296614 ], "ys": [ - 0.3568749924062787, - 0.2564311464850049, - 0.17894040250689255, - 0.12076536578227816, - 0.07819862690680596, - 0.04864020583271038, - 0.028721305382703944, - 0.0161570780482967, - 0.008599284252545188, - 0.004248269611262293, - 0.0019126847718777065, - 7.624347484475101E-4, - 2.5751168103117783E-4, - 7.251044673299548E-5, - 1.4771791965609249E-5, - 2.060542841016365E-6, + 0.36205511025623816, + 0.2608473736299835, + 0.18255336992687307, + 0.1236219050947805, + 0.08037702914959681, + 0.05023327554359663, + 0.029818329911675604, + 0.016864452690360004, + 0.009021333844345322, + 0.004475360983021283, + 0.002019621949196018, + 8.047408485465233E-4, + 2.7109083388956843E-4, + 7.577409257805477E-5, + 1.5204642255166092E-5, + 2.0834669490803287E-6, 1.21794529978192E-7, 1.6583407068056797E-9, 0.0, @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.8252583085969099, - 1.4297496776777987, - 1.0913036555872582, - 0.8076904559646677, - 0.57882471038303, - 0.4015959563823732, - 0.2699249626418473, - 0.17498814098635063, - 0.11011884376800335, - 0.0671983788088808, - 0.039841014452224224, - 0.022365846050018248, - 0.011953792084591902, - 0.00580946230426748, - 0.00252712170460612, - 9.388637244322552E-4, - 2.862630341522826E-4, - 6.692779576563144E-5, - 1.1060828339498699E-5, - 1.1113946775675385E-6 + 1.8297909582134704, + 1.4337178927371284, + 1.0946980156253328, + 0.8105495598814934, + 0.5812261955021413, + 0.4036188393819223, + 0.27161746492757066, + 0.17636338078479044, + 0.1111894248048286, + 0.06799513162548057, + 0.04041481406288187, + 0.0227606660549217, + 0.012209922620639357, + 0.0059571098121739986, + 0.002600622449782677, + 9.69057515663366E-4, + 2.9608762521794794E-4, + 6.917492394806519E-5, + 1.13631932099536E-5, + 1.1051926173257162E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.2855518820023346, - 1.8520621446473102, - 1.4583994472627562, - 1.1199868902102883, - 0.8306451774342108, - 0.6014953432212464, - 0.422193615713283, - 0.28654070263750336, - 0.18867278950342142, - 0.12030262067903896, - 0.07440449101656639, - 0.04450972783960336, - 0.025575121916823356, - 0.013939900350248948, - 0.007074080938622007, - 0.0032526076351496406, - 0.0013237624574133358, - 4.626381300697758E-4, - 1.3214183680354625E-4, - 2.9005595851480736E-5 + 2.290245953349451, + 1.8562487179246965, + 1.462044594599009, + 1.1231069777122165, + 0.833279409275935, + 0.6037201153557546, + 0.4240655360884087, + 0.28809224354518304, + 0.1899234849375237, + 0.1212718976471451, + 0.07512658375536861, + 0.04502801474526734, + 0.025930961945939055, + 0.014168084156366959, + 0.00720613901443358, + 0.0033191600647459094, + 0.0013521476531708257, + 4.7254775344228445E-4, + 1.3471540423378944E-4, + 2.9396669346552432E-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 7d54c8faa0eb55d0fb2a3092dd579440e0181d76..30ba94f035175b5bada05ba1beaa9a12a9f369f5 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.6275809032907764, - 0.46939226406120094, - 0.3381257376016717, - 0.2325896219865059, - 0.1523713409186287, - 0.0931867077928663, - 0.05414788274387324, - 0.029262124167271593, - 0.014867820244888048, - 0.007041714004797303, - 0.003096641922371851, - 0.0012507228153413145, - 4.56225971823272E-4, - 1.4623975818144958E-4, - 3.966168373104371E-5, - 8.700199959653051E-6, - 1.3269786772513196E-6, + 0.6299367955268628, + 0.4711801260493742, + 0.339436874554311, + 0.23353578076485115, + 0.15305109663302438, + 0.09365616265742083, + 0.05444830506157231, + 0.029426073427048553, + 0.014939814203279814, + 0.007063912287836687, + 0.003099249875967003, + 0.0012486794584624082, + 4.545983491944361E-4, + 1.4563774971743148E-4, + 3.95373614100591E-5, + 8.687897425612776E-6, + 1.3269042742265163E-6, 1.2619367548125488E-7, - 5.665542846335971E-9, - 4.3802562082764046E-11 + 5.665542846335972E-9, + 4.380256208276404E-11 ] }, "5.00 Second Spectral Acceleration": { @@ -69,20 +69,20 @@ 0.7929925155296614 ], "ys": [ - 0.19970603745742557, - 0.13839890982454786, - 0.09078880093950471, - 0.05615497350819085, - 0.032504588963526766, - 0.017675939094046803, - 0.008896876213745571, - 0.0041503526447315775, - 0.001769878587871253, - 6.71946720192526E-4, - 2.2316623419236085E-4, - 6.292239272992988E-5, - 1.4464242434446612E-5, - 2.7431416858098283E-6, + 0.2022966925066381, + 0.1402983162089764, + 0.09209092515325219, + 0.05699685255584053, + 0.03301574073541317, + 0.017962434745860262, + 0.009036387258834747, + 0.004206626660247896, + 0.0017874421618739116, + 6.752575716348747E-4, + 2.230424682608342E-4, + 6.266782923990366E-5, + 1.4393259611992817E-5, + 2.7373717183159915E-6, 3.7249956647577337E-7, 3.492872689157643E-8, 1.1854844117945035E-9, @@ -115,25 +115,25 @@ 1.6428726885203377 ], "ys": [ - 0.7759511122600574, - 0.599408531376556, - 0.44983826608441296, - 0.325720962504902, - 0.2265788393467304, - 0.15090574187558534, - 0.09597365873767344, - 0.057705443754897015, - 0.032795533709282815, - 0.01745583761964447, - 0.008693555787751822, - 0.0039217122652628845, - 0.0016214351844775193, - 5.764059083223685E-4, - 1.71509443439893E-4, - 3.930835540137222E-5, - 6.1536715460771985E-6, + 0.7771093771249222, + 0.6002622796228388, + 0.45049103650760136, + 0.3262263923965367, + 0.22695112574017573, + 0.15114697194216073, + 0.09610056494729681, + 0.05775216058438478, + 0.032801449887918034, + 0.017448944179652554, + 0.008686801248760416, + 0.003918192057826304, + 0.0016202106347294343, + 5.761432215081969E-4, + 1.7147886181828983E-4, + 3.930733643504221E-5, + 6.153671546077199E-6, 4.937329485744405E-7, - 1.4273015899612118E-8, + 1.4273015899612117E-8, 1.7289401638074338E-11 ] }, @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.9535188574597739, - 0.7595988278186213, - 0.5867092980910549, - 0.44084410039038924, - 0.318336531410632, - 0.22304130213163317, - 0.15004818567096453, - 0.09638151227620405, - 0.05910661668847706, - 0.03432753839082057, - 0.01878897364690947, - 0.009615707489679553, - 0.004557753587597737, - 0.001970698450290885, - 7.57705678488832E-4, - 2.4863930550356384E-4, - 6.665150845458887E-5, - 1.3516522756392184E-5, - 1.714509035399869E-6, - 1.0436138874114596E-7 + 0.9548373989440899, + 0.7605831164307072, + 0.5874522995804776, + 0.44141417348581813, + 0.3187644983344743, + 0.22334349118273011, + 0.15023585080791185, + 0.09647652022229786, + 0.05914079795329683, + 0.034331430563204625, + 0.01878340585111988, + 0.009610357278076796, + 0.004554898432719949, + 0.0019696598942599585, + 7.574636690845083E-4, + 2.4860916339040456E-4, + 6.665082282288701E-5, + 1.3516522756392187E-5, + 1.7145090353998691E-6, + 1.0436138874114594E-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 0c6646919a21bcdb25adddfc902074fdfda6412a..4a44296b8a771562e39f48ee8739b504c0eafd23 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json @@ -23,25 +23,25 @@ 1.7119945007591924 ], "ys": [ - 0.37549917348715806, - 0.2759655762792091, - 0.19380827848880722, - 0.12818599970953884, - 0.07899926524089053, - 0.0439801066911108, - 0.022477128102002558, - 0.010267663067879872, - 0.004268422271212274, - 0.0016196376036371506, - 5.774681220681387E-4, - 1.9872322102025195E-4, + 0.3775735254287933, + 0.27744207723652275, + 0.19477057661509148, + 0.12875113340888142, + 0.07929674735656218, + 0.04411600602826025, + 0.02253219605451738, + 0.010286395011257915, + 0.004273800534436701, + 0.001620897165435973, + 5.776426623840872E-4, + 1.987286185713807E-4, 6.823005284740018E-5, 2.3251769378972825E-5, 7.514188693753363E-6, - 2.121321581659188E-6, - 4.5544638086643076E-7, + 2.1213215816591875E-6, + 4.554463808664307E-7, 6.616480177939729E-8, - 4.838396012080843E-9, + 4.838396012080842E-9, 4.240103338446744E-11 ] }, @@ -69,18 +69,18 @@ 0.7929925155296614 ], "ys": [ - 0.13458079343235158, - 0.09259929094053378, - 0.059770403996311144, - 0.03605408226310224, - 0.02014147221940421, - 0.010409045182239202, - 0.004855400289564331, - 0.0020352205245335645, - 7.543291273177374E-4, - 2.4281882744406634E-4, - 6.90060865607294E-5, - 1.822373201973238E-5, + 0.13710145426410605, + 0.0942573295464636, + 0.060745301879708447, + 0.036565930620404447, + 0.02037832172090549, + 0.01050480119489072, + 0.004888034968610816, + 0.0020445061280406373, + 7.562728552245487E-4, + 2.4308078953655867E-4, + 6.901714663477101E-5, + 1.8223732019732375E-5, 4.897967342053475E-6, 1.3783636623081346E-6, 3.190626395541543E-7, @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.4465049071451159, - 0.33142824959599126, - 0.23306557166146336, - 0.15373606759369743, - 0.09419200155109601, - 0.05313098733227421, - 0.02751828625832414, - 0.012999413357488509, - 0.005691373299359487, - 0.002362080278163893, - 9.773638767789973E-4, - 4.036685942156493E-4, + 0.4473576589583555, + 0.3319414840731348, + 0.233337690092073, + 0.15385889807867265, + 0.09423792817208838, + 0.05314439544620711, + 0.02752094080049907, + 0.012999588477776046, + 0.0056913281039095605, + 0.002362076122997531, + 9.77363876778997E-4, + 4.036685942156494E-4, 1.694791920725093E-4, 6.539278295747254E-5, 2.1894897377050023E-5, 5.854897732511006E-6, - 1.1481806468811455E-6, + 1.1481806468811457E-6, 1.3857130577662447E-7, 7.674264133978933E-9, - 4.082286883282843E-12 + 4.082286883282842E-12 ] }, "0.20 Second Spectral Acceleration": { @@ -161,24 +161,24 @@ 1.998773638612381 ], "ys": [ - 0.5402541699298197, - 0.4210761924468617, - 0.3110108479645288, - 0.2179545843994403, - 0.1422004854478377, - 0.08703596270506672, - 0.04910485567374209, - 0.025374443311690413, - 0.012143811247089596, - 0.005447185236977568, - 0.0023673440465465287, + 0.5412517195676526, + 0.4217318032045643, + 0.3113997587131707, + 0.21815987846762244, + 0.14229246749847635, + 0.08707093734280127, + 0.04911544382366964, + 0.025376652973143607, + 0.01214402192018589, + 0.005447150778162354, + 0.0023673368054522, 0.0010308518070662688, - 4.5427787126915817E-4, + 4.542778712691582E-4, 1.9831822940340378E-4, - 8.144750605185142E-5, - 2.9514021319872695E-5, - 8.988357941346196E-6, - 2.1636467855443225E-6, + 8.14475060518514E-5, + 2.95140213198727E-5, + 8.988357941346193E-6, + 2.163646785544322E-6, 3.662141469275799E-7, 3.63015145137678E-8 ] 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 c1661a6ab1ea96225f9ccba89311aeb637d7519b..9d31e574b63aa4ea18263ebdde4c140068956172 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.2152259180389804, - 0.8541529248282416, - 0.5879523783636067, - 0.398109356044869, - 0.26776655163112667, - 0.17742728544593941, - 0.11795187708680198, - 0.07704234584532124, - 0.04923427834745845, - 0.03011884824915415, - 0.01735946540365579, - 0.009303398769844805, - 0.004581158455156722, - 0.0020411585934934535, - 8.072121536928074E-4, - 2.7927015774114174E-4, - 7.963595044436678E-5, - 1.8049863088732312E-5, - 3.037700538306914E-6, - 4.1947017829335344E-7 + 1.2212066080842208, + 0.8598707411309544, + 0.5934279769186845, + 0.40330700684824355, + 0.2725851554279007, + 0.1816932763562211, + 0.1215099716825198, + 0.0797912998230498, + 0.05122460878813123, + 0.03150369852592356, + 0.018314408386513464, + 0.009953011317713843, + 0.0049968365580898315, + 0.002277051745675493, + 9.21374067242452E-4, + 3.251186475050686E-4, + 9.39427218693006E-5, + 2.1190014820001016E-5, + 3.484520277155361E-6, + 4.559925657574019E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,23 +69,23 @@ 0.7929925155296614 ], "ys": [ - 0.3139087625479868, - 0.22385521817403484, - 0.15696465963805453, - 0.10781317672249836, - 0.07167992885339346, - 0.045771163584744624, - 0.027478988019376906, - 0.015466653525597491, - 0.008107519713287175, - 0.0038999143930332834, - 0.0016976716636735415, - 6.526316087148939E-4, - 2.1155799373457168E-4, - 5.65167387753763E-5, - 1.040503875547645E-5, - 1.1733672465364377E-6, - 3.1034893051408225E-8, + 0.3199527704875783, + 0.2293876786217369, + 0.16195682824630434, + 0.11213720631502762, + 0.07517404938243484, + 0.048373252517777826, + 0.02926392103092542, + 0.0166252702545217, + 0.008829742348953057, + 0.004321460254724308, + 0.0019175421844803125, + 7.502088947592418E-4, + 2.463028185638767E-4, + 6.601152839690208E-5, + 1.190827934208269E-5, + 1.2870098414063422E-6, + 3.103489305140823E-8, 1.6551032765075596E-12, 0.0, 0.0 @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.6458544624835303, - 1.1942103477610073, - 0.840829823595721, - 0.575888153340114, - 0.38678800384165724, - 0.2569559649448105, - 0.17005409149704914, - 0.11199466089179132, - 0.07368802592265543, - 0.04788690714257234, - 0.03030627859585838, - 0.0180503575826901, - 0.01017258530281234, - 0.005244555282003574, - 0.0024559523448122672, - 0.001007690874994757, - 3.504811425699495E-4, - 9.826782168777552E-5, - 2.1093368006155757E-5, - 2.962261040062269E-6 + 1.651364017483675, + 1.1995492063224438, + 0.8459518618087022, + 0.5807057599129567, + 0.39117564227330504, + 0.2607755860643602, + 0.17320193903794523, + 0.11443940344793398, + 0.07550825349941157, + 0.04923189432609969, + 0.0313336552430301, + 0.01885529919291059, + 0.010792486917849752, + 0.005679342885137587, + 0.002721633715268657, + 0.0011434876645678273, + 4.070575019856634E-4, + 1.1671064027613724E-4, + 2.5475347189104065E-5, + 3.6126001839969183E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.188989703200528, - 1.666085445980205, - 1.219299333481262, - 0.8661257430880653, - 0.5942156850065786, - 0.40265387896883104, - 0.2691880036983501, - 0.17823640543846317, - 0.11771435831810331, - 0.07726349371022927, - 0.05002188281377981, - 0.031392697620248225, - 0.018733739346573235, - 0.010476504665119188, - 0.005433753892442802, - 0.0025735461238401017, - 0.001099175294967567, - 4.1464875014806003E-4, - 1.3268012813367634E-4, - 3.4642910241599296E-5 + 2.1945453671087045, + 1.6714742853154736, + 1.2244863125579937, + 0.8710475267768221, + 0.5987684192334757, + 0.4067300889546944, + 0.27268111027440695, + 0.1810809549595913, + 0.11992496227823618, + 0.07892810108147554, + 0.05127424193939008, + 0.03235673446335903, + 0.019485725174993907, + 0.011045317098441546, + 0.005829821423190788, + 0.00281679985279871, + 0.0012277959633121675, + 4.721268578670907E-4, + 1.5373567516193523E-4, + 4.070985240786104E-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 33d4383a6f5dba3a52815de87a5577bf9724fc1b..47892fa58a4583b58e05d2d5a704bbf9b7fca9dd 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.9271872379071341, - 0.6905767904341512, - 0.49713435594443495, - 0.3431821382925885, - 0.22792259532635958, - 0.1447326194353422, - 0.09080310855630937, - 0.05604864204475251, - 0.03452030255489462, - 0.02091499193594897, - 0.012237657919797166, - 0.0067725990055453435, - 0.0034766874879384514, - 0.0016236409074321706, - 6.754637103426534E-4, - 2.4674045468168327E-4, - 7.522017482049687E-5, - 1.8842341976603848E-5, - 3.4564601080827814E-6, - 5.245613249833894E-7 + 0.9325100071452752, + 0.6954852673807081, + 0.5015347246401772, + 0.34699112675366706, + 0.23109903974440474, + 0.14726413169910962, + 0.09275498067615105, + 0.057510240251391405, + 0.03561986618241648, + 0.021767159064577258, + 0.012914752382063832, + 0.00729818627623514, + 0.003850977745017842, + 0.0018566143796475624, + 7.980148609168511E-4, + 3.005088996697045E-4, + 9.404583654655203E-5, + 2.3919112611967835E-5, + 4.347770805088602E-6, + 6.504792547924437E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.31284521807021354, - 0.22307776593268755, - 0.15234262727252407, - 0.09973399477307063, - 0.06235157920801332, - 0.03742071954659044, - 0.021364749266820207, - 0.011677718845897406, - 0.00608274209605579, - 0.002972500943755568, - 0.0013402531431543003, - 5.409360060557801E-4, - 1.864575772572693E-4, - 5.387604125214202E-5, - 1.1253419729562047E-5, - 1.4539441268174388E-6, - 5.507032207993156E-8, - 2.645622377055003E-12, + 0.3180631054709156, + 0.22754832272154957, + 0.1559815130802516, + 0.10254761825442882, + 0.06442660473012998, + 0.03891099020654898, + 0.02242826992039175, + 0.01244756305418766, + 0.006635648542112594, + 0.0033434928688918465, + 0.0015591950868602612, + 6.494478379314242E-4, + 2.2955602096397197E-4, + 6.743345969174902E-5, + 1.4107940103572502E-5, + 1.7831017390912254E-6, + 6.069083084964396E-8, + 2.6456223770550034E-12, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.0838913244115331, - 0.8185039822134997, - 0.5996099513295594, - 0.4239061048422593, - 0.29021390801298175, - 0.1939771881723382, - 0.12781943099017448, - 0.08323537222558822, - 0.05401351458461964, - 0.034804015520294114, - 0.022183533201200683, - 0.013575037371122759, - 0.007950482799076255, - 0.004268111570193202, - 0.002077163533449736, - 8.866483154365411E-4, - 3.2369382633563046E-4, - 9.708763215144233E-5, - 2.3233015747400772E-5, - 3.788950162075414E-6 + 1.0884606849808087, + 0.8226090134805084, + 0.60320977982489, + 0.4269846229672716, + 0.2927736109328347, + 0.1960350442150399, + 0.12942123825411703, + 0.08446281815083542, + 0.054980222369216666, + 0.03561252176026163, + 0.02289629139010969, + 0.014203147185911199, + 0.008475170049458625, + 0.004661487242243586, + 0.002333789628006449, + 0.0010277319311107137, + 3.87678227442563E-4, + 1.2028053627471E-4, + 2.9730195737164675E-5, + 4.964851901415382E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 1.3756486749811019, - 1.0672034321925115, - 0.8018588558803024, - 0.585643632780618, - 0.41194792172946554, - 0.28417560940169995, - 0.19186187224119566, - 0.12722604674579227, - 0.08347887109569961, - 0.0541318845415661, - 0.034669543360500335, - 0.02177988735804654, - 0.01325709026473307, - 0.007686520459916847, - 0.0041646859316834504, - 0.002063638657919749, - 9.22162438469154E-4, - 3.649994243492455E-4, - 1.242339728485204E-4, - 3.525210235214357E-5 + 1.380326557353147, + 1.0714730267815589, + 0.8056674323202142, + 0.5889659276488419, + 0.4147631076554337, + 0.2865007651665381, + 0.19372468159638923, + 0.12868276451688443, + 0.08461848794600606, + 0.05505179766503515, + 0.03545037295484652, + 0.022464931565726712, + 0.013851316691061107, + 0.008172290245353086, + 0.004525067922560694, + 0.002299106142866939, + 0.0010553170863459296, + 4.292425672287436E-4, + 1.500874173984748E-4, + 4.367787680902291E-5 ] } } \ No newline at end of file