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 1a886f348fae575930f3455464a8cd27728a0018..d9c9eb6734faf5543934ca52c8fa2ce1a1e6cbcb 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-alaska-2023")); + NshmTestUtils.loadModel(NSHMS.get("nshm-conus-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 cff2744cdea9b9a6d203570484adf90d3d80489b..3bcaf76a4c1edc94be6bbd4b49787c56534e168d 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.3440825666549816, - 1.0008917245981888, - 0.7234956108557626, - 0.5070493999867541, - 0.3466180656169478, - 0.2289811506514314, - 0.14911678593107597, - 0.09419653258967511, - 0.058029430161019954, - 0.03441930876293443, - 0.01944671124146933, - 0.010315968670698075, - 0.005042038159861396, - 0.002218062335798769, - 8.564170566485347E-4, - 2.846735609201381E-4, - 7.580780687820939E-5, - 1.5419463515827804E-5, - 2.408463475627259E-6, - 2.58453629274014E-7 + 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 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.3541632399506991, - 0.2540102629952098, - 0.17693248761362718, - 0.11923191423928986, - 0.07711812051200516, - 0.04791373356420227, - 0.02823535014881556, - 0.01582096941128958, - 0.008361423517018572, - 0.004083355172905179, - 0.0018063464013144423, - 7.02129195194355E-4, - 2.2943257023579056E-4, - 6.158928686617357E-5, - 1.1580710849147123E-5, - 1.4494393611303762E-6, - 7.015046305148646E-8, - 9.264887170951166E-10, + 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, + 1.21794529978192E-7, + 1.6583407068056797E-9, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.8198507765511371, - 1.4240159538019967, - 1.0854917868037464, - 0.8020991615970595, - 0.5737259987561051, - 0.3971687987057286, - 0.26624147023989636, - 0.17205672662335889, - 0.10790211584626709, - 0.06562860556950098, - 0.03880197997715304, - 0.021724552146225623, - 0.011571739758989518, - 0.005596747679072055, - 0.002422305733116905, - 8.972483590860408E-4, - 2.7381738215088986E-4, - 6.413797993611816E-5, - 1.0587131063587416E-5, - 1.0151747424887275E-6 + 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 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.2802715358131564, - 1.8464219465382472, - 1.4525759151716588, - 1.1142216802100038, - 0.8251928200873969, - 0.5965474412251824, - 0.4178685520349377, - 0.28289074419272137, - 0.18570395178313934, - 0.11799972404200305, - 0.07271671448696379, - 0.043342904792801215, - 0.024806548644607344, - 0.0134537530643345, - 0.0067839840628682625, - 0.003097534745473696, - 0.0012534281761769049, - 4.368107172685528E-4, - 1.2472256997346013E-4, - 2.73684673298438E-5 + 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 ] } } \ 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 18202b1ef8a534b5ba9662f989268ed7aa3b1675..7d54c8faa0eb55d0fb2a3092dd579440e0181d76 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json @@ -23,25 +23,25 @@ 1.7119945007591924 ], "ys": [ - 0.6320987168540431, - 0.4728142049462827, - 0.34038669675255295, - 0.23369410989904157, - 0.1524639716449646, - 0.09252414732126395, - 0.05309537255028408, - 0.028144983363657235, - 0.013918752965654408, - 0.006365528010646979, - 0.0026884024769663548, - 0.001042633437111823, - 3.681390524975387E-4, - 1.1607547551148266E-4, - 3.1681523175536426E-5, - 7.187303388646201E-6, - 1.1631875283163874E-6, - 1.1765817840913328E-7, - 5.585316637675751E-9, + 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, + 1.2619367548125488E-7, + 5.665542846335971E-9, 4.3802562082764046E-11 ] }, @@ -69,23 +69,23 @@ 0.7929925155296614 ], "ys": [ - 0.20370178964554833, - 0.14078381603283013, - 0.09178465184691696, - 0.05618865110886457, - 0.03202984864074418, - 0.017052519408886014, - 0.008339876880769818, - 0.0037513807872335625, - 0.0015325666474055202, - 5.5485370220385E-4, - 1.75775844011697E-4, - 4.769122999838819E-5, - 1.0794530213682979E-5, - 2.1046942297499186E-6, - 3.072700404207737E-7, - 3.1490930601639096E-8, - 1.169405640423289E-9, + 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, + 3.7249956647577337E-7, + 3.492872689157643E-8, + 1.1854844117945035E-9, 7.721291928710127E-12, 0.0, 0.0 @@ -115,25 +115,25 @@ 1.6428726885203377 ], "ys": [ - 0.7786610941974275, - 0.6013694729024008, - 0.45099302976343014, - 0.32598118201249077, - 0.2259573697659527, - 0.1495787080237101, - 0.09423830428521976, - 0.05589402864374316, - 0.031196166206883112, - 0.01623987310121237, - 0.00789225493463842, - 0.003475986953970465, - 0.0014128223860962557, - 4.991694696732663E-4, - 1.4946684211447392E-4, - 3.487682928612633E-5, - 5.618425625572342E-6, - 4.652584956414771E-7, - 1.4007046969340297E-8, + 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, + 4.937329485744405E-7, + 1.4273015899612118E-8, 1.7289401638074338E-11 ] }, @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.9565165269755307, - 0.7618860838582626, - 0.5882439582502267, - 0.44155514955307984, - 0.3181697428215982, - 0.22209508309172682, - 0.14852302501515702, - 0.09455300758960838, - 0.05726692659711586, - 0.03271916742273143, - 0.017554218604857733, - 0.008783397085746547, - 0.004069919167570895, - 0.001727224715912384, - 6.572001807643121E-4, - 2.1564758129703076E-4, - 5.84279864046631E-5, - 1.2115162199716308E-5, - 1.5855276062703893E-6, - 9.954027332214819E-8 + 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 ] } } \ 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 def57d97baa3888eef2853d7078018e4d5480f5f..0c6646919a21bcdb25adddfc902074fdfda6412a 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.38246471730057385, - 0.28199187469681103, - 0.1989026470577615, - 0.13238210056170352, - 0.08236842021341398, - 0.04658813556284467, - 0.024431177628748964, - 0.01165772463480651, - 0.005206955950002294, - 0.002215797731790024, - 9.318394855783617E-4, - 3.939128396770014E-4, - 1.6605692192974634E-4, - 6.665332170681845E-5, - 2.3975279838593456E-5, - 7.2883174395195145E-6, - 1.6741687230670377E-6, - 2.5681222077673E-7, - 1.9559629876239413E-8, - 1.791784999565244E-10 + 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, + 6.823005284740018E-5, + 2.3251769378972825E-5, + 7.514188693753363E-6, + 2.121321581659188E-6, + 4.5544638086643076E-7, + 6.616480177939729E-8, + 4.838396012080843E-9, + 4.240103338446744E-11 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.1417149680832279, - 0.09811070203620345, - 0.06381870984084959, - 0.0389137708187399, - 0.02209171204890135, - 0.011701072223304671, - 0.005679901509578575, - 0.0025419397242937053, - 0.0010499706096350945, - 4.0304019223092206E-4, - 1.4801592608722076E-4, - 5.2777316017355865E-5, - 1.7812712913140534E-5, - 5.487141860032047E-6, - 1.3274375977149268E-6, - 2.391162247886854E-7, - 2.519341992451308E-8, - 9.81803873215754E-10, + 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, + 4.897967342053475E-6, + 1.3783636623081346E-6, + 3.190626395541543E-7, + 5.565592356249592E-8, + 5.7200155082606955E-9, + 2.200754931135628E-10, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.4518303961571106, - 0.3361539932291947, - 0.23723033626519874, - 0.1573838551217368, - 0.09736755300581498, - 0.05586032804739387, - 0.029802909989344258, - 0.014822326364778914, - 0.007056273475934936, - 0.003309551884507301, - 0.0015871291748257694, - 7.606026413560767E-4, - 3.6086275728194634E-4, - 1.5470729279674894E-4, - 5.7050549715708606E-5, - 1.6744146767839077E-5, - 3.6218645130838257E-6, - 4.893227215820594E-7, - 2.9804484056011287E-8, - 1.55110144581239E-11 + 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, + 1.694791920725093E-4, + 6.539278295747254E-5, + 2.1894897377050023E-5, + 5.854897732511006E-6, + 1.1481806468811455E-6, + 1.3857130577662447E-7, + 7.674264133978933E-9, + 4.082286883282843E-12 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.5457955591787409, - 0.42604881492727287, - 0.315434495156935, - 0.22186975916477397, - 0.14564190402190041, - 0.090051774549913, - 0.051712949423127416, - 0.027567673391940318, - 0.01390936234185338, - 0.006785506419042187, - 0.0033146832543299127, - 0.0016542113920706742, - 8.335685589110845E-4, - 4.0908385807999353E-4, - 1.859489930936979E-4, - 7.401153869817504E-5, - 2.4667152509986905E-5, - 6.516783088599301E-6, - 1.2322035323549118E-6, - 1.3715006456757767E-7 + 0.5402541699298197, + 0.4210761924468617, + 0.3110108479645288, + 0.2179545843994403, + 0.1422004854478377, + 0.08703596270506672, + 0.04910485567374209, + 0.025374443311690413, + 0.012143811247089596, + 0.005447185236977568, + 0.0023673440465465287, + 0.0010308518070662688, + 4.5427787126915817E-4, + 1.9831822940340378E-4, + 8.144750605185142E-5, + 2.9514021319872695E-5, + 8.988357941346196E-6, + 2.1636467855443225E-6, + 3.662141469275799E-7, + 3.63015145137678E-8 ] } } \ 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 f7bd10f536ace05112cf8395483fb8dfb969864d..c1661a6ab1ea96225f9ccba89311aeb637d7519b 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.2182803420114294, - 0.8574496042485652, - 0.5918755981269213, - 0.40287292598290003, - 0.2732267801666251, - 0.1830929120118432, - 0.12317269000183237, - 0.08130904336963711, - 0.052387527620741954, - 0.03228912142889926, - 0.018800008474553206, - 0.010232973419413094, - 0.005145268416794178, - 0.002346438811971296, - 9.486351159237272E-4, - 3.334608872430234E-4, - 9.55180635917751E-5, - 2.109162486981852E-5, - 3.357311879473734E-6, - 4.1435797220327204E-7 + 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 ] }, "5.00 Second Spectral Acceleration": { @@ -69,23 +69,23 @@ 0.7929925155296614 ], "ys": [ - 0.3190327821074316, - 0.2294756453908756, - 0.16291194531026654, - 0.11359423817751832, - 0.0767192012903854, - 0.04969670776105992, - 0.030224222241275852, - 0.017233556918615077, - 0.009170396956581504, - 0.004487288942061665, - 0.001985265099980338, - 7.719649708357043E-4, - 2.50955623906374E-4, - 6.620387912201338E-5, - 1.1556235986963051E-5, - 1.1842585716001614E-6, - 2.4878739657534253E-8, + 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, 1.6551032765075596E-12, 0.0, 0.0 @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.648507390512279, - 1.1973403595134637, - 0.844676180902315, - 0.5805289475757849, - 0.39203262657564036, - 0.262353970354856, - 0.17505277936226696, - 0.11615455212107985, - 0.07685501566080266, - 0.05017168250069021, - 0.031948717442017445, - 0.019245524006120313, - 0.011039916164388909, - 0.005828495533992994, - 0.0028032447654885834, - 0.0011815602303600428, - 4.2155603443956444E-4, - 1.2093439610009243E-4, - 2.629167398008241E-5, - 3.6931051834247554E-6 + 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 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.1915591092792415, - 1.668991154999679, - 1.2227746221500144, - 0.8702974814335537, - 0.5990513071609558, - 0.40787709359258634, - 0.2743701752359705, - 0.18291405264602803, - 0.12156615580647456, - 0.08020073847447144, - 0.052163222088929394, - 0.032938951169295363, - 0.01985586653927121, - 0.011276227136003045, - 0.005967942393614055, - 0.002892556634910174, - 0.0012644479687819999, - 4.872483917130571E-4, - 1.5881100554422444E-4, - 4.201511585193732E-5 + 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 ] } } \ 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 f513336e484995d3f1f5a716004bb09534a60212..33d4383a6f5dba3a52815de87a5577bf9724fc1b 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.923829626229814, - 0.687596517447317, - 0.4949988799202821, - 0.3422366964171211, - 0.228163742042017, - 0.14584415986403315, - 0.09229261849289407, - 0.05753828789074205, - 0.03582486558391648, - 0.021999974117690307, - 0.013121756857755254, - 0.007462613245977511, - 0.003967215386972748, - 0.0019275668449653957, - 8.343616462855667E-4, - 3.158655632768111E-4, - 9.912872807137403E-5, - 2.515625363401366E-5, - 4.5152358926643234E-6, - 6.683569635502279E-7 + 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 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.31277377907956727, - 0.22396368844793343, - 0.1539186700441765, - 0.10159387762746161, - 0.06414728960327955, - 0.03896132485221308, - 0.022598326984558617, - 0.012630945962042131, - 0.006788489665013073, - 0.0034507254457073625, - 0.001622210541145754, - 6.7974322321038E-4, - 2.410086019717049E-4, - 7.075125984645542E-5, - 1.4687928701006553E-5, - 1.820642920820435E-6, - 5.595987449991961E-8, - 2.6456223770550025E-12, + 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.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.0796725666078673, - 0.8147595562776813, - 0.5968832522827221, - 0.42255301684705826, - 0.29017342935385465, - 0.19483115376227125, - 0.1290662300537221, - 0.08451937273370701, - 0.055183894012526276, - 0.03584725460848318, - 0.023123089937364578, - 0.01440728887613703, - 0.008645775707586621, - 0.004788689997025725, - 0.0024160438776904274, - 0.0010724368539252367, - 4.0766460509190493E-4, - 1.2739388712435735E-4, - 3.1667843506288485E-5, - 5.29838278893573E-6 + 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 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 1.3713446251603143, - 1.0631848124359002, - 0.7986148931947824, - 0.5835782442218441, - 0.41121525975046264, - 0.28452991096491465, - 0.19288230887424165, - 0.12849834309547095, - 0.08473489422776943, - 0.05526959317178196, - 0.03568349823322594, - 0.02268402618861225, - 0.01404437369618748, - 0.008330099266232826, - 0.004641520449516875, - 0.002374599134535208, - 0.0010975891124798541, - 4.4940159951830267E-4, - 1.5808817413800832E-4, - 4.624105828472041E-5 + 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 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json index 6415ddf2a11656407ae300ff32e53983c8d5a66f..fe0a6ab2a822ff39e5029fbbf2535474bfa5f86f 100644 --- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json +++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json @@ -24,24 +24,24 @@ ], "ys": [ 0.03781690942134723, - 0.025609987126957223, + 0.025609987126957216, 0.016835178417561724, - 0.010675317900339302, - 0.006527977980738501, - 0.0037666741939616053, - 0.0020910571328798195, - 0.0010923590899631099, + 0.010675317900339298, + 0.006527977980738502, + 0.0037666741939616066, + 0.0020910571328798203, + 0.00109235908996311, 5.458772566494525E-4, - 2.610498573544114E-4, - 1.2062939801655835E-4, - 5.4113647550187295E-5, + 2.610498573544112E-4, + 1.2062939801655832E-4, + 5.411364755018729E-5, 2.3475389991093996E-5, 9.699580588310421E-6, - 3.7213621990011272E-6, + 3.7213621990011277E-6, 1.2984686317975075E-6, - 3.8820660002283157E-7, + 3.882066000228318E-7, 9.785045471794201E-8, - 1.9460378434836078E-8, + 1.946037843483607E-8, 2.742272834535854E-9 ] }, @@ -69,25 +69,25 @@ 0.7929925155296614 ], "ys": [ - 0.00921320730094861, - 0.006121721172229914, - 0.003927784889616464, + 0.009213207300948616, + 0.006121721172229911, + 0.003927784889616463, 0.002415843378135533, - 0.0014072769298912608, - 7.774423342976148E-4, - 4.0246930997587664E-4, - 1.97306342185757E-4, + 0.001407276929891261, + 7.774423342976145E-4, + 4.024693099758765E-4, + 1.9730634218575706E-4, 9.182408947706066E-5, 4.046584903685399E-5, - 1.7037600174972735E-5, - 6.866482223986138E-6, - 2.6160622771360315E-6, - 9.542403834324575E-7, - 3.1185607453236485E-7, - 9.181884057053901E-8, - 2.2848239268149787E-8, - 4.620311222721342E-9, - 6.936412711209974E-10, + 1.703760017497274E-5, + 6.8664822239861384E-6, + 2.616062277136032E-6, + 9.54240383432457E-7, + 3.1185607453236496E-7, + 9.181884057053902E-8, + 2.284823926814979E-8, + 4.620311222721341E-9, + 6.936412711209975E-10, 7.028579358099718E-11 ] }, @@ -116,25 +116,25 @@ ], "ys": [ 0.06599397975220576, - 0.04951601624256742, - 0.036513738982136494, - 0.026258583569526407, + 0.04951601624256741, + 0.0365137389821365, + 0.026258583569526418, 0.01833916291963425, - 0.012411914456006222, - 0.00814100683328957, + 0.012411914456006224, + 0.008141006833289569, 0.005152225174879873, 0.0031678998704058074, 0.001891726179226934, - 0.0011035470885633653, - 6.179966567302164E-4, - 3.385611975149566E-4, - 1.7630584453206914E-4, - 8.726172285630188E-5, - 3.982648113280291E-5, - 1.6325079063764057E-5, - 5.769066788130918E-6, - 1.7184900721224078E-6, - 3.963193550050803E-7 + 0.0011035470885633655, + 6.179966567302163E-4, + 3.3856119751495657E-4, + 1.763058445320691E-4, + 8.726172285630189E-5, + 3.9826481132802925E-5, + 1.632507906376405E-5, + 5.769066788130917E-6, + 1.7184900721224076E-6, + 3.963193550050804E-7 ] }, "0.20 Second Spectral Acceleration": { @@ -162,25 +162,25 @@ ], "ys": [ 0.09353115905390524, - 0.07030167366690492, - 0.05123931616345852, - 0.036305811456412915, - 0.02463598560501443, - 0.016213078359687386, - 0.010249801865790503, - 0.00621229879543901, - 0.0036307543903602354, + 0.07030167366690494, + 0.05123931616345851, + 0.03630581145641292, + 0.024635985605014437, + 0.016213078359687383, + 0.010249801865790505, + 0.006212298795439012, + 0.003630754390360235, 0.0020431384223740224, - 0.0011103316932372833, - 5.822894133817992E-4, - 2.9401954680419515E-4, + 0.001110331693237283, + 5.822894133817991E-4, + 2.940195468041952E-4, 1.421467305260284E-4, - 6.507484914740439E-5, - 2.7625833026584582E-5, - 1.0658990087928291E-5, - 3.622386410973509E-6, + 6.507484914740443E-5, + 2.7625833026584586E-5, + 1.0658990087928288E-5, + 3.6223864109735097E-6, 1.0342006360285488E-6, - 2.364746742386964E-7 + 2.3647467423869639E-7 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json index a8c88cbb891992ff79ba3736cdf00f6b19c2fad9..ad6fc7160f93d542188037446372e7e4f909a24c 100644 --- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json +++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json @@ -23,25 +23,25 @@ 1.7119945007591924 ], "ys": [ - 0.033248932975807534, - 0.022004430731850974, - 0.01431014674567471, - 0.009151237164552267, - 0.005779612247836648, - 0.003514027131008825, - 0.00205528945527747, - 0.0011024807090991673, - 5.332789224579896E-4, - 2.250206167929638E-4, - 8.13245469141179E-5, - 2.4983602810937422E-5, - 6.682951495042381E-6, + 0.03324893310902484, + 0.022004431105884844, + 0.014310147752740471, + 0.009151239631673424, + 0.005779616772275175, + 0.00351403260771589, + 0.0020552936759178292, + 0.001102482842375513, + 5.332796764095532E-4, + 2.2502078443087175E-4, + 8.132456018629313E-5, + 2.498360281093742E-5, + 6.6829514950423814E-6, 1.7449632407250264E-6, - 4.909788509372823E-7, - 1.568434844141301E-7, + 4.909788509372824E-7, + 1.5684348441413014E-7, 4.415991214768775E-8, - 1.0492474877263187E-8, - 1.9576567710691036E-9, + 1.0492474877263184E-8, + 1.957656771069103E-9, 2.5802146447004877E-10 ] }, @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.010005966687589418, - 0.00702013801632578, - 0.004946068441225724, - 0.0034831491901766163, - 0.0023991264653615485, - 0.0015793590399934081, - 9.569573584680407E-4, - 5.209840505848331E-4, - 2.473502908707197E-4, - 9.904659977269298E-5, - 3.2778676784408135E-5, - 8.712990458832452E-6, - 1.790453986052243E-6, - 3.053453022508045E-7, + 0.01000596693045542, + 0.007020138549279936, + 0.004946069582032202, + 0.003483151215561255, + 0.0023991290974655823, + 0.0015793614229230991, + 9.569588656999184E-4, + 5.209847415833336E-4, + 2.473505223610801E-4, + 9.904665205541753E-5, + 3.2778684521866866E-5, + 8.712990693707895E-6, + 1.7904539860522435E-6, + 3.0534530225080447E-7, 4.5864222733130684E-8, 9.67071147027627E-9, - 2.356295044576553E-9, + 2.3562950445765526E-9, 4.914029457128014E-10, - 7.99798410640728E-11, - 9.381018392075355E-12 + 7.997984106407277E-11, + 9.381018392075353E-12 ] }, "Peak Ground Acceleration": { @@ -115,25 +115,25 @@ 1.6428726885203377 ], "ys": [ - 0.04088625392611982, - 0.027424345468980312, - 0.018219032819005592, - 0.01193441984399173, - 0.007663005702927, - 0.004765107676278687, - 0.002828226723909663, - 0.0015783057416946847, - 8.390687838893623E-4, - 4.3180039393759585E-4, - 2.2144130093824588E-4, - 1.1266780677970619E-4, + 0.04088625408517391, + 0.027424345917626186, + 0.018219034045095478, + 0.011934422965670084, + 0.007663011513102013, + 0.004765114308889276, + 0.0028282312853084657, + 0.0015783077414236477, + 8.390693640246434E-4, + 4.318004979848099E-4, + 2.2144131101680203E-4, + 1.1266780710891708E-4, 5.821356278132562E-5, - 2.9316226798325768E-5, - 1.4233176969030014E-5, - 6.4074677021284365E-6, - 2.5948292983347626E-6, - 9.058302958854361E-7, - 2.664550977482878E-7, + 2.931622679832576E-5, + 1.423317696903001E-5, + 6.407467702128437E-6, + 2.5948292983347613E-6, + 9.05830295885436E-7, + 2.664550977482879E-7, 6.060200630189975E-8 ] }, @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.06915547654099248, - 0.04697296435990007, - 0.030953929390360714, - 0.020002699548950176, - 0.012514406084671512, - 0.007683314792693457, - 0.004524340549673255, - 0.0025095586082908472, - 0.0013038136003968562, - 6.313142379345734E-4, - 2.8898317204236384E-4, - 1.2787451396826225E-4, + 0.06915547672860357, + 0.04697296493489196, + 0.030953931061635513, + 0.020002703636453706, + 0.012514413169193663, + 0.007683322438550792, + 0.004524345762442763, + 0.0025095609630764112, + 0.0013038143445699912, + 6.313143767624348E-4, + 2.889831873797796E-4, + 1.2787451423137354E-4, 5.6009010931444306E-5, - 2.444851739501035E-5, - 1.0472190893854823E-5, + 2.4448517395010354E-5, + 1.0472190893854825E-5, 4.248516889956776E-6, - 1.5807570795442498E-6, + 1.58075707954425E-6, 5.190573795746768E-7, 1.4267651060313717E-7, - 3.112422839449763E-8 + 3.1124228394497636E-8 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json index 4d4ac0e69d89cf74ac40a8423b04df3d8982483b..5b374db83ce20564d2c89a3f0e344ea26c03d50e 100644 --- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json +++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.7861256274006418, - 0.5989845281809747, - 0.44178710853742936, - 0.31489693844186456, - 0.2172511808878113, - 0.14268936390272952, - 0.09045603403859905, - 0.054318972441494084, - 0.031214717859762035, - 0.0170865257117781, - 0.00892257650901468, - 0.004448978174927227, - 0.002112848660543876, - 9.403205195932508E-4, - 3.800010101129114E-4, - 1.346451213810742E-4, - 3.8535958882355275E-5, - 8.358918768404667E-6, - 1.0859948521659746E-6, - 5.1172064901400866E-8 + 0.786819911296504, + 0.5989977644133435, + 0.44119197993150483, + 0.3138521723362104, + 0.21596233731930775, + 0.14138659682005233, + 0.08936173981821659, + 0.053571206921636506, + 0.030805802165079648, + 0.01691363012419211, + 0.00887050490251598, + 0.004442451953532403, + 0.00211670264649697, + 9.438419330811554E-4, + 3.819154377529803E-4, + 1.3550505201544378E-4, + 3.8845344810999264E-5, + 8.454437599000299E-6, + 1.1049521824670764E-6, + 5.2588487621771735E-8 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.25577789943679063, - 0.18761825960822165, - 0.13308663911206198, - 0.09072990861896044, - 0.059078273104765905, - 0.03702058555885762, - 0.02222079213987068, - 0.012823158013111067, - 0.007012346589535411, - 0.0035422381968746646, - 0.001627451404048812, - 6.719399636415486E-4, - 2.449417739526587E-4, - 8.050672115201703E-5, - 2.2615406267025697E-5, - 5.458919366414978E-6, - 9.981531579391535E-7, - 1.1692631975501546E-7, - 5.887351944991533E-9, - 2.4982688465632896E-14 + 0.2542942042981856, + 0.18604400068217566, + 0.13154249673339402, + 0.08937408116256132, + 0.05805899608181195, + 0.03638627009097949, + 0.021907366190621492, + 0.01270510711275724, + 0.006983625116279073, + 0.0035421863469641407, + 0.0016310845082246523, + 6.735434870800991E-4, + 2.4513239707115337E-4, + 8.03508366264512E-5, + 2.2497141682863387E-5, + 5.4211128874109765E-6, + 9.955933871382086E-7, + 1.1798184600469259E-7, + 6.032781739742643E-9, + 3.1737259531833734E-14 ] }, "Peak Ground Acceleration": { @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.9042474304661192, - 0.7163134812226057, - 0.555260160093929, - 0.42092435496932423, - 0.3115543462980755, - 0.22381974398147034, - 0.15468937874039798, - 0.1013382935885788, - 0.06267724361287551, - 0.0362836762500632, - 0.019672712158650678, - 0.009788542402245332, - 0.004615467398400184, - 0.002005284986675216, - 7.932024294083827E-4, - 2.672610507615473E-4, - 7.112364974736323E-5, - 1.3412170955555731E-5, - 1.5341794402698255E-6, - 5.6621427993653757E-8 + 0.9060050847592981, + 0.7175752781536691, + 0.5558555506966582, + 0.42078460768848186, + 0.31075933496399283, + 0.22259208943416386, + 0.15336119255340921, + 0.10025626794045822, + 0.0620233986634114, + 0.03600102576167425, + 0.019590569749519476, + 0.009779698336973813, + 0.004621183161915629, + 0.0020103826897193175, + 7.962597777072059E-4, + 2.687947423527658E-4, + 7.171139765481873E-5, + 1.3578410116556566E-5, + 1.5629304265358868E-6, + 5.830091651054837E-8 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 1.0684659703491564, - 0.873171618019982, - 0.6943090177998219, - 0.5411063095678713, - 0.4105958271632752, - 0.30606376278716946, - 0.221451727180247, - 0.15394776614886982, - 0.10218175385025141, - 0.06406507354930577, - 0.03777170148296864, - 0.020873423304268182, - 0.010824393734357573, - 0.005290495214284608, - 0.002432660302382677, - 0.0010268032557722608, - 3.8378304628023454E-4, - 1.2050795680267754E-4, - 2.930932186964294E-5, - 4.968929038315209E-6 + 1.0704911249635107, + 0.8749088267603049, + 0.6955542515773959, + 0.5416958681657765, + 0.4104584089252401, + 0.30531106839534905, + 0.22031724779258055, + 0.1527501072974481, + 0.10121660039467142, + 0.06347142603560565, + 0.03749794864850485, + 0.020783089957195106, + 0.010808160040269188, + 0.0052941181283052766, + 0.0024377564292367812, + 0.0010302190494455154, + 3.8564882358079914E-4, + 1.2133563966813449E-4, + 2.959166719348735E-5, + 5.041371572081886E-6 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json index 085e8344e57b2d629163244654fd0f65fe52bdf7..c7e628963db3207517d111b44772edd60afcf32a 100644 --- a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json +++ b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.11534974599388689, - 0.08698148362667114, - 0.06406292276154266, - 0.04607819240390104, - 0.032536374614912766, - 0.022366693833913126, - 0.015293415275611741, - 0.010356859824249123, - 0.007106468958929246, - 0.005007060988711429, - 0.0036674043082438913, - 0.002770834408457376, - 0.0020867583438866017, - 0.0014878111206644193, - 9.53510459139586E-4, - 5.308911889067074E-4, - 2.463291206258684E-4, - 9.459961578509016E-5, - 2.8905528069398842E-5, - 6.721430339032403E-6 + 0.11534974599388692, + 0.08698148362667113, + 0.06406292276167219, + 0.046078192405115966, + 0.03253637462327355, + 0.022366693877149554, + 0.015293415446741954, + 0.010356860424666315, + 0.0071064708130948295, + 0.005007065846783981, + 0.003667414131534427, + 0.002770848786775516, + 0.0020867731377499964, + 0.001487821691947794, + 9.535157338758259E-4, + 5.30892978375666E-4, + 2.463295318863031E-4, + 9.45996695314454E-5, + 2.8905529125483268E-5, + 6.721429379688255E-6 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.026538247124583452, - 0.01906655325743319, - 0.013626789930696178, - 0.009766412237613655, - 0.007066016574296356, - 0.0052395124401609025, - 0.004007437426269736, - 0.003191463995469442, - 0.00261800813308166, - 0.0021443067134172644, - 0.0016873885021127446, - 0.0012325476136429642, - 8.112590214694932E-4, - 4.762083128043084E-4, - 2.3778964735335535E-4, - 1.010484850557649E-4, - 3.5068633012149294E-5, - 9.656024770780149E-6, - 1.971219304214483E-6, - 2.7985561680293366E-7 + 0.02653824712720612, + 0.01906655327064791, + 0.0136267899834865, + 0.009766412410391969, + 0.007066017083512371, + 0.00523951388261743, + 0.004007441363707505, + 0.003191472930812207, + 0.002618022856257823, + 0.002144323130572638, + 0.0016874006667018076, + 0.001232553642822115, + 8.112607839937965E-4, + 4.7620846546351104E-4, + 2.377895200044316E-4, + 1.0104841608143458E-4, + 3.5068623684891964E-5, + 9.656025948555974E-6, + 1.971220245968162E-6, + 2.7985578953711946E-7 ] }, "Peak Ground Acceleration": { @@ -116,25 +116,25 @@ ], "ys": [ 0.20082676064116864, - 0.17303158482719186, - 0.1459417963970869, - 0.11988197257482014, - 0.09577256744724875, - 0.07448415764939256, - 0.05653535017187785, - 0.041839648586159454, - 0.03035918142088443, - 0.021603538451821294, - 0.015147906115404963, - 0.010380521885945636, - 0.007086879488558684, - 0.004776413456606938, - 0.00319403387729187, - 0.0020630276122096014, - 0.0012314769759767578, - 6.362928873656395E-4, - 2.713302646244539E-4, - 8.845951396062711E-5 + 0.17303158482719158, + 0.14594179639708083, + 0.11988197257474566, + 0.09577256744660777, + 0.07448415764500856, + 0.05653535014883013, + 0.041839648477448414, + 0.0303591809822878, + 0.021603536983251643, + 0.015147902209371055, + 0.010380513858986461, + 0.0070868686399283305, + 0.004776405847494424, + 0.003194033664349469, + 0.002063032278608447, + 0.0012314821193950326, + 6.362959860235963E-4, + 2.7133142360006776E-4, + 8.845979888500936E-5 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.23235672977120583, - 0.20103085787724262, - 0.16949594749416608, - 0.1389712314357317, - 0.10971503991299225, - 0.0841732445025764, - 0.06257442666476448, - 0.04514436991032576, - 0.031785772780841534, - 0.021843268783531003, - 0.014712773387355172, - 0.00977524575818233, - 0.006484415699356289, - 0.004352483302960769, - 0.0029609704858198937, - 0.0019882511946060395, - 0.0012501956452844794, - 6.867847039996852E-4, - 3.083784144712191E-4, - 1.0832132678542519E-4 + 0.23235672977120586, + 0.20103085787724265, + 0.16949594749416605, + 0.1389712314357324, + 0.10971503991301251, + 0.08417324450282236, + 0.06257442666659783, + 0.045144369921103045, + 0.03178577283279019, + 0.02184326900023674, + 0.014712774190862494, + 0.009775248303873083, + 0.006484422014715583, + 0.004352494841555027, + 0.0029609855726470823, + 0.0019882654343830203, + 0.0012502056040323956, + 6.867898974882982E-4, + 3.0838031869483585E-4, + 1.083218280210284E-4 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json index 42d71941900baa9e0a72db31fbde95b55546200c..b4f11335ee841f08c501ef6c710079a4f93e731c 100644 --- a/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json +++ b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.0382624680623094, - 0.026030463448604713, - 0.017155400855241892, + 0.038262468062309395, + 0.02603046344860471, + 0.01715540085524189, 0.010885390093212639, 0.006660097241570286, - 0.003858088495130119, + 0.0038580884951301187, 0.002166326100789246, - 0.0011583421935267538, - 6.009032500164475E-4, - 3.0233926709153134E-4, - 1.4817587290785013E-4, - 7.05010480857786E-5, - 3.218992880314699E-5, + 0.0011583421935267536, + 6.009032500164473E-4, + 3.0233926709153145E-4, + 1.4817587290785015E-4, + 7.050104808577863E-5, + 3.218992880314698E-5, 1.3832096806263695E-5, 5.4595298421187765E-6, - 1.9428392150340858E-6, - 5.888734403531785E-7, + 1.9428392150340854E-6, + 5.888734403531786E-7, 1.497447089129761E-7, - 2.995182697021266E-8, - 4.239346142112846E-9 + 2.995182697021267E-8, + 4.2393461421128455E-9 ] }, "5.00 Second Spectral Acceleration": { @@ -70,25 +70,25 @@ ], "ys": [ 0.009600199498981162, - 0.0063205981405685535, - 0.003998495592416972, - 0.0024209681163326075, - 0.0013922805998762867, + 0.006320598140568551, + 0.003998495592416971, + 0.002420968116332609, + 0.0013922805998762865, 7.653511087722585E-4, - 3.9910028144341994E-4, - 2.0013103147428781E-4, - 9.684010210476128E-5, - 4.501923579779384E-5, - 2.0158227838894865E-5, - 8.640044965400361E-6, - 3.4752442404719263E-6, + 3.9910028144342E-4, + 2.0013103147428787E-4, + 9.684010210476125E-5, + 4.5019235797793824E-5, + 2.015822783889487E-5, + 8.64004496540036E-6, + 3.4752442404719267E-6, 1.3213285385796123E-6, 4.448966364141142E-7, - 1.3385272064306844E-7, + 1.3385272064306846E-7, 3.3837155590627995E-8, 6.921729172485613E-9, 1.0496384684360477E-9, - 1.0719894546654213E-10 + 1.0719894546654211E-10 ] }, "Peak Ground Acceleration": { @@ -116,25 +116,25 @@ ], "ys": [ 0.06295212478082786, - 0.04804845815748258, - 0.0361916108234815, + 0.04804845815748259, + 0.03619161082348151, 0.02671527513051389, - 0.019260736860335047, - 0.013535182229688407, - 0.009262342125760424, - 0.0061366371766337, - 0.003951706514772566, - 0.0024672025970475927, - 0.0014990249509793995, - 8.710019776437943E-4, - 4.921002498934159E-4, - 2.6283929164592823E-4, - 1.32628712707116E-4, - 6.141179303724588E-5, - 2.5443650259819518E-5, - 9.06649630578154E-6, - 2.719577797059732E-6, - 6.313004310982962E-7 + 0.019260736860335054, + 0.013535182229688402, + 0.009262342125760423, + 0.0061366371766336985, + 0.003951706514772565, + 0.002467202597047593, + 0.0014990249509793992, + 8.710019776437942E-4, + 4.921002498934158E-4, + 2.6283929164592834E-4, + 1.3262871270711604E-4, + 6.14117930372459E-5, + 2.5443650259819508E-5, + 9.066496305781536E-6, + 2.719577797059731E-6, + 6.313004310982963E-7 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.08776972431938843, + 0.0877697243193884, 0.06659157694814946, 0.049225799499276135, 0.03552861479492543, - 0.02468851859966506, - 0.016720836145648118, + 0.024688518599665057, + 0.016720836145648114, 0.010940274062286886, - 0.006899372453907445, - 0.004211132882578023, + 0.006899372453907444, + 0.004211132882578024, 0.002479522815087655, - 0.001409241543382924, - 7.711400309583003E-4, - 4.0474448623951226E-4, + 0.0014092415433829236, + 7.711400309583002E-4, + 4.0474448623951237E-4, 2.0238516038224294E-4, - 9.527876089291164E-5, - 4.1346212984332834E-5, - 1.6214324144157022E-5, - 5.575162343216449E-6, - 1.6050336029577975E-6, - 3.691356182224788E-7 + 9.527876089291167E-5, + 4.134621298433283E-5, + 1.6214324144157026E-5, + 5.575162343216447E-6, + 1.6050336029577978E-6, + 3.6913561822247894E-7 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json index b42763610de1929021ba58fb7d9bcf09c48ba5f2..6bcef8843f0d819bf0904e922ec7eb8afcaeb3ac 100644 --- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json +++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.42212502649377304, - 0.29738112691459695, - 0.2012679014531543, - 0.13044692323362067, - 0.08152056301045103, - 0.04869364467176138, - 0.028695190917276063, - 0.016523907454214105, - 0.009459674347354344, - 0.005328379048304574, - 0.002897020547979491, - 0.001469627807835112, - 6.673308946575371E-4, - 2.602105434958046E-4, - 8.332727616962186E-5, - 2.0728946935233224E-5, - 3.430095638283392E-6, - 3.0002413499362626E-7, - 5.04748097670551E-9, - 9.990197364333357E-12 + 0.42208946071091547, + 0.2974192992829224, + 0.20135076585285114, + 0.1305395246849512, + 0.0815970067558681, + 0.048744740501394795, + 0.028725892277458667, + 0.016541985226090673, + 0.009470995324371843, + 0.005335755665961307, + 0.002901525464829851, + 0.0014719781786799477, + 6.683264181931445E-4, + 2.605397174213752E-4, + 8.3404708447151E-5, + 2.0739047848048297E-5, + 3.4299913798081007E-6, + 2.997988841557021E-7, + 5.025722906176405E-9, + 1.0054998350751101E-11 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.111498681460259, - 0.07601746157010315, - 0.050128618110159194, - 0.0319921408152047, - 0.019690090614806144, - 0.01177321839093505, - 0.006768192511942777, - 0.0037296607200715424, - 0.0019288561668765758, - 9.06228274331759E-4, - 3.764228267595404E-4, - 1.3359644176120193E-4, - 3.8492226423461743E-5, - 8.852651705907728E-6, - 1.3238780414890474E-6, - 1.1444246640845231E-7, - 3.993244478747749E-9, - 4.638823055262254E-11, + 0.11164429388903, + 0.07615027439606956, + 0.05022756412049563, + 0.03205463978596522, + 0.019725440887377196, + 0.01179269779117072, + 0.006779075962713359, + 0.0037356672166708156, + 0.0019318485274554854, + 9.074369294380869E-4, + 3.767767567965271E-4, + 1.3364910505404506E-4, + 3.848011036543469E-5, + 8.843590615521889E-6, + 1.3209823866585529E-6, + 1.1402111764402845E-7, + 3.993898781907206E-9, + 4.57747291671781E-11, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.45994976034367546, - 0.33192670036058586, - 0.2340274876993086, - 0.16148941844060113, - 0.10971082412925579, - 0.0736605424984263, - 0.048801721759559574, - 0.0315049698441156, - 0.01972524205216649, - 0.011855302990077317, - 0.006822578787511987, - 0.0036327429628068525, - 0.0017695786326307821, - 7.321190638062839E-4, - 2.491049199135366E-4, - 6.534818180503298E-5, - 1.2266983320670577E-5, - 1.4621311496124262E-6, - 9.202859673229499E-8, - 1.7823388593584575E-10 + 0.4599333220939226, + 0.3319776608862077, + 0.23410088529558729, + 0.16155236244329693, + 0.10975325964274066, + 0.07368639683099817, + 0.04881766791656007, + 0.031516148212009015, + 0.019734501735053228, + 0.01186342197497338, + 0.006829116483982683, + 0.003637082921969351, + 0.0017718723024865678, + 7.330347632042515E-4, + 2.493797124513596E-4, + 6.540576160652672E-5, + 1.2274495294260517E-5, + 1.4624587583248914E-6, + 9.203515745538137E-8, + 1.7885452404470933E-10 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.5782777275404754, - 0.43177801141301875, - 0.3127055781572106, - 0.22197835414790007, - 0.15369265158070425, - 0.10587801833603583, - 0.07211557105421904, - 0.04833001674514323, - 0.03175516846533465, - 0.020229156251361874, - 0.012416493920846233, - 0.007289300312521032, - 0.004041653618198151, - 0.002059717852198649, - 9.268336227023085E-4, - 3.5162877831314076E-4, - 1.0845936730321908E-4, - 2.5669432808973103E-5, - 4.190919400719718E-6, - 4.0120078945548897E-7 + 0.5781960731971703, + 0.43177321810324454, + 0.31274271601333864, + 0.22202526342481693, + 0.15373200297637596, + 0.10590597476401897, + 0.07213416807145692, + 0.048342735627774275, + 0.03176496757190812, + 0.020237744450034734, + 0.012424276707916994, + 0.007295810162387152, + 0.004046292522385159, + 0.0020624086591356215, + 9.280676384800567E-4, + 3.520639158917028E-4, + 1.0857330290598699E-4, + 2.568936875118568E-5, + 4.192750625801088E-6, + 4.01123348460218E-7 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json index cb8381cce629ec75777f95a77fef7734eedf1964..5b0ad4f6ea6ba92f27a5e4e04a14e13e4a25e281 100644 --- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json +++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.10662747502015506, - 0.07824745874887089, - 0.056091870987101874, - 0.039320770881321285, - 0.02707477624345603, - 0.018077383676974656, - 0.01192724710389813, - 0.007736511888429048, - 0.0050742304470271634, - 0.0034040628997962373, - 0.0023210416841587104, - 0.0015493043799057892, - 9.574279836779237E-4, - 5.184559622369991E-4, - 2.3534401094188283E-4, - 8.698764067121893E-5, - 2.4248670614229247E-5, - 4.6302126109152885E-6, - 4.43858088517366E-7, - 1.3355893224873728E-8 + 0.10661956825578006, + 0.07825519171496548, + 0.0561094891689216, + 0.039341880324394375, + 0.02709410074929607, + 0.018091891653570336, + 0.011936507040030752, + 0.007741438737676913, + 0.005076325830295601, + 0.00340464389948409, + 0.002321055813108433, + 0.0015492739820206014, + 9.575059527875631E-4, + 5.18588452697687E-4, + 2.3545109060021696E-4, + 8.704532042458257E-5, + 2.427075127671637E-5, + 4.6354399691063655E-6, + 4.445186505995051E-7, + 1.3362154203028717E-8 ] }, "5.00 Second Spectral Acceleration": { @@ -69,25 +69,25 @@ 0.7929925155296614 ], "ys": [ - 0.03665438396310691, - 0.02738805270638351, - 0.01998790081295311, - 0.014165414160249721, - 0.009700583522822612, - 0.00648359831750369, - 0.004245257664732486, - 0.002758785048964952, - 0.0017643505845777309, - 0.0010767412890013348, - 6.040511352284146E-4, - 2.9961209470146037E-4, - 1.265814814782601E-4, - 4.554072437158029E-5, - 1.2790138132427735E-5, - 2.8081211450382065E-6, - 4.3717215651111337E-7, - 3.77685473965977E-8, - 9.634309743020169E-10, + 0.036680532988787325, + 0.027414530535075986, + 0.02001079626050058, + 0.014182599832325685, + 0.00971186969071408, + 0.006490198649420548, + 0.004248749262339053, + 0.002760588932101651, + 0.0017653871994333199, + 0.0010774435275250059, + 6.045404997728946E-4, + 2.999097181329959E-4, + 1.2672661498885026E-4, + 4.5597555745573066E-5, + 1.2806028374110111E-5, + 2.811031292211179E-6, + 4.3749715102153516E-7, + 3.7783452369069785E-8, + 9.623240540872695E-10, 0.0 ] }, @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.13500365537985798, - 0.10345493494400575, - 0.07691082889167974, - 0.0554702283260215, - 0.03898536548716778, - 0.02677372539294796, - 0.017960592844293032, - 0.01173308456816988, - 0.007604299932426304, - 0.005000182036487227, - 0.0034065951626395512, - 0.002344776789260097, - 0.0015594290260343632, - 9.076193041089385E-4, - 4.3300627289257106E-4, - 1.58719008812913E-4, - 4.253456727941867E-5, - 7.415937310112057E-6, - 7.194265576331567E-7, - 2.2615219428815083E-8 + 0.13499314894527403, + 0.10345943672061181, + 0.07692399077316703, + 0.05548620988443223, + 0.03900001317460326, + 0.02678500066257991, + 0.017968206202401048, + 0.01173766157331265, + 0.007606679496527605, + 0.005001050150819256, + 0.0034065854722393333, + 0.002344470201826488, + 0.0015592089355909338, + 9.075635513349779E-4, + 4.330276156939576E-4, + 1.5874554685976004E-4, + 4.254754130488548E-5, + 7.419397242177774E-6, + 7.200876073546254E-7, + 2.266803290550335E-8 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.17291724335793995, - 0.13759730777491522, - 0.10543454027616725, - 0.07823088194864494, - 0.05587378251335148, - 0.03914588891973307, - 0.02681249454612485, - 0.017941886971684428, - 0.01181098901962554, - 0.007728112429025758, - 0.005140475317016782, - 0.003526076721310917, - 0.0024641322856577543, - 0.0016699681944861184, - 0.001022094397749822, - 5.275932663673121E-4, - 2.1971683601067104E-4, - 7.113728845829075E-5, - 1.6596703079460176E-5, - 2.385283030192395E-6 + 0.17288418755864438, + 0.1375827374341671, + 0.1054346371433752, + 0.07824019989964623, + 0.055887122092807634, + 0.039159099313921884, + 0.02682324594932466, + 0.017949410300669166, + 0.011815578180490236, + 0.007730434545688283, + 0.005141237870537882, + 0.0035259505457939508, + 0.0024637091317716063, + 0.0016696333053445832, + 0.0010219552979188978, + 5.275816856796742E-4, + 2.1974043251097854E-4, + 7.115551098628321E-5, + 1.660393923546466E-5, + 2.386951424389801E-6 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json index 9413c7183660057c3bd3edac8198a5d2bb34dc7e..96cf327400d2471f892810d0aa52fd2f92a24d92 100644 --- a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json +++ b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.7414998964063673, - 0.5469825926618301, - 0.38971117566151425, - 0.2694131887482407, - 0.18248138130544123, - 0.11998361727000893, - 0.0780164189032327, - 0.04928733725433292, - 0.030386848047700046, - 0.018015525031005102, - 0.010102228291589571, - 0.00521531764925403, - 0.002390411223684912, - 9.33210788583472E-4, - 2.9581233070494976E-4, - 7.197226801761037E-5, - 1.0559295017329668E-5, - 5.805498062701054E-7, - 4.862857760166867E-9, - 4.2479055018244156E-11 + 0.7412169588394697, + 0.5467816001080601, + 0.38957338716575196, + 0.26932234854741943, + 0.182424277120165, + 0.11994931531037087, + 0.07799445393522517, + 0.04927159721001212, + 0.030375182622177848, + 0.01800756632149536, + 0.010097345897268723, + 0.005212677576971366, + 0.0023891867079266814, + 9.327503975257338E-4, + 2.9569280246056746E-4, + 7.19503902368207E-5, + 1.056522123963837E-5, + 5.827805191672568E-7, + 4.900618906359252E-9, + 4.275203391051003E-11 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.19992959462896037, - 0.14546915914024833, - 0.10403551991428747, - 0.0726165464707252, - 0.04898473859984037, - 0.03202306657154465, - 0.02022395151197516, - 0.012507813092595313, - 0.007566773456109788, - 0.004369536075962934, - 0.0023280616777193227, - 0.0010969788110140014, - 4.348917591960088E-4, - 1.4267056837862207E-4, - 3.471982208651822E-5, - 5.724895533671951E-6, - 4.6258031648876124E-7, - 1.0222199240583624E-8, + 0.1998955891950991, + 0.14547596255901285, + 0.1040587366961149, + 0.07263565013186658, + 0.04899227095970393, + 0.032022217251309874, + 0.02022028637021548, + 0.012504335812702614, + 0.007563994237079135, + 0.004367450760105192, + 0.0023268221251636764, + 0.0010965179514701422, + 4.3485245282467544E-4, + 1.4274115123127657E-4, + 3.477749217799798E-5, + 5.745950716089173E-6, + 4.6551996044968885E-7, + 1.0273248639993878E-8, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.9418368334125156, - 0.7410824752094365, - 0.563893640738115, - 0.4144116097409703, - 0.29540893675081137, - 0.20560783060137477, - 0.1405926771567993, - 0.09411483915522897, - 0.061554354313573374, - 0.03872333902031023, - 0.023073802645724326, - 0.012426966243635127, - 0.005947198670516641, - 0.002344991572745251, - 7.324192597494559E-4, - 1.6624190837342354E-4, - 2.3734193681538178E-5, - 1.361253407355696E-6, - 1.1661972123115863E-8, - 2.5706593982055043E-11 + 0.9414810535304671, + 0.7408139550713904, + 0.5636943361968325, + 0.41426552866931143, + 0.2953033077217156, + 0.20553134899726505, + 0.14053637018176046, + 0.09407347568516078, + 0.0615250729989172, + 0.03870406669911486, + 0.02306213495313035, + 0.012420643569475764, + 0.00594417702025036, + 0.0023438054706417, + 7.320751296367926E-4, + 1.661797539916622E-4, + 2.3733810312619126E-5, + 1.363751935901511E-6, + 1.1752390713919063E-8, + 2.588602412382955E-11 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 1.1099435923175802, - 0.9078276539543046, - 0.7165840413403475, - 0.548010015240053, - 0.4032282933894171, - 0.29015420479250437, - 0.2038628791958532, - 0.140261687193993, - 0.09494365539179192, - 0.0627955438519581, - 0.04017490300048231, - 0.024380181717989054, - 0.013644102924641046, - 0.006798390728142324, - 0.0029020596908909796, - 0.0010132311791573004, - 2.767711862061153E-4, - 5.475591918385992E-5, - 6.204316708999662E-6, - 2.2133231196817714E-7 + 1.109513010115341, + 0.9074836796534743, + 0.7163173946179702, + 0.5478080266286055, + 0.4030794739346962, + 0.2900437497773374, + 0.20377843046247973, + 0.14019609095348026, + 0.09489458579824983, + 0.06276169954459061, + 0.04015343702197098, + 0.024367531915021563, + 0.013637174500766009, + 0.006794975303810369, + 0.0029006200492462564, + 0.0010127375521486687, + 2.766551097246086E-4, + 5.473721307536003E-5, + 6.2062973056638875E-6, + 2.2239402021916294E-7 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json index 7af0814cb23f1fdd633dcd4d1d9a31709787f677..3de9d73216c8092b865bf0643e4c3fdff4e21223 100644 --- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json +++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.2723408664079977, - 0.22535427295926408, - 0.17994497893495204, - 0.13834491865353749, - 0.10266367594604311, - 0.07280202264488661, - 0.05009738432745379, - 0.033041826754926534, - 0.021073825668589174, - 0.012914526917572926, - 0.007554719328322312, - 0.004157152149866735, - 0.0021054378009272763, - 9.553532601705812E-4, - 3.7662159367333385E-4, - 1.256055968956394E-4, - 3.266623554836667E-5, - 6.178368401470126E-6, - 6.708301323030964E-7, - 2.236707262114731E-8 + 0.2723316271520372, + 0.2253595359892266, + 0.1799621311652722, + 0.13836979363296367, + 0.10269140077244304, + 0.07282824746890097, + 0.05011926989783884, + 0.03305816912308876, + 0.021084933210515206, + 0.012921430216815149, + 0.007558665107152614, + 0.0041592321627043115, + 0.0021064460405320422, + 9.557962065453291E-4, + 3.7679313231394436E-4, + 1.2566261899114287E-4, + 3.2681242754494004E-5, + 6.181223929813808E-6, + 6.711347732593156E-7, + 2.2378453810730706E-8 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.10096307103711749, - 0.07521673628530995, - 0.05454285459886073, - 0.03844117387366225, - 0.026205285620643677, - 0.017364429886341085, - 0.011144070075001646, - 0.007004849381714043, - 0.0043132400540522855, - 0.0025637007774805104, - 0.0014387545485157424, - 7.365499477329721E-4, - 3.2961351437766544E-4, - 1.276726644916602E-4, - 3.9431604720222874E-5, - 9.54123271561152E-6, - 1.5452131454874696E-6, - 1.1322120338908268E-7, - 2.9610242527464003E-10, - 4.3790263962860484E-12 + 0.10100761994357671, + 0.07526360103957089, + 0.05458731487708507, + 0.03847947914813512, + 0.02623530957353106, + 0.017385984037019915, + 0.01115822621837147, + 0.007013441952136959, + 0.004318069667920409, + 0.0025661941306192957, + 0.0014399298095535281, + 7.370477823341763E-4, + 3.297973882412486E-4, + 1.2773213803038674E-4, + 3.9447120140931075E-5, + 9.544443903761028E-6, + 1.5457202459085525E-6, + 1.1327374185809158E-7, + 2.9729067075443623E-10, + 4.389238001777538E-12 ] }, "Peak Ground Acceleration": { @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.30017254814286587, - 0.2599766161003122, - 0.218530073389328, - 0.1772163016566951, - 0.13813461463787993, - 0.10319753744397728, - 0.0736997595293418, - 0.04991639246628922, - 0.0320892928905737, - 0.01947859225607282, - 0.011166216792968892, - 0.005884386281155818, - 0.002875172147339916, - 0.001237874233151536, - 4.615014221549229E-4, - 1.4188579171506472E-4, - 3.4741040039609694E-5, - 6.463731792926545E-6, - 9.533719925229465E-7, - 9.670999543375752E-8 + 0.30015403836168786, + 0.2599680401353482, + 0.2185297304438204, + 0.17722215931380336, + 0.13814440560161714, + 0.10320898786594203, + 0.07371091265962149, + 0.049925877599589025, + 0.032096466227447655, + 0.019483440112317264, + 0.011169175072030645, + 0.005886010861535864, + 0.0028760017939065893, + 0.001238250623016173, + 4.616461295239516E-4, + 1.4192899171483836E-4, + 3.4750168831031875E-5, + 6.464774248247943E-6, + 9.534150265565325E-7, + 9.671006675588189E-8 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.33165085791451066, - 0.2956206515598802, - 0.2565438270367057, - 0.21643729363543557, - 0.17579854693610053, - 0.13811960066778456, - 0.1041496526531777, - 0.07500154545047687, - 0.051580708007596385, - 0.03372717851157984, - 0.020944015296063646, - 0.012298247133873669, - 0.006782067371922225, - 0.003472227178204357, - 0.0016204772852677842, - 6.70876882254056E-4, - 2.4196318167460428E-4, - 7.459811256015455E-5, - 1.911411101271039E-5, - 4.1007022968721435E-6 + 0.3316228562852521, + 0.29560208196419013, + 0.25653382052184187, + 0.21643446693258592, + 0.17580145371321246, + 0.13812635242096122, + 0.10415840860866447, + 0.07501061312549723, + 0.05158880947038996, + 0.033733596742758915, + 0.02094857877622853, + 0.01230118239253893, + 0.006783792966915222, + 0.0034731591416989173, + 0.0016209320643428172, + 6.710682260221141E-4, + 2.4202921331541668E-4, + 7.461578679920015E-5, + 1.911727085766261E-5, + 4.100982884701552E-6 ] } } \ No newline at end of file