diff --git a/gradle.properties b/gradle.properties index 9ec679a3e76756df042d985acbcb11b0f34b5897..20fe253f34ab6885bc84bff3094199822fca801f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ micronautVersion = 3.2.3 micronautRxVersion = 2.1.1 nodePluginVersion = 3.0.1 nodeVersion = 16.3.0 -nshmpLibVersion = 1.3.13 +nshmpLibVersion = 1.4.0 nshmpWsUtilsVersion = 0.3.12 openApiVersion = 4.0.0 shadowVersion = 7.1.2 diff --git a/nshms.yml b/nshms.yml index f9cace13249607eb2e4abbe3b9c30ad81fc8f1b4..3a110f6845702c4852e764cf6662f2679f1446b8 100644 --- a/nshms.yml +++ b/nshms.yml @@ -51,7 +51,7 @@ nshms: # CONUS 2018 NSHM - repo: nshm-conus - tag: 5.2.0 + tag: 5.2.1 year: 2018 deployment: baseHref: /ws/nshmp/conus-2018/dynamic @@ -73,7 +73,7 @@ nshms: # CONUS 2023 NSHM - repo: nshm-conus - tag: 6.b.3 + tag: 6.0.0 year: 2023 deployment: baseHref: /ws/nshmp/conus-2023/dynamic 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 a2c3881afcde50f136a97242eb87e2e3863a52db..3b6e01fae88a69dd1ae0f3d35a979fc41f7b2426 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json @@ -24,25 +24,25 @@ ], "ys": [ 1.2054555515762317, - 0.9028091000448486, + 0.9028091000448484, 0.6554279343728451, - 0.46052017062111844, - 0.31504620864065486, + 0.46052017062111833, + 0.3150462086406549, 0.2079541835539892, 0.13510318879263483, 0.08496232958033866, - 0.051988775702767866, - 0.03058328207332198, + 0.05198877570276788, + 0.030583282073321984, 0.017133029172456044, - 0.009013906892259086, + 0.009013906892259085, 0.004368018380152508, - 0.0019023603631335424, - 7.253479503041852E-4, - 2.3667610679091529E-4, - 6.079243246974544E-5, - 1.1568716022798483E-5, - 1.6034782240213744E-6, - 1.1096198331547104E-7 + 0.0019023603631335428, + 7.253479503041853E-4, + 2.3667610679091534E-4, + 6.079243246974546E-5, + 1.1568716022798485E-5, + 1.6034782240213748E-6, + 1.1096198331547102E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,21 +69,21 @@ 0.7929925155296614 ], "ys": [ - 0.3371108932441851, - 0.2428827404264187, - 0.1700051034253081, - 0.11507904464560197, - 0.07471229502795965, - 0.04659280256752296, - 0.027601845311792588, - 0.015568934707478702, + 0.337110893244185, + 0.24288274042641872, + 0.17000510342530806, + 0.11507904464560198, + 0.0747122950279596, + 0.04659280256752297, + 0.027601845311792595, + 0.015568934707478705, 0.008266059302624659, 0.004025039806025589, - 0.0017531377367981885, - 6.604483605952785E-4, + 0.0017531377367981883, + 6.604483605952787E-4, 2.0523962859475266E-4, - 5.1304185369589736E-5, - 8.741628947536682E-6, + 5.130418536958973E-5, + 8.741628947536684E-6, 9.886449176534945E-7, 6.195012341136178E-8, 8.89217501634637E-10, @@ -115,25 +115,25 @@ 1.6428726885203377 ], "ys": [ - 1.6613397322177998, + 1.6613397322178003, 1.3121797388956014, 1.0090469580101904, - 0.7525216690797255, - 0.5439798420102854, + 0.7525216690797256, + 0.5439798420102856, 0.3812565494437257, 0.25908605437802307, 0.169679716746282, - 0.1075073404471398, + 0.10750734044713979, 0.06575591056475857, 0.03895452425045244, - 0.021852972874971333, - 0.011716931825404021, - 0.0057565723343294024, + 0.021852972874971337, + 0.01171693182540402, + 0.005756572334329402, 0.002563576391088447, - 9.95539192815906E-4, - 3.276678830082032E-4, - 8.712092747041926E-5, - 1.8142977661841078E-5, + 9.955391928159057E-4, + 3.2766788300820325E-4, + 8.712092747041929E-5, + 1.814297766184108E-5, 2.759261195157371E-6 ] }, @@ -161,21 +161,21 @@ 1.998773638612381 ], "ys": [ - 2.0597886225761406, - 1.6847130528576506, - 1.337415178531517, + 2.05978862257614, + 1.6847130528576502, + 1.3374151785315171, 1.0346301300938567, 0.7730618961287371, 0.5641017389284263, 0.39915557576688454, 0.2730852917126187, - 0.18105910040060283, - 0.11600033979770014, + 0.1810591004006028, + 0.11600033979770012, 0.07191096104453407, 0.04305649762836622, - 0.024769936656981944, - 0.013546053314537834, - 0.006925308465892441, + 0.02476993665698194, + 0.013546053314537832, + 0.0069253084658924425, 0.0032307592796199233, 0.0013501537731989938, 4.936418890740649E-4, 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 f835d18677a90c584609eebcb12af4ea4774336f..f021d6a096d6e0a1568f3cd475b690f48ba70f39 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json @@ -23,24 +23,24 @@ 1.7119945007591924 ], "ys": [ - 0.510900405696668, + 0.5109004056966681, 0.38428885297556936, - 0.27835250548079427, + 0.27835250548079415, 0.1922805944002878, - 0.12619235442902255, + 0.12619235442902257, 0.0770875336643894, - 0.04460654390653453, + 0.044606543906534527, 0.02392502922877578, 0.012017752029005603, 0.0056001591343033345, - 0.002410845201230143, + 0.0024108452012301432, 9.492184164185979E-4, 3.3672214835945435E-4, 1.051656859796978E-4, 2.801427769382648E-5, 6.0923215137596925E-6, 9.25254984409327E-7, - 8.670585871169395E-8, + 8.670585871169394E-8, 3.778898501352082E-9, 2.959441369126757E-11 ] @@ -74,17 +74,17 @@ 0.08699321223907233, 0.054168134029258304, 0.03141629624936587, - 0.01699285477358581, - 0.008424393609266499, - 0.003830549825149108, - 0.0015752224901363146, + 0.016992854773585808, + 0.008424393609266497, + 0.003830549825149107, + 0.0015752224901363144, 5.700104588547456E-4, - 1.788606495229429E-4, - 4.740122515630051E-5, - 1.0186207073551547E-5, + 1.7886064952294292E-4, + 4.7401225156300514E-5, + 1.0186207073551549E-5, 1.839820538692405E-6, 2.512200645267704E-7, - 2.349733097166489E-8, + 2.3497330971664887E-8, 8.084303599442336E-10, 6.8911467896809755E-12, 0.0, @@ -125,16 +125,16 @@ 0.045521269061182576, 0.025731129837292626, 0.013629882451863095, - 0.006750199446670263, + 0.0067501994466702625, 0.003024547672717661, 0.0012432076275650347, 4.4077108985418796E-4, 1.31612939228522E-4, - 3.058751434281435E-5, + 3.058751434281434E-5, 4.977732203000428E-6, - 4.608283729801913E-7, + 4.6082837298019124E-7, 2.4782232268501392E-8, - 9.386366965413837E-10 + 9.386366965413835E-10 ] }, "0.20 Second Spectral Acceleration": { @@ -162,24 +162,24 @@ ], "ys": [ 0.7752948291688881, - 0.6194243339359888, + 0.6194243339359887, 0.4787621598336898, - 0.35909784903118513, + 0.35909784903118525, 0.25817237596808235, 0.1797105618464373, 0.11993489664944947, 0.07639555986360248, 0.046494128306174, - 0.026827442756605358, + 0.02682744275660535, 0.0145978111541393, - 0.007424829870419156, - 0.003496408767658234, + 0.007424829870419157, + 0.0034964087676582337, 0.0015029928180070365, 5.75879040769705E-4, 1.891956085566876E-4, 5.111961625126819E-5, - 1.0593460107111633E-5, - 1.4403282380160421E-6, + 1.0593460107111634E-5, + 1.440328238016042E-6, 1.1559160576604646E-7 ] } 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 a33dee004524784548564bd4821846c662330c99..8e5ade7f1f0a4f20f0e871d0b6ae2897ffa42b9a 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json @@ -23,17 +23,17 @@ 1.7119945007591924 ], "ys": [ - 0.3296794357638688, - 0.2484854277220137, - 0.17979668553520037, - 0.1231876185475268, - 0.07927817701242552, - 0.04685576321795804, - 0.026085641380535023, - 0.013597527147089032, - 0.006886035844357587, - 0.003451416202798706, - 0.0017365648631554448, + 0.3294123716124954, + 0.24829581987421795, + 0.17967281659758264, + 0.12311488704354767, + 0.07924029859575835, + 0.046839050017655044, + 0.02607933650511641, + 0.013595660383311755, + 0.006885637549143876, + 0.0034513657233153096, + 0.00173656232388257, 8.628446666122591E-4, 4.0884607420007033E-4, 1.7637232732508956E-4, @@ -69,17 +69,17 @@ 0.7929925155296614 ], "ys": [ - 0.14998217374488668, - 0.10624794650730177, - 0.07081319398869801, - 0.044339329604761404, - 0.02597975521863052, - 0.014357358688259391, - 0.007430793769581358, - 0.003661814086647199, - 0.0017338007286361733, - 7.89060965557094E-4, - 3.441419867501983E-4, + 0.14956739288661206, + 0.10594936945890931, + 0.07061754188011056, + 0.044224643028225825, + 0.02592159026817826, + 0.014332406127032866, + 0.0074221454735642, + 0.0036594939634490946, + 0.0017333860392661133, + 7.890243522029575E-4, + 3.441413895901196E-4, 1.4026509530308466E-4, 5.0902292097982576E-5, 1.6053119766506015E-5, @@ -115,16 +115,16 @@ 1.6428726885203377 ], "ys": [ - 0.3715716748091074, - 0.28066027957952866, - 0.20208588638854036, - 0.13761916319998063, - 0.08808837335281947, - 0.052955991456289, - 0.03028782966591698, + 0.3715230637433389, + 0.28063926170436876, + 0.20207818362048996, + 0.13761687764684405, + 0.0880878659890649, + 0.05295591344987423, + 0.030287824645005092, 0.01677394525487418, 0.009293443452510475, - 0.005210479932584493, + 0.005210479932584492, 0.0029453609749909887, 0.0016014076514413098, 8.251028586919217E-4, @@ -161,17 +161,17 @@ 1.998773638612381 ], "ys": [ - 0.4451569250114386, - 0.35080633843090747, - 0.2632284461199974, - 0.18848079761119294, - 0.12675819034620045, - 0.08097061612061728, - 0.048779367993652525, - 0.028026639976523486, - 0.0158386790983621, - 0.009006432557536696, - 0.00521730636589344, + 0.44507666518776845, + 0.35076559315171274, + 0.2632105654497205, + 0.18847408028771115, + 0.12675618912883052, + 0.08097014592856332, + 0.048779294071992454, + 0.028026635073744265, + 0.015838679098362105, + 0.009006432557536694, + 0.005217306365893439, 0.003035869788895011, 0.0017205081554241399, 9.171730891083757E-4, 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 a5fdb9762725273b48e5693443f11e6b4d7782c2..2ce9d9c4e5f1af56ff4715dda684d2c1b8d68790 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json @@ -23,24 +23,24 @@ 1.7119945007591924 ], "ys": [ - 1.1563620076198489, + 1.1563620076198486, 0.8108764450280195, 0.5567165204469949, - 0.37661611971515363, + 0.37661611971515374, 0.2537526455080179, 0.16872404946018202, - 0.11239265813984663, - 0.07322616517880996, - 0.046438555153854436, - 0.02812554769186281, + 0.11239265813984661, + 0.07322616517880995, + 0.04643855515385444, + 0.028125547691862807, 0.01608095588479048, - 0.008588053357425615, - 0.00422780593447085, - 0.0018807393425480342, - 7.384029864058869E-4, + 0.008588053357425613, + 0.004227805934470851, + 0.001880739342548035, + 7.38402986405887E-4, 2.5143038412483776E-4, - 6.889623213888918E-5, - 1.4191160404183603E-5, + 6.889623213888919E-5, + 1.4191160404183605E-5, 2.2058054212325666E-6, 2.713664261232649E-7 ] @@ -69,23 +69,23 @@ 0.7929925155296614 ], "ys": [ - 0.31656209313044414, + 0.31656209313044403, 0.2272621600728691, - 0.16079658976985173, - 0.11155444042021773, - 0.07492654394850826, - 0.048362753995579474, - 0.02942877550773362, - 0.016867048098076293, - 0.009045902081159954, - 0.004456027136211509, + 0.16079658976985176, + 0.11155444042021775, + 0.07492654394850827, + 0.04836275399557946, + 0.029428775507733623, + 0.016867048098076296, + 0.009045902081159955, + 0.004456027136211508, 0.001971744673640637, 7.571835371149252E-4, - 2.3968075695000925E-4, + 2.3968075695000922E-4, 6.006249984803165E-5, - 9.479306830402176E-6, + 9.479306830402173E-6, 7.551063889629073E-7, - 7.428233573779028E-9, + 7.428233573779026E-9, 1.537150078678922E-12, 0.0, 0.0 @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.5818370153080572, - 1.15195237687201, + 1.5818370153080574, + 1.1519523768720097, 0.8138919707236263, 0.5601403780003567, - 0.37902095287167564, + 0.3790209528716756, 0.25437765683926533, 0.1702785334332962, - 0.11325322795459268, + 0.11325322795459271, 0.07494686466250117, 0.048808282955205555, - 0.030950349697415405, + 0.03095034969741541, 0.018547690434692298, - 0.010586599286993823, - 0.005571167887112225, - 0.0026836680617469944, + 0.010586599286993821, + 0.0055711678871122276, + 0.002683668061746994, 0.0011429570458595906, - 4.1854882952960075E-4, - 1.2605159742794266E-4, - 3.0066353915399692E-5, - 5.060803399396689E-6 + 4.1854882952960064E-4, + 1.2605159742794264E-4, + 3.006635391539969E-5, + 5.060803399396688E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.1168323151757766, + 2.116832315175776, 1.619134652764648, 1.1884029735633264, - 0.8460325924471094, + 0.8460325924471095, 0.5822456895819994, - 0.3966484344333076, + 0.39664843443330755, 0.26734789151385235, - 0.17886421327210064, + 0.17886421327210067, 0.11940851221022791, 0.07915770139847726, - 0.05176159061518673, + 0.05176159061518672, 0.03292045995221985, 0.020051569247233968, - 0.011548368691057699, + 0.011548368691057695, 0.006219947395163814, - 0.0030801315530267297, - 0.0013832551915340975, - 5.529275798222957E-4, - 1.897919664865184E-4, - 5.4220863714955954E-5 + 0.00308013155302673, + 0.0013832551915340973, + 5.529275798222956E-4, + 1.8979196648651837E-4, + 5.422086371495596E-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 5ff1d9c30e4803d4541c9db715abcc93e086f6ee..c1d65acd67527fbe90b9c1ef2d67ef7fcb1cc944 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.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, + 0.8649559369178572, + 0.6492640981980339, + 0.47035848933415525, + 0.32604424149579586, + 0.21677873664254063, + 0.13725466938855885, + 0.08542240692722648, + 0.05198046789180188, + 0.03142395947055236, + 0.018711035826994977, + 0.010854569584468095, + 0.006035383122447405, + 0.0031447035204295835, + 0.0014944670582528396, + 6.292435175727218E-4, + 2.3023404257773597E-4, 6.881233587613072E-5, - 1.5998082832802966E-5, - 2.649577548643775E-6, - 4.014907449262735E-7 + 1.5998082832802962E-5, + 2.6495775486437754E-6, + 4.0149074492627344E-7 ] }, "5.00 Second Spectral Acceleration": { @@ -69,21 +69,21 @@ 0.7929925155296614 ], "ys": [ - 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, + 0.31421474801319466, + 0.22495056619853177, + 0.15406096589729668, + 0.1010029936486671, + 0.06317750608860864, + 0.03799684689575118, + 0.021890436683276768, + 0.012231530976774275, + 0.006613987004544774, + 0.0033866783284463367, + 0.0015910578875849416, + 6.560459784177342E-4, + 2.2460856469285324E-4, 6.193155215116131E-5, - 1.1380982693630809E-5, + 1.138098269363081E-5, 1.1110857635807404E-6, 1.7343952315951334E-8, 2.523164424762348E-12, @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 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, + 1.020310429533733, + 0.7755772822076128, + 0.5704799805988632, + 0.40434532622019786, + 0.2774412537049346, + 0.18594692966428503, + 0.12290722875031784, + 0.08023958597520815, + 0.052138752004393156, + 0.033625714973184506, + 0.02149584128966155, + 0.013274709337847322, + 0.007919264656362562, + 0.004381231102996306, + 0.0022200157850415718, 9.966711776906911E-4, - 3.876304918572317E-4, + 3.876304918572318E-4, 1.2604851344386937E-4, 3.334943264206746E-5, - 6.21245814503021E-6 + 6.212458145030209E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 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, + 1.2950989597569886, + 1.01559023368235, + 0.7692199628257822, + 0.5651601314187731, + 0.39963005663908174, + 0.27714928228367464, + 0.188233296500781, + 0.12563000272601194, + 0.08299430023502874, + 0.05424189888400079, + 0.035107926420350974, + 0.022404321868443735, + 0.013962193818033458, 0.00836805507647081, - 0.004732888236227226, - 0.0024691893686298256, + 0.004732888236227227, + 0.0024691893686298247, 0.0011699365781911882, 4.949755080134131E-4, 1.8203861819997193E-4, - 5.664939647060594E-5 + 5.664939647060591E-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 78d802b8b44b7a58fa8193547ef7af39a51121e2..c9fa0e53609e7cbbfaf14764d9057e44184bfbba 100644 --- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json +++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json @@ -23,23 +23,23 @@ 1.7119945007591924 ], "ys": [ - 0.03781690942134722, + 0.03781690942134723, 0.02560998712695722, 0.01683517841756172, - 0.010675317900339305, + 0.010675317900339298, 0.006527977980738499, - 0.0037666741939616057, - 0.0020910571328798195, - 0.0010923590899631103, - 5.458772566494526E-4, + 0.003766674193961606, + 0.0020910571328798203, + 0.0010923590899631099, + 5.458772566494525E-4, 2.6104985735441133E-4, - 1.2062939801655834E-4, + 1.2062939801655836E-4, 5.4113647550187295E-5, 2.347538999109399E-5, 9.699580588310418E-6, - 3.7213621990011277E-6, - 1.2984686317975073E-6, - 3.8820660002283173E-7, + 3.721362199001128E-6, + 1.2984686317975077E-6, + 3.882066000228317E-7, 9.785045471794203E-8, 1.946037843483608E-8, 2.7422728345358543E-9 @@ -69,25 +69,25 @@ 0.7929925155296614 ], "ys": [ - 0.00921320730094861, - 0.00612172117222991, + 0.009213207300948618, + 0.006121721172229912, 0.003927784889616463, - 0.002415843378135533, + 0.0024158433781355324, 0.0014072769298912606, - 7.774423342976144E-4, - 4.024693099758766E-4, - 1.9730634218575704E-4, - 9.182408947706067E-5, + 7.774423342976145E-4, + 4.024693099758764E-4, + 1.9730634218575706E-4, + 9.182408947706068E-5, 4.0465849036853986E-5, - 1.703760017497274E-5, + 1.7037600174972735E-5, 6.866482223986137E-6, - 2.6160622771360306E-6, - 9.542403834324573E-7, - 3.1185607453236485E-7, + 2.6160622771360315E-6, + 9.542403834324575E-7, + 3.118560745323649E-7, 9.181884057053901E-8, - 2.2848239268149787E-8, - 4.620311222721343E-9, - 6.936412711209975E-10, + 2.2848239268149793E-8, + 4.620311222721341E-9, + 6.936412711209974E-10, 7.028579358099718E-11 ] }, @@ -117,23 +117,23 @@ "ys": [ 0.06599397975220576, 0.04951601624256741, - 0.036513738982136494, - 0.026258583569526425, - 0.01833916291963426, - 0.012411914456006224, - 0.008141006833289569, - 0.005152225174879873, - 0.003167899870405807, + 0.03651373898213651, + 0.026258583569526418, + 0.018339162919634253, + 0.012411914456006222, + 0.00814100683328957, + 0.005152225174879874, + 0.003167899870405808, 0.001891726179226934, - 0.0011035470885633653, + 0.0011035470885633655, 6.179966567302162E-4, - 3.385611975149567E-4, - 1.7630584453206903E-4, - 8.72617228563019E-5, - 3.982648113280293E-5, - 1.632507906376405E-5, - 5.769066788130919E-6, - 1.7184900721224076E-6, + 3.385611975149566E-4, + 1.763058445320691E-4, + 8.726172285630192E-5, + 3.982648113280291E-5, + 1.6325079063764054E-5, + 5.769066788130918E-6, + 1.7184900721224078E-6, 3.963193550050803E-7 ] }, @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.09353115905390523, - 0.0703016736669049, - 0.05123931616345851, + 0.09353115905390527, + 0.07030167366690492, + 0.051239316163458504, 0.03630581145641291, 0.024635985605014427, 0.016213078359687383, - 0.010249801865790506, + 0.010249801865790501, 0.0062122987954390104, - 0.0036307543903602354, - 0.0020431384223740232, - 0.0011103316932372833, + 0.003630754390360235, + 0.002043138422374023, + 0.0011103316932372838, 5.822894133817993E-4, - 2.9401954680419504E-4, - 1.4214673052602845E-4, - 6.507484914740439E-5, + 2.9401954680419515E-4, + 1.4214673052602843E-4, + 6.507484914740442E-5, 2.762583302658458E-5, - 1.065899008792829E-5, + 1.0658990087928293E-5, 3.622386410973509E-6, - 1.0342006360285484E-6, - 2.3647467423869639E-7 + 1.034200636028549E-6, + 2.364746742386964E-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 36cd5380080df31e2469aac4fb6d54b167a5ff78..49db55ac59f36cee724c2e75e7c5eded04b20c71 100644 --- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json +++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json @@ -23,23 +23,23 @@ 1.7119945007591924 ], "ys": [ - 0.03324893310902484, - 0.022004431105884844, - 0.01431014775274047, - 0.009151239631673426, - 0.0057796167722751765, - 0.00351403260771589, - 0.0020552936759178297, - 0.0011024828423755128, - 5.332796764095534E-4, - 2.2502078443087167E-4, - 8.132456018629311E-5, - 2.4983602810937415E-5, - 6.6829514950423814E-6, - 1.744963240725027E-6, - 4.909788509372824E-7, - 1.5684348441413008E-7, - 4.4159912147687756E-8, + 0.03324893297580753, + 0.02200443073185097, + 0.014310146745674705, + 0.009151237164552267, + 0.005779612247836648, + 0.0035140271310088256, + 0.0020552894552774707, + 0.0011024807090991673, + 5.332789224579894E-4, + 2.250206167929638E-4, + 8.132454691411791E-5, + 2.4983602810937422E-5, + 6.682951495042382E-6, + 1.7449632407250264E-6, + 4.909788509372823E-7, + 1.568434844141301E-7, + 4.415991214768775E-8, 1.0492474877263185E-8, 1.9576567710691036E-9, 2.5802146447004877E-10 @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.010005966930455426, - 0.0070201385492799345, - 0.004946069582032201, - 0.0034831512155612545, - 0.0023991290974655823, - 0.0015793614229230987, - 9.569588656999187E-4, - 5.209847415833335E-4, - 2.4735052236108E-4, - 9.904665205541751E-5, - 3.277868452186688E-5, - 8.712990693707899E-6, - 1.7904539860522427E-6, - 3.053453022508045E-7, - 4.5864222733130684E-8, - 9.670711470276267E-9, + 0.010005966687589414, + 0.007020138016325777, + 0.004946068441225725, + 0.0034831491901766163, + 0.0023991264653615485, + 0.0015793590399934086, + 9.569573584680404E-4, + 5.209840505848331E-4, + 2.4735029087071973E-4, + 9.904659977269298E-5, + 3.277867678440815E-5, + 8.712990458832454E-6, + 1.790453986052243E-6, + 3.0534530225080447E-7, + 4.58642227331307E-8, + 9.670711470276269E-9, 2.3562950445765526E-9, - 4.914029457128014E-10, + 4.914029457128016E-10, 7.99798410640728E-11, - 9.381018392075352E-12 + 9.381018392075353E-12 ] }, "Peak Ground Acceleration": { @@ -115,22 +115,22 @@ 1.6428726885203377 ], "ys": [ - 0.04088625408517391, - 0.02742434591762619, - 0.01821903404509547, - 0.011934422965670087, - 0.007663011513102015, - 0.004765114308889278, - 0.0028282312853084653, - 0.0015783077414236475, - 8.390693640246431E-4, - 4.318004979848098E-4, - 2.2144131101680214E-4, - 1.1266780710891709E-4, - 5.821356278132561E-5, - 2.9316226798325754E-5, - 1.4233176969030012E-5, - 6.407467702128437E-6, + 0.040886253926119796, + 0.02742434546898031, + 0.01821903281900559, + 0.011934419843991734, + 0.007663005702927002, + 0.004765107676278688, + 0.002828226723909663, + 0.001578305741694685, + 8.390687838893622E-4, + 4.3180039393759585E-4, + 2.2144130093824585E-4, + 1.126678067797062E-4, + 5.8213562781325624E-5, + 2.9316226798325764E-5, + 1.4233176969030014E-5, + 6.4074677021284365E-6, 2.5948292983347617E-6, 9.058302958854361E-7, 2.664550977482879E-7, @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.0691554767286036, - 0.04697296493489196, - 0.030953931061635506, - 0.020002703636453695, - 0.012514413169193663, - 0.007683322438550794, - 0.004524345762442764, - 0.0025095609630764104, - 0.001303814344569991, - 6.313143767624346E-4, - 2.8898318737977953E-4, - 1.2787451423137346E-4, - 5.6009010931444306E-5, - 2.444851739501035E-5, + 0.06915547654099248, + 0.046972964359900074, + 0.03095392939036071, + 0.02000269954895017, + 0.012514406084671512, + 0.007683314792693458, + 0.004524340549673257, + 0.0025095586082908477, + 0.0013038136003968564, + 6.313142379345735E-4, + 2.889831720423639E-4, + 1.2787451396826228E-4, + 5.600901093144431E-5, + 2.4448517395010354E-5, 1.0472190893854823E-5, - 4.248516889956776E-6, + 4.248516889956777E-6, 1.5807570795442502E-6, 5.190573795746768E-7, - 1.4267651060313717E-7, - 3.112422839449763E-8 + 1.4267651060313722E-7, + 3.112422839449764E-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 899d3f46738821d851e6df33f14de16fc8b9c2f4..e3edb1b592c69aeeb75bad0e3f39e0e1d0b8b4e6 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.7868229507766732, - 0.5989999740713615, - 0.4411933145811913, - 0.3138528363617102, - 0.21596260906881826, - 0.14138668083572575, - 0.08936175659864179, - 0.053571208295266515, - 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 + 0.786128666880811, + 0.5989867378389928, + 0.44178844318711585, + 0.31489760246736437, + 0.21725145263732182, + 0.1426894479184029, + 0.09045605081902425, + 0.05431897381512409, + 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 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.2542985961896629, - 0.1860513815459171, - 0.13155312718011508, - 0.08938668609700867, - 0.05807099427773341, - 0.03639542346903606, - 0.021912933201174326, - 0.012707809816302823, - 0.0069846599769759305, - 0.003542480929942337, - 0.0016311355865872895, - 6.735471519384868E-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 + 0.2557822913282679, + 0.18762564047196312, + 0.13309726955878304, + 0.09074251355340779, + 0.059090271300687364, + 0.03702973893691419, + 0.022226359150423515, + 0.01282586071665665, + 0.007013381450232267, + 0.003542532779852861, + 0.0016275024824114492, + 6.719436284999363E-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 ] }, "Peak Ground Acceleration": { @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.9060051232217639, - 0.7175752958409577, - 0.5558555572960041, - 0.42078460948974206, - 0.3107593352604376, - 0.22259208945018233, - 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.9042474689285851, + 0.7163134989098943, + 0.5552601666932748, + 0.4209243567705844, + 0.31155434659452025, + 0.2238197439974888, + 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.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 1.070491121815655, - 0.874908825634708, - 0.6955542513007297, - 0.5416958681285222, - 0.4104584089223994, - 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 + 1.0684659672013006, + 0.873171616894385, + 0.6943090175231557, + 0.541106309530617, + 0.4105958271604345, + 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 ] } } \ 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 bccd4ff496ae5dca417c1ff3ab97ae35218e04d7..e3db00fb875a2a1e0aa23b720443114d9c8597c3 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.11534974599388693, - 0.08698148362667113, - 0.06406292276167219, - 0.046078192405115966, - 0.03253637462327355, - 0.022366693877149558, - 0.015293415446741955, - 0.010356860424666315, - 0.007106470813094831, - 0.00500706584678398, - 0.0036674141315344282, - 0.0027708487867755156, - 0.002086773137749997, - 0.001487821691947794, - 9.535157338758259E-4, - 5.308929783756661E-4, - 2.4632953188630317E-4, - 9.45996695314454E-5, - 2.890552912548327E-5, - 6.721429379688254E-6 + 0.11534974599388692, + 0.08698148362667114, + 0.06406292276154263, + 0.04607819240390107, + 0.03253637461491278, + 0.022366693833913123, + 0.015293415275611743, + 0.010356859824249127, + 0.007106468958929246, + 0.00500706098871143, + 0.0036674043082438913, + 0.0027708344084573754, + 0.0020867583438866017, + 0.00148781112066442, + 9.535104591395861E-4, + 5.308911889067075E-4, + 2.463291206258683E-4, + 9.459961578509015E-5, + 2.890552806939883E-5, + 6.721430339032406E-6 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.026538247127206118, - 0.01906655327064791, - 0.013626789983486496, - 0.00976641241039197, - 0.00706601708351237, - 0.005239513882617428, - 0.004007441363707505, - 0.0031914729308122084, - 0.002618022856257823, - 0.0021443231305726383, - 0.0016874006667018065, - 0.0012325536428221145, - 8.112607839937964E-4, - 4.7620846546351115E-4, - 2.3778952000443155E-4, - 1.0104841608143451E-4, - 3.506862368489196E-5, - 9.65602594855597E-6, - 1.9712202459681616E-6, - 2.798557895371194E-7 + 0.026538247124583445, + 0.019066553257433182, + 0.013626789930696175, + 0.009766412237613655, + 0.007066016574296354, + 0.005239512440160899, + 0.004007437426269736, + 0.0031914639954694424, + 0.00261800813308166, + 0.002144306713417263, + 0.0016873885021127446, + 0.001232547613642964, + 8.112590214694934E-4, + 4.762083128043082E-4, + 2.3778964735335538E-4, + 1.0104848505576491E-4, + 3.506863301214931E-5, + 9.656024770780144E-6, + 1.971219304214483E-6, + 2.798556168029338E-7 ] }, "Peak Ground Acceleration": { @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.2008267606411687, - 0.1730315848271916, - 0.14594179639708077, - 0.11988197257474568, - 0.0957725674466078, - 0.07448415764500856, - 0.05653535014883013, - 0.04183964847744843, - 0.0303591809822878, - 0.021603536983251643, - 0.015147902209371053, - 0.010380513858986464, - 0.007086868639928332, - 0.004776405847494422, - 0.003194033664349469, - 0.002063032278608447, - 0.0012314821193950324, - 6.362959860235963E-4, - 2.7133142360006776E-4, - 8.845979888500936E-5 + 0.20082676064116872, + 0.1730315848271918, + 0.14594179639708693, + 0.1198819725748202, + 0.09577256744724878, + 0.07448415764939256, + 0.05653535017187783, + 0.041839648586159454, + 0.03035918142088444, + 0.02160353845182129, + 0.015147906115404957, + 0.010380521885945633, + 0.007086879488558685, + 0.004776413456606937, + 0.0031940338772918704, + 0.0020630276122096014, + 0.001231476975976758, + 6.362928873656397E-4, + 2.7133026462445366E-4, + 8.845951396062711E-5 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.23235672977120592, - 0.2010308578772427, + 0.2323567297712059, + 0.20103085787724262, 0.16949594749416608, - 0.13897123143573237, - 0.10971503991301251, - 0.08417324450282236, - 0.06257442666659786, - 0.045144369921103086, - 0.03178577283279019, - 0.021843269000236743, - 0.014712774190862492, - 0.009775248303873085, - 0.006484422014715581, - 0.004352494841555028, - 0.002960985572647082, - 0.0019882654343830203, - 0.0012502056040323956, - 6.867898974882985E-4, - 3.0838031869483585E-4, - 1.083218280210284E-4 + 0.13897123143573167, + 0.10971503991299228, + 0.08417324450257645, + 0.06257442666476447, + 0.04514436991032575, + 0.031785772780841534, + 0.02184326878353101, + 0.014712773387355172, + 0.009775245758182328, + 0.006484415699356285, + 0.0043524833029607675, + 0.0029609704858198937, + 0.0019882511946060404, + 0.0012501956452844797, + 6.867847039996855E-4, + 3.0837841447121906E-4, + 1.0832132678542524E-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 9ce8bc6283fe9511fea3eb17959cadb3613f95e3..8821ec070337f88d5067082ecc8db798a2699821 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.026030463448604706, - 0.017155400855241892, - 0.010885390093212644, - 0.006660097241570285, + 0.038262468062309395, + 0.02603046344860471, + 0.0171554008552419, + 0.010885390093212636, + 0.006660097241570287, 0.003858088495130119, 0.0021663261007892464, 0.0011583421935267536, - 6.009032500164473E-4, - 3.0233926709153134E-4, - 1.4817587290785013E-4, - 7.050104808577861E-5, - 3.218992880314699E-5, + 6.009032500164475E-4, + 3.023392670915314E-4, + 1.4817587290785018E-4, + 7.05010480857786E-5, + 3.2189928803146996E-5, 1.3832096806263693E-5, 5.459529842118775E-6, - 1.9428392150340858E-6, - 5.888734403531783E-7, + 1.9428392150340854E-6, + 5.888734403531786E-7, 1.4974470891297607E-7, - 2.995182697021266E-8, - 4.239346142112846E-9 + 2.995182697021267E-8, + 4.2393461421128455E-9 ] }, "5.00 Second Spectral Acceleration": { @@ -69,25 +69,25 @@ 0.7929925155296614 ], "ys": [ - 0.009600199498981159, - 0.006320598140568551, - 0.003998495592416973, - 0.002420968116332609, - 0.0013922805998762867, + 0.009600199498981164, + 0.006320598140568553, + 0.003998495592416972, + 0.0024209681163326075, + 0.0013922805998762865, 7.653511087722587E-4, - 3.9910028144341994E-4, + 3.991002814434199E-4, 2.0013103147428781E-4, - 9.684010210476128E-5, + 9.684010210476127E-5, 4.501923579779383E-5, - 2.0158227838894868E-5, - 8.640044965400363E-6, - 3.4752442404719267E-6, + 2.015822783889487E-5, + 8.640044965400361E-6, + 3.4752442404719263E-6, 1.3213285385796125E-6, 4.4489663641411424E-7, - 1.3385272064306846E-7, - 3.383715559062798E-8, + 1.338527206430684E-7, + 3.383715559062799E-8, 6.9217291724856125E-9, - 1.0496384684360479E-9, + 1.0496384684360477E-9, 1.071989454665421E-10 ] }, @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.06295212478082787, - 0.04804845815748257, - 0.0361916108234815, + 0.06295212478082786, + 0.04804845815748259, + 0.036191610823481504, 0.0267152751305139, - 0.01926073686033505, - 0.013535182229688402, + 0.019260736860335057, + 0.013535182229688403, 0.009262342125760426, 0.006136637176633701, - 0.003951706514772565, - 0.0024672025970475927, - 0.001499024950979399, - 8.710019776437941E-4, + 0.003951706514772564, + 0.002467202597047593, + 0.0014990249509793992, + 8.710019776437942E-4, 4.921002498934159E-4, - 2.6283929164592834E-4, - 1.3262871270711607E-4, - 6.141179303724591E-5, - 2.544365025981951E-5, - 9.06649630578154E-6, - 2.7195777970597315E-6, - 6.313004310982964E-7 + 2.628392916459284E-4, + 1.3262871270711604E-4, + 6.14117930372459E-5, + 2.5443650259819515E-5, + 9.066496305781536E-6, + 2.719577797059732E-6, + 6.313004310982962E-7 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.08776972431938838, - 0.06659157694814948, - 0.049225799499276135, - 0.03552861479492542, - 0.024688518599665057, - 0.016720836145648118, - 0.01094027406228688, - 0.006899372453907445, - 0.004211132882578026, + 0.0877697243193884, + 0.06659157694814946, + 0.04922579949927612, + 0.035528614794925424, + 0.024688518599665064, + 0.016720836145648114, + 0.010940274062286886, + 0.0068993724539074455, + 0.004211132882578025, 0.0024795228150876546, - 0.0014092415433829238, - 7.711400309583001E-4, - 4.0474448623951237E-4, + 0.0014092415433829243, + 7.711400309583E-4, + 4.047444862395123E-4, 2.0238516038224294E-4, - 9.527876089291166E-5, - 4.134621298433285E-5, - 1.6214324144157016E-5, + 9.527876089291168E-5, + 4.1346212984332834E-5, + 1.621432414415702E-5, 5.575162343216448E-6, 1.6050336029577984E-6, - 3.6913561822247894E-7 + 3.6913561822247884E-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 8367876f96232970d50cf6c5a5bf5a4df46815e4..b4a27d0370dc56ce87e310d42d89a1853b170ba2 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.42208271051403046, - 0.29741505562391685, - 0.20134874165633232, - 0.1305394914031066, - 0.08159855815766615, - 0.048747243858519765, - 0.028728543066498365, - 0.0165441497545661, - 0.00947241143924665, - 0.005336503708211274, - 0.0029018426273452174, - 0.0014720823187714567, - 6.683502338795141E-4, - 2.6054273485112787E-4, - 8.340470321860671E-5, - 2.0739047756728618E-5, - 3.4299913798081007E-6, - 2.997988841557021E-7, - 5.025722906176405E-9, - 1.0054998350751101E-11 + 0.42211827629688803, + 0.2973768832555914, + 0.20126587725663547, + 0.13044688995177608, + 0.08152211441224907, + 0.04869614802888634, + 0.02869784170631576, + 0.016526071982689534, + 0.009461090462229151, + 0.005329127090554541, + 0.0028973377104948572, + 0.001469731947926621, + 6.673547103439067E-4, + 2.602135609255573E-4, + 8.332727094107757E-5, + 2.072894684391354E-5, + 3.430095638283392E-6, + 3.0002413499362626E-7, + 5.04748097670551E-9, + 9.990197364333357E-12 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.11164603476372417, - 0.07615302033867133, - 0.05023218916490202, - 0.03206205379070699, - 0.01973607720387932, - 0.011805505973328502, - 0.006791558526586791, - 0.003745403489667254, - 0.0019379262080626738, - 9.104396500283078E-4, - 3.779357081441099E-4, - 1.3398373542307244E-4, - 3.8539619855725496E-5, - 8.848137363408722E-6, - 1.3209823866585529E-6, - 1.1402111764402845E-7, - 3.993898781907206E-9, - 4.57747291671781E-11, + 0.11150042233495318, + 0.07602020751270493, + 0.05013324315456559, + 0.03199955481994647, + 0.01970072693130827, + 0.011786026573092832, + 0.006780675075816209, + 0.00373939699306798, + 0.0019349338474837642, + 9.0923099492198E-4, + 3.775817781071232E-4, + 1.3393107213022936E-4, + 3.855173591375255E-5, + 8.85719845379456E-6, + 1.3238780414890474E-6, + 1.1444246640845231E-7, + 3.993244478747749E-9, + 4.638823055262254E-11, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.4599155461589819, - 0.3319649086597787, - 0.23409206986520695, - 0.16154647326844573, - 0.10974945705851255, - 0.07368404021013333, - 0.04881628439753486, - 0.03151539823238062, - 0.019734131847006696, - 0.011863259940844108, - 0.006829054480992549, - 0.0036370634708222313, - 0.0017718673884405407, - 7.330338912127748E-4, - 2.4937961771369805E-4, - 6.540575764264173E-5, - 1.2274495275130132E-5, - 1.4624587583248914E-6, - 9.203515745538137E-8, - 1.7885452404470933E-10 + 0.4599319844087347, + 0.33191394813415687, + 0.23401867226892825, + 0.16148352926574994, + 0.10970702154502768, + 0.07365818587756147, + 0.04880033824053436, + 0.03150421986448721, + 0.019724872164119958, + 0.011855140955948045, + 0.0068225167845218536, + 0.003632723511659733, + 0.001769573718584755, + 7.321181918148072E-4, + 2.49104825175875E-4, + 6.534817784114796E-5, + 1.2266983301540192E-5, + 1.4621311496124262E-6, + 9.202859673229499E-8, + 1.7823388593584575E-10 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.5781736131159295, - 0.4317558628608713, - 0.3127299521443648, - 0.22201616924311307, - 0.15372574540645126, - 0.10590175150198311, - 0.07213141667988376, - 0.04834103453366969, - 0.031763983053272216, - 0.020237222675818754, - 0.012424027707767982, - 0.0072957051804368265, - 0.004046254486904427, - 0.0020623972288192683, - 9.280649502297485E-4, - 3.520634680161896E-4, - 1.0857326034440289E-4, - 2.5689366239442765E-5, - 4.192750623848367E-6, - 4.01123348460218E-7 + 0.5782552674592347, + 0.43176065617064546, + 0.3126928142882367, + 0.2219692599661962, + 0.15368639401077955, + 0.10587379507399998, + 0.07211281966264588, + 0.04832831565103865, + 0.031754183946698745, + 0.020228634477145895, + 0.012416244920697223, + 0.0072891953305707045, + 0.004041615582717419, + 0.0020597064218822957, + 9.268309344520004E-4, + 3.5162833043762755E-4, + 1.0845932474163498E-4, + 2.5669430297230187E-5, + 4.190919398766997E-6, + 4.0120078945548897E-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 d7a96302b72858a8c4704d87d469b11383864122..c374f5bf49c2e84ae0ac76bbf5bd12b382529bb6 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.1066205260901246, - 0.07825583368489923, - 0.056109842470212556, - 0.03934203889371674, - 0.027094158525910624, - 0.018091906437977468, - 0.011936509153668218, - 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 + 0.10662843285449959, + 0.07824810071880464, + 0.056092224288392833, + 0.03932092945064365, + 0.027074834020070587, + 0.01807739846138179, + 0.011927249217535595, + 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 ] }, "5.00 Second Spectral Acceleration": { @@ -69,25 +69,25 @@ 0.7929925155296614 ], "ys": [ - 0.03668139913725896, - 0.027416185277202007, - 0.020013441545351698, - 0.014186157289335533, - 0.00971580082012322, - 0.006493622679459942, - 0.004251065202650582, - 0.0027618184401512072, - 0.0017658984392134578, - 0.0010776067815833582, - 6.045776102932352E-4, - 2.999138195955864E-4, - 1.2672661498885026E-4, - 4.5597555745573066E-5, - 1.2806028374110111E-5, - 2.811031292211179E-6, - 4.3749715102153516E-7, - 3.7783452369069785E-8, - 9.623240540872695E-10, + 0.03665525011157855, + 0.027389707448509527, + 0.019990546097804228, + 0.014168971617259567, + 0.009704514652231754, + 0.006487022347543086, + 0.004247573605044015, + 0.002760014557014508, + 0.0017648618243578688, + 0.0010769045430596871, + 6.040882457487552E-4, + 2.996161961640509E-4, + 1.265814814782601E-4, + 4.554072437158029E-5, + 1.2790138132427735E-5, + 2.8081211450382065E-6, + 4.3717215651111337E-7, + 3.77685473965977E-8, + 9.634309743020169E-10, 0.0 ] }, @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.1349931553096723, - 0.10345943906469635, - 0.0769239914133015, - 0.055486209971864056, - 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.13500366174425624, + 0.1034549372880903, + 0.07691082953181422, + 0.05547022841345331, + 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.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.1728841872965669, - 0.1375827373817079, - 0.10543463713960693, - 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 + 0.17291724309586248, + 0.137597307722456, + 0.10543454027239899, + 0.07823088194864494, + 0.05587378251335148, + 0.039145888919733064, + 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 ] } } \ 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 a9bf63d5fd0bc622cd4984e9ddf10414650e4ca2..24487e5e979c0d2a7f57bac9f93418a39cc5eb2e 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.7412020069287325, - 0.546771097372181, - 0.3895666182491331, - 0.2693187943302815, - 0.18242338921639994, - 0.11995038403977892, - 0.07799644881444773, - 0.04927358342759975, - 0.030376607486987953, - 0.018008349759277505, - 0.010097680914907158, - 0.00521278561086945, - 0.0023892049050663073, - 9.327513480139984E-4, - 2.9569244893226095E-4, - 7.195033306131465E-5, - 1.0565214635249342E-5, - 5.827800074435574E-7, - 4.900599416825652E-9, - 4.275194655099434E-11 + 0.7414849444956302, + 0.546972089925951, + 0.38970440674489537, + 0.2694096345311028, + 0.18248049340167619, + 0.11998468599941699, + 0.07801841378245526, + 0.049289323471920554, + 0.03038827291251015, + 0.018016308468787247, + 0.010102563309228006, + 0.005215425683152113, + 0.002390429420824538, + 9.332117390717366E-4, + 2.9581197717664325E-4, + 7.197221084210431E-5, + 1.055928841294064E-5, + 5.80549294546406E-7, + 4.862838270633268E-9, + 4.2478967658728463E-11 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.19989802787063055, - 0.1454791924374374, - 0.10406351582976882, - 0.07264283835386522, - 0.04900244150364073, - 0.03203461887322696, - 0.0202326926768266, - 0.012514319742195705, - 0.007570412205123908, - 0.004370698137649081, - 0.002328097436837211, - 0.0010968941346559207, - 4.3491809840385653E-4, - 1.427451566651518E-4, - 3.477749217799798E-5, - 5.745950716089173E-6, - 4.6551996044968885E-7, - 1.0273248639993878E-8, + 0.1999320333044918, + 0.14547238901867288, + 0.10404029904794138, + 0.07262373469272385, + 0.04899490914377717, + 0.03203546819346173, + 0.02023635781858628, + 0.012517797022088403, + 0.00757319142415456, + 0.004372783453506823, + 0.002329336989392857, + 0.0010973549941997798, + 4.349574047751899E-4, + 1.426745738124973E-4, + 3.471982208651822E-5, + 5.724895533671951E-6, + 4.6258031648876124E-7, + 1.0222199240583624E-8, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.941446692674993, - 0.7407885169406322, - 0.563676262226526, - 0.4142531765743614, - 0.2952951724787791, - 0.2055261969138869, - 0.1405332525902355, - 0.09407170389206379, - 0.06152413341756263, - 0.03870360907811028, - 0.02306193103598436, - 0.01242056330021445, - 0.005944148449743759, - 0.002343796648641668, - 7.320727193201749E-4, - 1.6617918651901805E-4, - 2.373369787480074E-5, - 1.3637344746821936E-6, - 1.1750308079023131E-8, - 2.573279141406786E-11 + 0.9418024725570415, + 0.7410570370786783, + 0.5638755667678086, + 0.41439925764602026, + 0.2954008015078749, + 0.20560267851799663, + 0.14058955956527433, + 0.09411306736213199, + 0.06155341473221881, + 0.038722881399305645, + 0.023073598728578334, + 0.012426885974373813, + 0.005947170100010042, + 0.002344982750745219, + 7.324168494328383E-4, + 1.662413409007794E-4, + 2.3734081243719794E-5, + 1.3612359461363788E-6, + 1.1659889488219932E-8, + 2.5553361272293353E-11 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 1.1094705753560454, - 0.9074498058082456, - 0.7162917121900128, - 0.5477892655903103, - 0.4030663143449499, - 0.29003473458033724, - 0.20377246183432465, - 0.14019231121072628, - 0.09489231245407237, - 0.06276041979515903, - 0.0401527687724505, - 0.024367211576743906, - 0.0136370347718493, - 0.006794920278788953, - 0.002900600612398345, - 0.00101273146372814, - 2.7665341473606154E-4, - 5.4736799591264516E-5, - 6.206212855747993E-6, - 2.2238003232261039E-7 + 1.1099011575582847, + 0.907793780109076, + 0.7165583589123903, + 0.5479912542017578, + 0.4032151337996709, + 0.2901451895955043, + 0.2038569105676981, + 0.14025790745123906, + 0.09494138204761446, + 0.0627942641025265, + 0.040174234750961824, + 0.024379861379711397, + 0.013643963195724338, + 0.006798335703120908, + 0.002902040254043068, + 0.0010132250907367718, + 2.767694912175682E-4, + 5.4755505699764406E-5, + 6.2042322590837665E-6, + 2.2131832407162458E-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 649aa23fe7b18031f38c1a3cb2877929b8f859a5..bcd11d9212b781435b5cb58dba2adc7ed50a424a 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.2720012839099464, - 0.22500101891286955, - 0.1795956127957704, - 0.1380152103367654, - 0.10236460084101376, - 0.07254027934989354, - 0.04987402230582741, - 0.03285731579837476, - 0.0209271590832584, - 0.012804398289015523, - 0.007478196138367596, - 0.004109055516008944, - 0.002078683165252033, - 9.424289908426162E-4, - 3.712971432068213E-4, - 1.2376763365575736E-4, - 3.217585650066018E-5, - 6.088764006370009E-6, - 6.638069060296292E-7, - 2.2338042216476536E-8 + 0.27201052316590696, + 0.22499575588290702, + 0.17957846056545027, + 0.1379903353573392, + 0.10233687601461383, + 0.07251405452587918, + 0.04985213673544235, + 0.032840973430212535, + 0.02091605154133237, + 0.012797494989773298, + 0.007474250359537293, + 0.004106975503171367, + 0.002077674925647267, + 9.419860444678683E-4, + 3.7112560456621093E-4, + 1.2371061156025387E-4, + 3.2160849294532844E-5, + 6.0859084780263276E-6, + 6.635022650734101E-7, + 2.232666102689314E-8 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.10112155116443493, - 0.07536274297033069, - 0.05467225443720265, - 0.03855135589753426, - 0.026295074114303603, - 0.017434536142098132, - 0.011196417577343755, - 0.0070428555522426255, - 0.004340897633319749, - 0.002584434083125346, - 0.0014543142944078412, - 7.472476663557046E-4, - 3.358110282768571E-4, - 1.3061836671336092E-4, - 4.0509946695418904E-5, - 9.83906313046857E-6, - 1.5976112911162914E-6, - 1.1702442353526242E-7, - 2.9729067075443623E-10, - 4.389238001777538E-12 + 0.10107700225797571, + 0.07531587821606976, + 0.05462779415897831, + 0.03851305062306139, + 0.02626505016141622, + 0.017412981991419302, + 0.011182261433973929, + 0.007034262981819711, + 0.004336068019451625, + 0.00258194072998656, + 0.0014531390333700556, + 7.467498317545005E-4, + 3.356271544132739E-4, + 1.3055889317463434E-4, + 4.049443127471073E-5, + 9.835851942319063E-6, + 1.597104190695208E-6, + 1.1697188506625353E-7, + 2.9610242527464003E-10, + 4.3790263962860484E-12 ] }, "Peak Ground Acceleration": { @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.2997574596960255, - 0.2594970677904381, - 0.21800348948407317, - 0.17666524901866726, - 0.1375855038726806, - 0.10267707671363704, - 0.07323059909803735, - 0.0495145751290026, - 0.031761383858285856, - 0.019223717074444042, - 0.010977650963636176, - 0.005754173014131576, - 0.002791308105856049, - 0.001189193451117029, - 4.3628590817867453E-4, - 1.305744694545304E-4, - 3.0452965136500134E-5, - 5.153654934301513E-6, - 6.486338325711446E-7, - 5.098248660411605E-8 + 0.29977596947720353, + 0.2595056437554021, + 0.21800383242958077, + 0.176659391361559, + 0.13757571290894338, + 0.10266562629167228, + 0.07321944596775766, + 0.049505089995702786, + 0.031754210521411905, + 0.019218869218199597, + 0.010974692684574421, + 0.005752548433751531, + 0.0027904784592893755, + 0.0011888170612523923, + 4.3614120080964585E-4, + 1.3053126945475674E-4, + 3.0443836345077946E-5, + 5.152612478980116E-6, + 6.485907985375588E-7, + 5.098241528199167E-8 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.33134195947353257, - 0.2952442825082112, - 0.2561058686047792, - 0.21595142650255816, - 0.1752830008987528, - 0.1375976824795585, - 0.10364510277886793, - 0.07453632475792718, - 0.05117114296700223, - 0.033382624917334625, - 0.020666555202340092, - 0.012084714154117097, - 0.006625971666421022, - 0.0033650785545447535, - 0.0015524800541055423, - 6.317979271851182E-4, - 2.219466181801561E-4, - 6.563867979464505E-5, - 1.5714570279941968E-5, - 3.047854069812862E-6 + 0.3313699611027911, + 0.2952628521039013, + 0.256115875119643, + 0.21595425320540784, + 0.17528009412164086, + 0.13759093072638184, + 0.10363634682338116, + 0.07452725708290683, + 0.05116304150420865, + 0.03337620668615554, + 0.020661991722175213, + 0.012081778895451837, + 0.006624246071428026, + 0.0033641465910501933, + 0.0015520252750305093, + 6.316065834170602E-4, + 2.218805865393437E-4, + 6.562100555559944E-5, + 1.5711410434989752E-5, + 3.0475734819834536E-6 ] } } \ No newline at end of file