diff --git a/gradle.properties b/gradle.properties index 0f089207cb4d07ca8de3e1334bf87c00ca4e8613..0f4c21747d887a6dd04eb5d0c69b4770ee61b195 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,7 +12,7 @@ micronautVersion = 3.2.3 micronautRxVersion = 2.1.1 nodePluginVersion = 3.0.1 nodeVersion = 16.3.0 -nshmpLibVersion = 1.4.2 +nshmpLibVersion = 1.4.5 nshmpWsUtilsVersion = 0.3.14 openApiVersion = 4.0.0 shadowVersion = 7.1.2 diff --git a/nshms.yml b/nshms.yml index 66e463eabd8b9eff9bd91a34b03405cf5de9fef0..24a679f1003c23508ca6281d79107f5e7518c8b1 100644 --- a/nshms.yml +++ b/nshms.yml @@ -27,7 +27,7 @@ nshms: # Alaska 2023 NSHM - repo: nshm-alaska - tag: 3.b.1 + tag: 3.b.2 year: 2023 deployment: baseHref: /ws/nshmp/alaska-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 3b6e01fae88a69dd1ae0f3d35a979fc41f7b2426..4b35b25a93f20d5e4d7203d2f953ea34fe706dbb 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.2054555515762317, - 0.9028091000448484, - 0.6554279343728451, - 0.46052017062111833, - 0.3150462086406549, - 0.2079541835539892, - 0.13510318879263483, - 0.08496232958033866, - 0.05198877570276788, - 0.030583282073321984, - 0.017133029172456044, - 0.009013906892259085, - 0.004368018380152508, - 0.0019023603631335428, - 7.253479503041853E-4, - 2.3667610679091534E-4, - 6.079243246974546E-5, - 1.1568716022798485E-5, - 1.6034782240213748E-6, - 1.1096198331547102E-7 + 1.533063154944145, + 1.1407161981023402, + 0.8215822582633048, + 0.5714610809176423, + 0.3859010924760768, + 0.25044358843662284, + 0.15947512963710497, + 0.09801803609658635, + 0.058562947297100584, + 0.03362972352186001, + 0.018385589905721637, + 0.009429014890112471, + 0.004445722835655383, + 0.0018782080133839675, + 6.896800784674155E-4, + 2.1340211762779895E-4, + 5.05265902261328E-5, + 8.209869677730849E-6, + 7.704613945883778E-7, + 2.7290947557416635E-8 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.337110893244185, - 0.24288274042641872, - 0.17000510342530806, - 0.11507904464560198, - 0.0747122950279596, - 0.04659280256752297, - 0.027601845311792595, - 0.015568934707478705, - 0.008266059302624659, - 0.004025039806025589, - 0.0017531377367981883, - 6.604483605952787E-4, - 2.0523962859475266E-4, - 5.130418536958973E-5, - 8.741628947536684E-6, - 9.886449176534945E-7, - 6.195012341136178E-8, - 8.89217501634637E-10, + 0.37170323895744295, + 0.2620000612411526, + 0.17884768663968825, + 0.11786183378532414, + 0.07448294328863589, + 0.045305003759507544, + 0.026242189820212897, + 0.014502527525221853, + 0.00754835725207039, + 0.0036051671205996907, + 0.001545082011865317, + 5.769936531403613E-4, + 1.7956916400703463E-4, + 4.5887625702533984E-5, + 8.333307355222622E-6, + 1.055248596834087E-6, + 6.316277991331568E-8, + 8.9197976377949E-10, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.6613397322178003, - 1.3121797388956014, - 1.0090469580101904, - 0.7525216690797256, - 0.5439798420102856, - 0.3812565494437257, - 0.25908605437802307, - 0.169679716746282, - 0.10750734044713979, - 0.06575591056475857, - 0.03895452425045244, - 0.021852972874971337, - 0.01171693182540402, - 0.005756572334329402, - 0.002563576391088447, - 9.955391928159057E-4, - 3.2766788300820325E-4, - 8.712092747041929E-5, - 1.814297766184108E-5, - 2.759261195157371E-6 + 2.2655440287103956, + 1.7986659692706735, + 1.3901805900739883, + 1.0431033263108314, + 0.759591239120557, + 0.5363747507652474, + 0.3665025315205776, + 0.2402952841982099, + 0.15149777169027343, + 0.09164091542964117, + 0.05346820497275271, + 0.029503176955336368, + 0.015609076535781568, + 0.0076142181202109955, + 0.003394105294912394, + 0.0013302250050878247, + 4.450595267230792E-4, + 1.215738009424795E-4, + 2.6218747566194934E-5, + 4.114439165675712E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.05978862257614, - 1.6847130528576502, - 1.3374151785315171, - 1.0346301300938567, - 0.7730618961287371, - 0.5641017389284263, - 0.39915557576688454, - 0.2730852917126187, - 0.1810591004006028, - 0.11600033979770012, - 0.07191096104453407, - 0.04305649762836622, - 0.02476993665698194, - 0.013546053314537832, - 0.0069253084658924425, - 0.0032307592796199233, - 0.0013501537731989938, - 4.936418890740649E-4, - 1.5205241845669444E-4, - 3.792182882476171E-5 + 2.79148188897884, + 2.301720049127536, + 1.8400765578315925, + 1.4329865805588027, + 1.0787216214270223, + 0.7936474006563398, + 0.5662755916056919, + 0.3899815715005908, + 0.2592565048337815, + 0.16567481522369287, + 0.10191341967075936, + 0.06033704442927267, + 0.03430119142426228, + 0.01858672429079244, + 0.009466826063871583, + 0.004427254230755186, + 0.0018638234976663096, + 6.883732074492491E-4, + 2.1426505667171495E-4, + 5.381174371384032E-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 f021d6a096d6e0a1568f3cd475b690f48ba70f39..3c4648718ae3c7d08d16fda16ac9f7cd40a41a24 100644 --- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json +++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json @@ -23,26 +23,26 @@ 1.7119945007591924 ], "ys": [ - 0.5109004056966681, - 0.38428885297556936, - 0.27835250548079415, - 0.1922805944002878, - 0.12619235442902257, - 0.0770875336643894, - 0.044606543906534527, - 0.02392502922877578, - 0.012017752029005603, - 0.0056001591343033345, - 0.0024108452012301432, - 9.492184164185979E-4, - 3.3672214835945435E-4, - 1.051656859796978E-4, - 2.801427769382648E-5, - 6.0923215137596925E-6, - 9.25254984409327E-7, - 8.670585871169394E-8, - 3.778898501352082E-9, - 2.959441369126757E-11 + 0.8292892919188968, + 0.6167682973286976, + 0.44113124260476905, + 0.30115269189159843, + 0.1959524513575399, + 0.11924721666679043, + 0.06916501989741619, + 0.03745240223087982, + 0.01914649698212769, + 0.009160489598271877, + 0.004082728182721788, + 0.001675237985413867, + 6.210405790700311E-4, + 2.0250922623244472E-4, + 5.597806736866798E-5, + 1.24864698029958E-5, + 1.9355053380564243E-6, + 1.8541607933551504E-7, + 8.360038339691291E-9, + 6.722763782313272E-11 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.18748273265144783, - 0.13135989752846303, - 0.08699321223907233, - 0.054168134029258304, - 0.03141629624936587, - 0.016992854773585808, - 0.008424393609266497, - 0.003830549825149107, - 0.0015752224901363144, - 5.700104588547456E-4, - 1.7886064952294292E-4, - 4.7401225156300514E-5, - 1.0186207073551549E-5, - 1.839820538692405E-6, - 2.512200645267704E-7, - 2.3497330971664887E-8, - 8.084303599442336E-10, - 6.8911467896809755E-12, + 0.24445648251699703, + 0.1680588311324935, + 0.10965883556833136, + 0.06759328549814493, + 0.038995674182772146, + 0.021102945978492545, + 0.01055206859387528, + 0.004894597894175565, + 0.002085825538563805, + 7.99081557862912E-4, + 2.716124059288402E-4, + 7.999159655265982E-5, + 1.9557325437878532E-5, + 3.938596174543948E-6, + 5.660891483593101E-7, + 5.368083053101887E-8, + 1.908163397206317E-9, + 1.76323887131773E-11, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.6317924751072215, - 0.4882923239010733, - 0.36592358465803315, - 0.26402717801876485, - 0.1826372881899886, - 0.12077324627493127, - 0.07622935704029506, - 0.045521269061182576, - 0.025731129837292626, - 0.013629882451863095, - 0.0067501994466702625, - 0.003024547672717661, - 0.0012432076275650347, - 4.4077108985418796E-4, - 1.31612939228522E-4, - 3.058751434281434E-5, - 4.977732203000428E-6, - 4.6082837298019124E-7, - 2.4782232268501392E-8, - 9.386366965413835E-10 + 1.0807665802667987, + 0.8370085520255732, + 0.6283032489468138, + 0.45463814314198675, + 0.3161559030720859, + 0.21076836235454682, + 0.13441792225546148, + 0.08122747123833568, + 0.04651308460219772, + 0.025005039509492972, + 0.012597587749422162, + 0.005752855629242659, + 0.002406233406542181, + 8.651877985207779E-4, + 2.6059124300433574E-4, + 6.0762765196213574E-5, + 9.84639499239778E-6, + 8.796904587374058E-7, + 3.889680893355353E-8, + 6.861810842553833E-10 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.7752948291688881, - 0.6194243339359887, - 0.4787621598336898, - 0.35909784903118525, - 0.25817237596808235, - 0.1797105618464373, - 0.11993489664944947, - 0.07639555986360248, - 0.046494128306174, - 0.02682744275660535, - 0.0145978111541393, - 0.007424829870419157, - 0.0034964087676582337, - 0.0015029928180070365, - 5.75879040769705E-4, - 1.891956085566876E-4, - 5.111961625126819E-5, - 1.0593460107111634E-5, - 1.440328238016042E-6, - 1.1559160576604646E-7 + 1.321406792618873, + 1.0607245257070397, + 0.8226225364994113, + 0.6189641518074268, + 0.4469797947255905, + 0.3131905188295343, + 0.2109122001911465, + 0.13581350646186346, + 0.08362692855113343, + 0.048848511653937415, + 0.026937202838255556, + 0.013907523665226474, + 0.006654232794188234, + 0.0029034189290078473, + 0.0011257951711251975, + 3.72440771243018E-4, + 1.0077666549854122E-4, + 2.073646335166421E-5, + 2.7287243336131094E-6, + 1.8736618764986356E-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 8e5ade7f1f0a4f20f0e871d0b6ae2897ffa42b9a..ce6ba4240b0dddef339dbfc53da49286b9bb8daa 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.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, - 6.599735019381921E-5, - 2.0557183857072948E-5, - 4.820051473646981E-6, - 7.510233127519178E-7, - 5.781553857768471E-8, - 5.310018847258364E-10 + 0.512120293069315, + 0.37666505789756466, + 0.2653280559013392, + 0.1768443404587469, + 0.11072970089993091, + 0.0635606616146817, + 0.03427141069753238, + 0.01719625403268733, + 0.008338679371368583, + 0.0039960053643921896, + 0.0019322581011734662, + 9.316835724096548E-4, + 4.3226125087393006E-4, + 1.8373701850976553E-4, + 6.801658489891432E-5, + 2.100834889666948E-5, + 4.89051914252019E-6, + 7.578514900672313E-7, + 5.8124450106089735E-8, + 5.334809112313924E-10 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 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, - 3.924192563508301E-6, - 7.119861788279011E-7, - 7.54058074585313E-8, - 2.9446262800098265E-9, + 0.17725958789581547, + 0.12363509220348205, + 0.08114850092946894, + 0.04994116052122807, + 0.02866866807337843, + 0.015490872963489577, + 0.007845028277144943, + 0.0038017321917609595, + 0.0017824879465811296, + 8.078876169281963E-4, + 3.519052169317436E-4, + 1.4305885506268152E-4, + 5.164353783167469E-5, + 1.6203945168186292E-5, + 3.945916881737128E-6, + 7.140403020919065E-7, + 7.547992987862225E-8, + 2.945347236237444E-9, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.3715230637433389, - 0.28063926170436876, - 0.20207818362048996, - 0.13761687764684405, - 0.0880878659890649, - 0.05295591344987423, - 0.030287824645005092, - 0.01677394525487418, - 0.009293443452510475, - 0.005210479932584492, - 0.0029453609749909887, - 0.0016014076514413098, - 8.251028586919217E-4, - 3.754123972723159E-4, - 1.4511530287201178E-4, - 4.43204875863051E-5, - 9.946699017148776E-6, - 1.394430570948944E-6, - 8.728241476126261E-8, - 4.48142653366506E-11 + 0.61851599496289, + 0.46027701115972197, + 0.3249979331330102, + 0.2161363312310295, + 0.1347864613484304, + 0.0788073190777626, + 0.04363342643391949, + 0.02316636477635781, + 0.012182449983062157, + 0.006457462663724176, + 0.003472147763825607, + 0.0018142252173219086, + 9.082024525831877E-4, + 4.042395704672251E-4, + 1.536177739346148E-4, + 4.6263337327292985E-5, + 1.025180393014928E-5, + 1.4194347538755984E-6, + 8.805028014459442E-8, + 4.564945788216327E-11 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 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, - 4.4277633445149664E-4, - 1.8492301874170028E-4, - 6.417920601452256E-5, - 1.7588998998730946E-5, - 3.4540968632416897E-6, - 3.9737990095510676E-7 + 0.7492375064517502, + 0.5852647446990902, + 0.43361857486743327, + 0.30543200979038676, + 0.20137020449200294, + 0.12588763490132418, + 0.0739959825821362, + 0.04118252742715671, + 0.022279934207652133, + 0.011985680318084413, + 0.006544527582561283, + 0.003613647223305311, + 0.0019664144840350196, + 0.0010172979425685077, + 4.8020983620873235E-4, + 1.9706316307836622E-4, + 6.741473420715479E-5, + 1.8241602456723483E-5, + 3.536506152860099E-6, + 4.0242316113911945E-7 ] } } \ No newline at end of file diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json index 2ce9d9c4e5f1af56ff4715dda684d2c1b8d68790..c15b5218a159aa3611f533516eff319170532edc 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.1563620076198486, - 0.8108764450280195, - 0.5567165204469949, - 0.37661611971515374, - 0.2537526455080179, - 0.16872404946018202, - 0.11239265813984661, - 0.07322616517880995, - 0.04643855515385444, - 0.028125547691862807, - 0.01608095588479048, - 0.008588053357425613, - 0.004227805934470851, - 0.001880739342548035, - 7.38402986405887E-4, - 2.5143038412483776E-4, - 6.889623213888919E-5, - 1.4191160404183605E-5, - 2.2058054212325666E-6, - 2.713664261232649E-7 + 1.3073225687969399, + 0.9207118599239599, + 0.6337829335225674, + 0.42765934850468174, + 0.28508681167607003, + 0.18566423452688735, + 0.1201561775732507, + 0.07561485439371214, + 0.04623090528176141, + 0.02695249432803597, + 0.014774937482104736, + 0.007506175334328023, + 0.003476889709879042, + 0.0014359990484572303, + 5.136880855823932E-4, + 1.544015976927677E-4, + 3.486118862547909E-5, + 4.846446974844039E-6, + 2.570664943015904E-7, + 4.5285149188006825E-9 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.31656209313044403, - 0.2272621600728691, - 0.16079658976985176, - 0.11155444042021775, - 0.07492654394850827, - 0.04836275399557946, - 0.029428775507733623, - 0.016867048098076296, - 0.009045902081159955, - 0.004456027136211508, - 0.001971744673640637, - 7.571835371149252E-4, - 2.3968075695000922E-4, - 6.006249984803165E-5, - 9.479306830402173E-6, - 7.551063889629073E-7, - 7.428233573779026E-9, - 1.537150078678922E-12, + 0.3226030598399519, + 0.22850974081833267, + 0.15855754655125956, + 0.10720259569803775, + 0.06981170131922863, + 0.04362798321956349, + 0.02574769713386205, + 0.014361721478916012, + 0.007505879072677979, + 0.0035982847098193042, + 0.001549461791739408, + 5.810142337950335E-4, + 1.805047486590613E-4, + 4.494230542946291E-5, + 7.513495317074033E-6, + 7.636630272859888E-7, + 1.6710926282203634E-8, + 3.774117618952272E-12, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 1.5818370153080574, - 1.1519523768720097, - 0.8138919707236263, - 0.5601403780003567, - 0.3790209528716756, - 0.25437765683926533, - 0.1702785334332962, - 0.11325322795459271, - 0.07494686466250117, - 0.048808282955205555, - 0.03095034969741541, - 0.018547690434692298, - 0.010586599286993821, - 0.0055711678871122276, - 0.002683668061746994, - 0.0011429570458595906, - 4.1854882952960064E-4, - 1.2605159742794264E-4, - 3.006635391539969E-5, - 5.060803399396688E-6 + 1.957814010826338, + 1.4510116562419488, + 1.0409322454064536, + 0.7238267163649046, + 0.49121882756650537, + 0.3277201569559674, + 0.2160909620342424, + 0.1403502540336006, + 0.09007025363459092, + 0.05661548963360734, + 0.03459142798759258, + 0.01995381289546401, + 0.010981200717162876, + 0.005583183721144435, + 0.0026087117535387666, + 0.0010803180678143995, + 3.8372169619724206E-4, + 1.1093090859102292E-4, + 2.5177469774201432E-5, + 3.702096214323919E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 2.116832315175776, - 1.619134652764648, - 1.1884029735633264, - 0.8460325924471095, - 0.5822456895819994, - 0.39664843443330755, - 0.26734789151385235, - 0.17886421327210067, - 0.11940851221022791, - 0.07915770139847726, - 0.05176159061518672, - 0.03292045995221985, - 0.020051569247233968, - 0.011548368691057695, - 0.006219947395163814, - 0.00308013155302673, - 0.0013832551915340973, - 5.529275798222956E-4, - 1.8979196648651837E-4, - 5.422086371495596E-5 + 2.5583115850343288, + 1.992233025926088, + 1.49079666897406, + 1.0803559246513028, + 0.7538697586247151, + 0.5170550610484879, + 0.3479140251913233, + 0.2302424562300654, + 0.15072732054418891, + 0.0972560009661915, + 0.06157962041595509, + 0.03782183256659841, + 0.022235748217008695, + 0.012372917725262084, + 0.006453522334062419, + 0.0031042211848715815, + 0.001357407679384206, + 5.276856665439088E-4, + 1.7533814419731086E-4, + 4.798985685733547E-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 c1d65acd67527fbe90b9c1ef2d67ef7fcb1cc944..3171763b4630c5743d464a59a32a3ce0180c03c7 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.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.5998082832802962E-5, - 2.6495775486437754E-6, - 4.0149074492627344E-7 + 1.0209181532865608, + 0.7517258626908789, + 0.5340030954111529, + 0.36244464368364526, + 0.23530657513312783, + 0.1446932923306082, + 0.0869894418629285, + 0.050823770607208336, + 0.02941423799947835, + 0.01675047126980642, + 0.009281268855155256, + 0.004907629768558396, + 0.002413077011379261, + 0.001070324182588001, + 4.1370574981955096E-4, + 1.3484280479235454E-4, + 3.3630612278286416E-5, + 5.622876147319107E-6, + 3.916433051796782E-7, + 3.9792827222195564E-9 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 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.138098269363081E-5, - 1.1110857635807404E-6, - 1.7343952315951334E-8, - 2.523164424762348E-12, + 0.33217215250043075, + 0.23284181120412545, + 0.15510459811230162, + 0.09827960040242317, + 0.059135322405738974, + 0.034201186352958345, + 0.019016394608674398, + 0.010318793785296574, + 0.005436902958621392, + 0.0027086834398179055, + 0.001236293379390497, + 4.965112525359664E-4, + 1.6642294411611604E-4, + 4.5373091479458334E-5, + 8.73852112539336E-6, + 9.985631819213537E-7, + 3.8035253360117944E-8, + 6.034386292318592E-12, 0.0, 0.0 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 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.876304918572318E-4, - 1.2604851344386937E-4, - 3.334943264206746E-5, - 6.212458145030209E-6 + 1.2703330278498468, + 0.9468958882157659, + 0.6841211965367154, + 0.4774308682405098, + 0.32321663470567796, + 0.21387621393424558, + 0.1393756470649216, + 0.08935773867517177, + 0.056709628720452196, + 0.035516467389975215, + 0.02196915362655866, + 0.013106667169204136, + 0.007571576029979501, + 0.0040668343979987105, + 0.00200835779285212, + 8.806775829748759E-4, + 3.3376502132829067E-4, + 1.0480707314457948E-4, + 2.6359452660345154E-5, + 4.501571471187711E-6 ] }, "0.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 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.004732888236227227, - 0.0024691893686298247, - 0.0011699365781911882, - 4.949755080134131E-4, - 1.8203861819997193E-4, - 5.664939647060591E-5 + 1.6348680130273041, + 1.260235780434143, + 0.9373356291891277, + 0.6769171444207911, + 0.4711420523262833, + 0.3223152039260565, + 0.21614852875481277, + 0.14232785396851258, + 0.0925009830472931, + 0.059184278757264654, + 0.0372946388959322, + 0.023071467292429038, + 0.013916239561053692, + 0.008084678609549027, + 0.00444780185647492, + 0.002267047158328631, + 0.0010532762171519166, + 4.368629475169508E-4, + 1.5695254904093096E-4, + 4.723790920790174E-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 c9fa0e53609e7cbbfaf14764d9057e44184bfbba..6415ddf2a11656407ae300ff32e53983c8d5a66f 100644 --- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json +++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json @@ -24,25 +24,25 @@ ], "ys": [ 0.03781690942134723, - 0.02560998712695722, - 0.01683517841756172, - 0.010675317900339298, - 0.006527977980738499, - 0.003766674193961606, - 0.0020910571328798203, + 0.025609987126957223, + 0.016835178417561724, + 0.010675317900339302, + 0.006527977980738501, + 0.0037666741939616053, + 0.0020910571328798195, 0.0010923590899631099, 5.458772566494525E-4, - 2.6104985735441133E-4, - 1.2062939801655836E-4, + 2.610498573544114E-4, + 1.2062939801655835E-4, 5.4113647550187295E-5, - 2.347538999109399E-5, - 9.699580588310418E-6, - 3.721362199001128E-6, - 1.2984686317975077E-6, - 3.882066000228317E-7, - 9.785045471794203E-8, - 1.946037843483608E-8, - 2.7422728345358543E-9 + 2.3475389991093996E-5, + 9.699580588310421E-6, + 3.7213621990011272E-6, + 1.2984686317975075E-6, + 3.8820660002283157E-7, + 9.785045471794201E-8, + 1.9460378434836078E-8, + 2.742272834535854E-9 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 0.009213207300948618, - 0.006121721172229912, - 0.003927784889616463, - 0.0024158433781355324, - 0.0014072769298912606, - 7.774423342976145E-4, - 4.024693099758764E-4, - 1.9730634218575706E-4, - 9.182408947706068E-5, - 4.0465849036853986E-5, + 0.00921320730094861, + 0.006121721172229914, + 0.003927784889616464, + 0.002415843378135533, + 0.0014072769298912608, + 7.774423342976148E-4, + 4.0246930997587664E-4, + 1.97306342185757E-4, + 9.182408947706066E-5, + 4.046584903685399E-5, 1.7037600174972735E-5, - 6.866482223986137E-6, + 6.866482223986138E-6, 2.6160622771360315E-6, 9.542403834324575E-7, - 3.118560745323649E-7, + 3.1185607453236485E-7, 9.181884057053901E-8, - 2.2848239268149793E-8, - 4.620311222721341E-9, + 2.2848239268149787E-8, + 4.620311222721342E-9, 6.936412711209974E-10, 7.028579358099718E-11 ] @@ -116,22 +116,22 @@ ], "ys": [ 0.06599397975220576, - 0.04951601624256741, - 0.03651373898213651, - 0.026258583569526418, - 0.018339162919634253, + 0.04951601624256742, + 0.036513738982136494, + 0.026258583569526407, + 0.01833916291963425, 0.012411914456006222, 0.00814100683328957, - 0.005152225174879874, - 0.003167899870405808, + 0.005152225174879873, + 0.0031678998704058074, 0.001891726179226934, - 0.0011035470885633655, - 6.179966567302162E-4, + 0.0011035470885633653, + 6.179966567302164E-4, 3.385611975149566E-4, - 1.763058445320691E-4, - 8.726172285630192E-5, + 1.7630584453206914E-4, + 8.726172285630188E-5, 3.982648113280291E-5, - 1.6325079063764054E-5, + 1.6325079063764057E-5, 5.769066788130918E-6, 1.7184900721224078E-6, 3.963193550050803E-7 @@ -161,25 +161,25 @@ 1.998773638612381 ], "ys": [ - 0.09353115905390527, + 0.09353115905390524, 0.07030167366690492, - 0.051239316163458504, - 0.03630581145641291, - 0.024635985605014427, - 0.016213078359687383, - 0.010249801865790501, - 0.0062122987954390104, - 0.003630754390360235, - 0.002043138422374023, - 0.0011103316932372838, - 5.822894133817993E-4, + 0.05123931616345852, + 0.036305811456412915, + 0.02463598560501443, + 0.016213078359687386, + 0.010249801865790503, + 0.00621229879543901, + 0.0036307543903602354, + 0.0020431384223740224, + 0.0011103316932372833, + 5.822894133817992E-4, 2.9401954680419515E-4, - 1.4214673052602843E-4, - 6.507484914740442E-5, - 2.762583302658458E-5, - 1.0658990087928293E-5, + 1.421467305260284E-4, + 6.507484914740439E-5, + 2.7625833026584582E-5, + 1.0658990087928291E-5, 3.622386410973509E-6, - 1.034200636028549E-6, + 1.0342006360285488E-6, 2.364746742386964E-7 ] } 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 49db55ac59f36cee724c2e75e7c5eded04b20c71..a8c88cbb891992ff79ba3736cdf00f6b19c2fad9 100644 --- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json +++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json @@ -23,24 +23,24 @@ 1.7119945007591924 ], "ys": [ - 0.03324893297580753, - 0.02200443073185097, - 0.014310146745674705, + 0.033248932975807534, + 0.022004430731850974, + 0.01431014674567471, 0.009151237164552267, 0.005779612247836648, - 0.0035140271310088256, - 0.0020552894552774707, + 0.003514027131008825, + 0.00205528945527747, 0.0011024807090991673, - 5.332789224579894E-4, + 5.332789224579896E-4, 2.250206167929638E-4, - 8.132454691411791E-5, + 8.13245469141179E-5, 2.4983602810937422E-5, - 6.682951495042382E-6, + 6.682951495042381E-6, 1.7449632407250264E-6, 4.909788509372823E-7, 1.568434844141301E-7, 4.415991214768775E-8, - 1.0492474877263185E-8, + 1.0492474877263187E-8, 1.9576567710691036E-9, 2.5802146447004877E-10 ] @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.010005966687589414, - 0.007020138016325777, - 0.004946068441225725, + 0.010005966687589418, + 0.00702013801632578, + 0.004946068441225724, 0.0034831491901766163, 0.0023991264653615485, - 0.0015793590399934086, - 9.569573584680404E-4, + 0.0015793590399934081, + 9.569573584680407E-4, 5.209840505848331E-4, - 2.4735029087071973E-4, + 2.473502908707197E-4, 9.904659977269298E-5, - 3.277867678440815E-5, - 8.712990458832454E-6, + 3.2778676784408135E-5, + 8.712990458832452E-6, 1.790453986052243E-6, - 3.0534530225080447E-7, - 4.58642227331307E-8, - 9.670711470276269E-9, - 2.3562950445765526E-9, - 4.914029457128016E-10, + 3.053453022508045E-7, + 4.5864222733130684E-8, + 9.67071147027627E-9, + 2.356295044576553E-9, + 4.914029457128014E-10, 7.99798410640728E-11, - 9.381018392075353E-12 + 9.381018392075355E-12 ] }, "Peak Ground Acceleration": { @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 0.040886253926119796, - 0.02742434546898031, - 0.01821903281900559, - 0.011934419843991734, - 0.007663005702927002, - 0.004765107676278688, + 0.04088625392611982, + 0.027424345468980312, + 0.018219032819005592, + 0.01193441984399173, + 0.007663005702927, + 0.004765107676278687, 0.002828226723909663, - 0.001578305741694685, - 8.390687838893622E-4, + 0.0015783057416946847, + 8.390687838893623E-4, 4.3180039393759585E-4, - 2.2144130093824585E-4, - 1.126678067797062E-4, - 5.8213562781325624E-5, - 2.9316226798325764E-5, + 2.2144130093824588E-4, + 1.1266780677970619E-4, + 5.821356278132562E-5, + 2.9316226798325768E-5, 1.4233176969030014E-5, 6.4074677021284365E-6, - 2.5948292983347617E-6, + 2.5948292983347626E-6, 9.058302958854361E-7, - 2.664550977482879E-7, - 6.060200630189976E-8 + 2.664550977482878E-7, + 6.060200630189975E-8 ] }, "0.20 Second Spectral Acceleration": { @@ -162,25 +162,25 @@ ], "ys": [ 0.06915547654099248, - 0.046972964359900074, - 0.03095392939036071, - 0.02000269954895017, + 0.04697296435990007, + 0.030953929390360714, + 0.020002699548950176, 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, + 0.007683314792693457, + 0.004524340549673255, + 0.0025095586082908472, + 0.0013038136003968562, + 6.313142379345734E-4, + 2.8898317204236384E-4, + 1.2787451396826225E-4, + 5.6009010931444306E-5, + 2.444851739501035E-5, 1.0472190893854823E-5, - 4.248516889956777E-6, - 1.5807570795442502E-6, + 4.248516889956776E-6, + 1.5807570795442498E-6, 5.190573795746768E-7, - 1.4267651060313722E-7, - 3.112422839449764E-8 + 1.4267651060313717E-7, + 3.112422839449763E-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 e3edb1b592c69aeeb75bad0e3f39e0e1d0b8b4e6..4d4ac0e69d89cf74ac40a8423b04df3d8982483b 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,14 +23,14 @@ 1.7119945007591924 ], "ys": [ - 0.786128666880811, - 0.5989867378389928, - 0.44178844318711585, - 0.31489760246736437, - 0.21725145263732182, - 0.1426894479184029, - 0.09045605081902425, - 0.05431897381512409, + 0.7861256274006418, + 0.5989845281809747, + 0.44178710853742936, + 0.31489693844186456, + 0.2172511808878113, + 0.14268936390272952, + 0.09045603403859905, + 0.054318972441494084, 0.031214717859762035, 0.0170865257117781, 0.00892257650901468, @@ -69,18 +69,18 @@ 0.7929925155296614 ], "ys": [ - 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, + 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, @@ -115,12 +115,12 @@ 1.6428726885203377 ], "ys": [ - 0.9042474689285851, - 0.7163134989098943, - 0.5552601666932748, - 0.4209243567705844, - 0.31155434659452025, - 0.2238197439974888, + 0.9042474304661192, + 0.7163134812226057, + 0.555260160093929, + 0.42092435496932423, + 0.3115543462980755, + 0.22381974398147034, 0.15468937874039798, 0.1013382935885788, 0.06267724361287551, @@ -161,11 +161,11 @@ 1.998773638612381 ], "ys": [ - 1.0684659672013006, - 0.873171616894385, - 0.6943090175231557, - 0.541106309530617, - 0.4105958271604345, + 1.0684659703491564, + 0.873171618019982, + 0.6943090177998219, + 0.5411063095678713, + 0.4105958271632752, 0.30606376278716946, 0.221451727180247, 0.15394776614886982, 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 e3db00fb875a2a1e0aa23b720443114d9c8597c3..085e8344e57b2d629163244654fd0f65fe52bdf7 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.11534974599388692, + 0.11534974599388689, 0.08698148362667114, - 0.06406292276154263, - 0.04607819240390107, - 0.03253637461491278, - 0.022366693833913123, - 0.015293415275611743, - 0.010356859824249127, + 0.06406292276154266, + 0.04607819240390104, + 0.032536374614912766, + 0.022366693833913126, + 0.015293415275611741, + 0.010356859824249123, 0.007106468958929246, - 0.00500706098871143, + 0.005007060988711429, 0.0036674043082438913, - 0.0027708344084573754, + 0.002770834408457376, 0.0020867583438866017, - 0.00148781112066442, - 9.535104591395861E-4, - 5.308911889067075E-4, - 2.463291206258683E-4, - 9.459961578509015E-5, - 2.890552806939883E-5, - 6.721430339032406E-6 + 0.0014878111206644193, + 9.53510459139586E-4, + 5.308911889067074E-4, + 2.463291206258684E-4, + 9.459961578509016E-5, + 2.8905528069398842E-5, + 6.721430339032403E-6 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.026538247124583445, - 0.019066553257433182, - 0.013626789930696175, + 0.026538247124583452, + 0.01906655325743319, + 0.013626789930696178, 0.009766412237613655, - 0.007066016574296354, - 0.005239512440160899, + 0.007066016574296356, + 0.0052395124401609025, 0.004007437426269736, - 0.0031914639954694424, + 0.003191463995469442, 0.00261800813308166, - 0.002144306713417263, + 0.0021443067134172644, 0.0016873885021127446, - 0.001232547613642964, - 8.112590214694934E-4, - 4.762083128043082E-4, - 2.3778964735335538E-4, - 1.0104848505576491E-4, - 3.506863301214931E-5, - 9.656024770780144E-6, + 0.0012325476136429642, + 8.112590214694932E-4, + 4.762083128043084E-4, + 2.3778964735335535E-4, + 1.010484850557649E-4, + 3.5068633012149294E-5, + 9.656024770780149E-6, 1.971219304214483E-6, - 2.798556168029338E-7 + 2.7985561680293366E-7 ] }, "Peak Ground Acceleration": { @@ -115,25 +115,25 @@ 1.6428726885203377 ], "ys": [ - 0.20082676064116872, - 0.1730315848271918, - 0.14594179639708693, - 0.1198819725748202, - 0.09577256744724878, + 0.20082676064116864, + 0.17303158482719186, + 0.1459417963970869, + 0.11988197257482014, + 0.09577256744724875, 0.07448415764939256, - 0.05653535017187783, + 0.05653535017187785, 0.041839648586159454, - 0.03035918142088444, - 0.02160353845182129, - 0.015147906115404957, - 0.010380521885945633, - 0.007086879488558685, - 0.004776413456606937, - 0.0031940338772918704, + 0.03035918142088443, + 0.021603538451821294, + 0.015147906115404963, + 0.010380521885945636, + 0.007086879488558684, + 0.004776413456606938, + 0.00319403387729187, 0.0020630276122096014, - 0.001231476975976758, - 6.362928873656397E-4, - 2.7133026462445366E-4, + 0.0012314769759767578, + 6.362928873656395E-4, + 2.713302646244539E-4, 8.845951396062711E-5 ] }, @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.2323567297712059, + 0.23235672977120583, 0.20103085787724262, 0.16949594749416608, - 0.13897123143573167, - 0.10971503991299228, - 0.08417324450257645, - 0.06257442666476447, - 0.04514436991032575, + 0.1389712314357317, + 0.10971503991299225, + 0.0841732445025764, + 0.06257442666476448, + 0.04514436991032576, 0.031785772780841534, - 0.02184326878353101, + 0.021843268783531003, 0.014712773387355172, - 0.009775245758182328, - 0.006484415699356285, - 0.0043524833029607675, + 0.00977524575818233, + 0.006484415699356289, + 0.004352483302960769, 0.0029609704858198937, - 0.0019882511946060404, - 0.0012501956452844797, - 6.867847039996855E-4, - 3.0837841447121906E-4, - 1.0832132678542524E-4 + 0.0019882511946060395, + 0.0012501956452844794, + 6.867847039996852E-4, + 3.083784144712191E-4, + 1.0832132678542519E-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 8821ec070337f88d5067082ecc8db798a2699821..42d71941900baa9e0a72db31fbde95b55546200c 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.038262468062309395, - 0.02603046344860471, - 0.0171554008552419, - 0.010885390093212636, - 0.006660097241570287, + 0.0382624680623094, + 0.026030463448604713, + 0.017155400855241892, + 0.010885390093212639, + 0.006660097241570286, 0.003858088495130119, - 0.0021663261007892464, - 0.0011583421935267536, + 0.002166326100789246, + 0.0011583421935267538, 6.009032500164475E-4, - 3.023392670915314E-4, - 1.4817587290785018E-4, + 3.0233926709153134E-4, + 1.4817587290785013E-4, 7.05010480857786E-5, - 3.2189928803146996E-5, - 1.3832096806263693E-5, - 5.459529842118775E-6, - 1.9428392150340854E-6, - 5.888734403531786E-7, - 1.4974470891297607E-7, - 2.995182697021267E-8, - 4.2393461421128455E-9 + 3.218992880314699E-5, + 1.3832096806263695E-5, + 5.4595298421187765E-6, + 1.9428392150340858E-6, + 5.888734403531785E-7, + 1.497447089129761E-7, + 2.995182697021266E-8, + 4.239346142112846E-9 ] }, "5.00 Second Spectral Acceleration": { @@ -69,26 +69,26 @@ 0.7929925155296614 ], "ys": [ - 0.009600199498981164, - 0.006320598140568553, + 0.009600199498981162, + 0.0063205981405685535, 0.003998495592416972, 0.0024209681163326075, - 0.0013922805998762865, - 7.653511087722587E-4, - 3.991002814434199E-4, + 0.0013922805998762867, + 7.653511087722585E-4, + 3.9910028144341994E-4, 2.0013103147428781E-4, - 9.684010210476127E-5, - 4.501923579779383E-5, - 2.015822783889487E-5, + 9.684010210476128E-5, + 4.501923579779384E-5, + 2.0158227838894865E-5, 8.640044965400361E-6, 3.4752442404719263E-6, - 1.3213285385796125E-6, - 4.4489663641411424E-7, - 1.338527206430684E-7, - 3.383715559062799E-8, - 6.9217291724856125E-9, + 1.3213285385796123E-6, + 4.448966364141142E-7, + 1.3385272064306844E-7, + 3.3837155590627995E-8, + 6.921729172485613E-9, 1.0496384684360477E-9, - 1.071989454665421E-10 + 1.0719894546654213E-10 ] }, "Peak Ground Acceleration": { @@ -116,23 +116,23 @@ ], "ys": [ 0.06295212478082786, - 0.04804845815748259, - 0.036191610823481504, - 0.0267152751305139, - 0.019260736860335057, - 0.013535182229688403, - 0.009262342125760426, - 0.006136637176633701, - 0.003951706514772564, - 0.002467202597047593, - 0.0014990249509793992, - 8.710019776437942E-4, + 0.04804845815748258, + 0.0361916108234815, + 0.02671527513051389, + 0.019260736860335047, + 0.013535182229688407, + 0.009262342125760424, + 0.0061366371766337, + 0.003951706514772566, + 0.0024672025970475927, + 0.0014990249509793995, + 8.710019776437943E-4, 4.921002498934159E-4, - 2.628392916459284E-4, - 1.3262871270711604E-4, - 6.14117930372459E-5, - 2.5443650259819515E-5, - 9.066496305781536E-6, + 2.6283929164592823E-4, + 1.32628712707116E-4, + 6.141179303724588E-5, + 2.5443650259819518E-5, + 9.06649630578154E-6, 2.719577797059732E-6, 6.313004310982962E-7 ] @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 0.0877697243193884, + 0.08776972431938843, 0.06659157694814946, - 0.04922579949927612, - 0.035528614794925424, - 0.024688518599665064, - 0.016720836145648114, + 0.049225799499276135, + 0.03552861479492543, + 0.02468851859966506, + 0.016720836145648118, 0.010940274062286886, - 0.0068993724539074455, - 0.004211132882578025, - 0.0024795228150876546, - 0.0014092415433829243, - 7.711400309583E-4, - 4.047444862395123E-4, + 0.006899372453907445, + 0.004211132882578023, + 0.002479522815087655, + 0.001409241543382924, + 7.711400309583003E-4, + 4.0474448623951226E-4, 2.0238516038224294E-4, - 9.527876089291168E-5, + 9.527876089291164E-5, 4.1346212984332834E-5, - 1.621432414415702E-5, - 5.575162343216448E-6, - 1.6050336029577984E-6, - 3.6913561822247884E-7 + 1.6214324144157022E-5, + 5.575162343216449E-6, + 1.6050336029577975E-6, + 3.691356182224788E-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 b4a27d0370dc56ce87e310d42d89a1853b170ba2..b42763610de1929021ba58fb7d9bcf09c48ba5f2 100644 --- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json +++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json @@ -23,22 +23,22 @@ 1.7119945007591924 ], "ys": [ - 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, + 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, @@ -69,20 +69,20 @@ 0.7929925155296614 ], "ys": [ - 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, + 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, @@ -115,23 +115,23 @@ 1.6428726885203377 ], "ys": [ - 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, + 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 @@ -161,25 +161,25 @@ 1.998773638612381 ], "ys": [ - 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, + 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 ] } 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 c374f5bf49c2e84ae0ac76bbf5bd12b382529bb6..cb8381cce629ec75777f95a77fef7734eedf1964 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,13 +23,13 @@ 1.7119945007591924 ], "ys": [ - 0.10662843285449959, - 0.07824810071880464, - 0.056092224288392833, - 0.03932092945064365, - 0.027074834020070587, - 0.01807739846138179, - 0.011927249217535595, + 0.10662747502015506, + 0.07824745874887089, + 0.056091870987101874, + 0.039320770881321285, + 0.02707477624345603, + 0.018077383676974656, + 0.01192724710389813, 0.007736511888429048, 0.0050742304470271634, 0.0034040628997962373, @@ -69,18 +69,18 @@ 0.7929925155296614 ], "ys": [ - 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, + 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, @@ -115,10 +115,10 @@ 1.6428726885203377 ], "ys": [ - 0.13500366174425624, - 0.1034549372880903, - 0.07691082953181422, - 0.05547022841345331, + 0.13500365537985798, + 0.10345493494400575, + 0.07691082889167974, + 0.0554702283260215, 0.03898536548716778, 0.02677372539294796, 0.017960592844293032, @@ -161,12 +161,12 @@ 1.998773638612381 ], "ys": [ - 0.17291724309586248, - 0.137597307722456, - 0.10543454027239899, + 0.17291724335793995, + 0.13759730777491522, + 0.10543454027616725, 0.07823088194864494, 0.05587378251335148, - 0.039145888919733064, + 0.03914588891973307, 0.02681249454612485, 0.017941886971684428, 0.01181098901962554, 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 24487e5e979c0d2a7f57bac9f93418a39cc5eb2e..9413c7183660057c3bd3edac8198a5d2bb34dc7e 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.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 + 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 ] }, "5.00 Second Spectral Acceleration": { @@ -69,20 +69,20 @@ 0.7929925155296614 ], "ys": [ - 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, + 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, @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 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.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.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 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 + 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 ] } } \ 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 bcd11d9212b781435b5cb58dba2adc7ed50a424a..7af0814cb23f1fdd633dcd4d1d9a31709787f677 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.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 + 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 ] }, "5.00 Second Spectral Acceleration": { @@ -69,24 +69,24 @@ 0.7929925155296614 ], "ys": [ - 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, + 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 ] @@ -115,26 +115,26 @@ 1.6428726885203377 ], "ys": [ - 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.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.20 Second Spectral Acceleration": { @@ -161,26 +161,26 @@ 1.998773638612381 ], "ys": [ - 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 + 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 ] } } \ No newline at end of file