diff --git a/nshms.yml b/nshms.yml
index 6ae1185a48277a262eeff666ca4d0ea1d68d62db..0e6f277d3e489c6d27a75939b7c597ad21a64cea 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -94,7 +94,7 @@ nshms:
production:
cpu: 16
memory: 32
- label: 2023 Conterminous U.S. Dynamic Services (beta)
+ label: 2023 Conterminous U.S. Dynamic Services
model: CONUS_2023
test:
site:
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 1a886f348fae575930f3455464a8cd27728a0018..d9c9eb6734faf5543934ca52c8fa2ce1a1e6cbcb 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -101,7 +101,7 @@ class NshmTests {
// run single model
NshmModel nshmModel =
- NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
+ NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
nshmModel.exec.shutdown();
diff --git a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
index b5fce91a8f9357e2813ceebecb7e310fc7915814..250d76956479d7cd649a0c7fb5ee1f98edcbcd61 100644
--- a/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
@@ -23,26 +23,26 @@
1.6428726885203377
],
"ys": [
- 0.06706337553572043,
- 0.050378062203449314,
- 0.03719922471978215,
- 0.026794031005342302,
- 0.01874697096950893,
- 0.012712151938191113,
- 0.008353518506198363,
- 0.005296022471057729,
- 0.0032616065639477485,
- 0.001950719883589189,
- 0.001139755843048924,
- 6.393989099305387E-4,
- 3.510018112447191E-4,
- 1.8327718036308205E-4,
- 9.104313620576902E-5,
- 4.175907127201692E-5,
- 1.723024148924322E-5,
- 6.1403246635421075E-6,
- 1.8481763641310855E-6,
- 4.3186526226157995E-7
+ 0.06323588090314322,
+ 0.04706878500199647,
+ 0.03440157898516713,
+ 0.024505334812420888,
+ 0.016947924605037624,
+ 0.011358391024147409,
+ 0.007378723534298999,
+ 0.004626465619922909,
+ 0.0028201337494298136,
+ 0.0016711150938834803,
+ 9.686067320207284E-4,
+ 5.397030317799701E-4,
+ 2.9472626566459935E-4,
+ 1.5329874994524534E-4,
+ 7.595785087808418E-5,
+ 3.478586596557668E-5,
+ 1.4340372095134252E-5,
+ 5.10797612199525E-6,
+ 1.537048976483446E-6,
+ 3.5911347042388766E-7
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.09488865686264787,
- 0.07142935250259928,
- 0.05214418577874073,
- 0.037010467204849205,
- 0.02516163263532249,
- 0.016590529356261957,
- 0.010507901994347405,
- 0.00637990362182448,
- 0.003734773088754801,
- 0.0021048943620218287,
- 0.0011455970237778139,
- 6.017031825734271E-4,
- 3.0433219459065163E-4,
- 1.474294089351481E-4,
- 6.76673628644889E-5,
- 2.8822974741051487E-5,
- 1.1168474587205872E-5,
- 3.814864821186904E-6,
- 1.0955557115062982E-6,
- 2.521940203023574E-7
+ 0.0904622230385013,
+ 0.06763067061271764,
+ 0.04897271412693647,
+ 0.03444902009017962,
+ 0.023190342369887117,
+ 0.015136465157577288,
+ 0.009486897373650832,
+ 0.005698255571192757,
+ 0.0032998706834352996,
+ 0.0018400423609470592,
+ 9.91287849277064E-4,
+ 5.157763137858958E-4,
+ 2.587154797646135E-4,
+ 1.2447047787766537E-4,
+ 5.6826085401366E-5,
+ 2.4113157476029098E-5,
+ 9.320072318527201E-6,
+ 3.178481638563153E-6,
+ 9.119267618702759E-7,
+ 2.0980910565433026E-7
]
},
"SA1P0": {
@@ -115,26 +115,26 @@
1.7119945007591926
],
"ys": [
- 0.037249976795173084,
- 0.025197627761164267,
- 0.016545166170479467,
- 0.010478422473657783,
- 0.006398719582310339,
- 0.0036861943861440237,
- 0.0020428880891593454,
- 0.0010653000266227072,
- 5.314802064582867E-4,
- 2.53811756129927E-4,
- 1.1714840690502358E-4,
- 5.2493955478536955E-5,
- 2.2739027674447024E-5,
- 9.374040708161311E-6,
- 3.5845606865215333E-6,
- 1.245165127664063E-6,
- 3.7009993388320086E-7,
- 9.256392869200052E-8,
- 1.8220182946108243E-8,
- 2.526951046843772E-9
+ 0.035412330253193285,
+ 0.023877404686862717,
+ 0.015624706065517736,
+ 0.00985645081158982,
+ 0.005990001578470239,
+ 0.0034291332054826235,
+ 0.0018854390549739944,
+ 9.731979847244496E-4,
+ 4.79486100338769E-4,
+ 2.2565255656643943E-4,
+ 1.0253190543894994E-4,
+ 4.526095882157068E-5,
+ 1.9361627577692135E-5,
+ 7.908836741243633E-6,
+ 3.005825116116685E-6,
+ 1.0402019291282335E-6,
+ 3.0849367094986143E-7,
+ 7.706677709476175E-8,
+ 1.516127335649953E-8,
+ 2.102077545215796E-9
]
},
"SA5P0": {
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.009105078248816451,
- 0.006047133754859309,
- 0.00387713922470311,
- 0.0023820480873286286,
- 0.0013854782283202482,
- 7.639938794505864E-4,
- 3.9469367415850994E-4,
- 1.9308483901468685E-4,
- 8.967757468941447E-5,
- 3.944469705635338E-5,
- 1.6579054588942E-5,
- 6.670431797815306E-6,
- 2.536241886577357E-6,
- 9.223947621517243E-7,
- 3.00166724331702E-7,
- 8.786184748774277E-8,
- 2.1686268097025456E-8,
- 4.335031954742629E-9,
- 6.400005604787821E-10,
- 6.29609898785406E-11
+ 0.008726498919615463,
+ 0.005787955704858236,
+ 0.00370370268017571,
+ 0.0022690553907710217,
+ 0.001314374565897862,
+ 7.206544191349017E-4,
+ 3.693698550392431E-4,
+ 1.78821654121928E-4,
+ 8.196790382286492E-5,
+ 3.5491139525531004E-5,
+ 1.466385823199975E-5,
+ 5.801915284659901E-6,
+ 2.174364836711322E-6,
+ 7.823752256501157E-7,
+ 2.5275154455942267E-7,
+ 7.363561739866549E-8,
+ 1.812026425203844E-8,
+ 3.615354170836424E-9,
+ 5.330276627092581E-10,
+ 5.239992059098105E-11
]
}
}
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 45e8e55224c1e4cd6b58d384337c3f44a827059b..2a9cb6418d1017774d18ef3e4cd1322aab22b37c 100644
--- a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
@@ -23,26 +23,26 @@
1.6428726885203377
],
"ys": [
- 0.041702878297629246,
- 0.027999860664381166,
- 0.018622016732886736,
- 0.012216722657771652,
- 0.007861046944165817,
- 0.004902453843084026,
- 0.0029197447599812,
- 0.0016346979956226896,
- 8.71054544693753E-4,
- 4.487312974921966E-4,
- 2.301053069150744E-4,
- 1.1703475253037317E-4,
- 6.049208116632358E-5,
- 3.0514422161491335E-5,
- 1.4862010414055522E-5,
- 6.722743846396304E-6,
- 2.7403888257779274E-6,
- 9.647166387976834E-7,
- 2.867411798962241E-7,
- 6.608213293182678E-8
+ 0.04070404423315292,
+ 0.027402508123490422,
+ 0.018310371921479468,
+ 0.012088767725072776,
+ 0.007836128991797664,
+ 0.004925270340462806,
+ 0.002957508606746745,
+ 0.0016709558220580343,
+ 8.995468781103062E-4,
+ 4.6866948534780216E-4,
+ 2.4302897486935812E-4,
+ 1.2481898962896193E-4,
+ 6.496557578498095E-5,
+ 3.2918084996431624E-5,
+ 1.60739538304129E-5,
+ 7.281416750807235E-6,
+ 2.9704582597882252E-6,
+ 1.0461754669462952E-6,
+ 3.110349303016219E-7,
+ 7.169281080534317E-8
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.07035356097178065,
- 0.047843992233585014,
- 0.031564298032944,
- 0.02042296568682184,
- 0.012798852440293428,
- 0.00787582769497913,
- 0.004651164686084313,
- 0.002588321710034833,
- 0.0013489774476404778,
- 6.548664433959995E-4,
- 3.0023855657341635E-4,
- 1.3292263038997899E-4,
- 5.822041031464445E-5,
- 2.5427216214895894E-5,
- 1.0908346345709488E-5,
- 4.438355332599649E-6,
- 1.6581550859325247E-6,
- 5.472258576326106E-7,
- 1.5131367112172358E-7,
- 3.323374066279563E-8
+ 0.06871830609472801,
+ 0.046712774972754514,
+ 0.030856148118669876,
+ 0.02002361433547545,
+ 0.012605971741872753,
+ 0.007799954929953157,
+ 0.004634485844588558,
+ 0.0025962321613138425,
+ 0.0013632688028951763,
+ 6.677457569791251E-4,
+ 3.0945645327998614E-4,
+ 1.3868495384093468E-4,
+ 6.148012208075429E-5,
+ 2.7119848961700367E-5,
+ 1.1715707800241386E-5,
+ 4.787467914239154E-6,
+ 1.7930675377996784E-6,
+ 5.92568747897975E-7,
+ 1.6397548109914013E-7,
+ 3.603070891242933E-8
]
},
"SA1P0": {
@@ -115,26 +115,26 @@
1.7119945007591926
],
"ys": [
- 0.03255566645612381,
- 0.021510202129442286,
- 0.013974101776892199,
- 0.008934005761347485,
- 0.005643823614166712,
- 0.0034315434405332774,
- 0.002005198264674031,
- 0.0010731609305547015,
- 5.171878948352435E-4,
- 2.1716595316340062E-4,
- 7.803988578521573E-5,
- 2.3836210001930444E-5,
- 6.352238357086237E-6,
- 1.6604011320127162E-6,
- 4.7058091366696036E-7,
- 1.5001915124536073E-7,
- 4.201119543219848E-8,
- 9.902698671396539E-9,
- 1.8284586509267848E-9,
- 2.3719411718866346E-10
+ 0.03225806003923439,
+ 0.021311188261781973,
+ 0.013845534021032953,
+ 0.008855799594063704,
+ 0.005600034053893186,
+ 0.0034101911437352727,
+ 0.001996368399254093,
+ 0.001070602551928027,
+ 5.171076801879266E-4,
+ 2.1774944417839604E-4,
+ 7.85896827069495E-5,
+ 2.4190298621037834E-5,
+ 6.539557346607635E-6,
+ 1.74587476738414E-6,
+ 5.045593368121919E-7,
+ 1.6182735746913598E-7,
+ 4.543303758966568E-8,
+ 1.0721079115770479E-8,
+ 1.980631632726433E-9,
+ 2.5699632413187515E-10
]
},
"SA5P0": {
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.009807501481254092,
- 0.006889606681525521,
- 0.00486490373845263,
- 0.003433817315555268,
- 0.002368295991671236,
- 0.0015587274702055867,
- 9.426488331454828E-4,
- 5.113133411337293E-4,
- 2.4144672265999446E-4,
- 9.600757053230156E-5,
- 3.1500088178455037E-5,
- 8.282410529013187E-6,
- 1.6817086235264381E-6,
- 2.8445664094128684E-7,
- 4.2675750552406073E-8,
- 9.221309076283525E-9,
- 2.2369977645348804E-9,
- 4.622196397572951E-10,
- 7.42142615366149E-11,
- 8.501642510409975E-12
+ 0.009746978578418105,
+ 0.006847103114563553,
+ 0.004837148092319611,
+ 0.0034171536030659826,
+ 0.0023592367620569477,
+ 0.0015542817838139443,
+ 9.407358715097847E-4,
+ 5.106089159534015E-4,
+ 2.4124743219924445E-4,
+ 9.59849241830649E-5,
+ 3.1520241252353405E-5,
+ 8.302323733444135E-6,
+ 1.6932399950665968E-6,
+ 2.8975995722093343E-7,
+ 4.4658650850172466E-8,
+ 9.855967200246285E-9,
+ 2.4057403922367223E-9,
+ 4.987675202946905E-10,
+ 8.023797332437583E-11,
+ 9.199000819804797E-12
]
}
}
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 0897778ec9d21708730b86a420c410ce72190b5b..e257b872ae75dbaf221221ffafb92a2c87a005ea 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.6428726885203377
],
"ys": [
- 0.20065037384516696,
- 0.17285537650655408,
- 0.14576545384161418,
- 0.1197049373495138,
- 0.09559546868503914,
- 0.07431105108583719,
- 0.05637516914066104,
- 0.041704926874430726,
- 0.03026024480656411,
- 0.021542917739092143,
- 0.015118630486935573,
- 0.01037144636466253,
- 0.007087040937276326,
- 0.004779369326377619,
- 0.0031970483854242902,
- 0.002065506603908317,
- 0.0012334191212818094,
- 6.376596603888939E-4,
- 2.721137279990724E-4,
- 8.879535788954887E-5
+ 0.19465576386438546,
+ 0.16585861063551163,
+ 0.13796643748124132,
+ 0.11141004687130132,
+ 0.08722868487438218,
+ 0.06633675615439016,
+ 0.04919175912675463,
+ 0.035587117478836104,
+ 0.025317653055180224,
+ 0.017757327086632954,
+ 0.012367554945219744,
+ 0.008502250903360691,
+ 0.005888809435468613,
+ 0.0040710890729375926,
+ 0.0028110249988811046,
+ 0.0018759064803334168,
+ 0.0011510885991894673,
+ 6.07093255007255E-4,
+ 2.6257960045182767E-4,
+ 8.648724105047423E-5
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.23218634433928198,
- 0.20086152267295324,
- 0.1693270125634278,
- 0.13880118413487624,
- 0.10954239712160337,
- 0.08399889699793917,
- 0.062403831811478426,
- 0.04498824304182708,
- 0.031656814692440735,
- 0.021750482043563536,
- 0.014656504287886748,
- 0.00974766624141754,
- 0.006474381891500176,
- 0.0043506760753637885,
- 0.002961970104686066,
- 0.0019898079805517515,
- 0.0012516569654339145,
- 6.879341074423706E-4,
- 3.090961777192741E-4,
- 1.0865839278701978E-4
+ 0.22759438886708291,
+ 0.19502996387660193,
+ 0.162478472401,
+ 0.13127855865793028,
+ 0.10178732063899963,
+ 0.07651100481129255,
+ 0.0556221721497591,
+ 0.03922561054557927,
+ 0.027053000707293072,
+ 0.018298749579513877,
+ 0.012230398730706287,
+ 0.008154094556459308,
+ 0.005500090617746711,
+ 0.003799481981304561,
+ 0.0026760038454730598,
+ 0.0018559537753527536,
+ 0.0011959302363224028,
+ 6.677873738636754E-4,
+ 3.03025654576622E-4,
+ 1.0719706924005051E-4
]
},
"SA1P0": {
@@ -115,26 +115,26 @@
1.7119945007591926
],
"ys": [
- 0.11507181130182526,
- 0.08671239044320496,
- 0.0638047438548466,
- 0.045835717898583005,
- 0.032317843931113206,
- 0.022183486847409596,
- 0.015153193599852392,
- 0.010261839081528161,
- 0.007049903467049766,
- 0.004977854045652163,
- 0.0036543232616935797,
- 0.002765617529181706,
- 0.00208466807199443,
- 0.00148674641684781,
- 9.528119444413632E-4,
- 5.304336113939782E-4,
- 2.4607793656756486E-4,
- 9.4488304009609E-5,
- 2.88675733076581E-5,
- 6.7118167162917875E-6
+ 0.1090210906337559,
+ 0.08097254398643053,
+ 0.058720049788277356,
+ 0.041597866557977786,
+ 0.02896836964059097,
+ 0.01968307307929053,
+ 0.013361538316101072,
+ 0.009040101217083764,
+ 0.00624897260587361,
+ 0.004474820242908606,
+ 0.003352434185972937,
+ 0.0025939251661777677,
+ 0.0019933386490256096,
+ 0.0014420600042872572,
+ 9.330787343891722E-4,
+ 5.226667660820224E-4,
+ 2.434768166568053E-4,
+ 9.375162225210747E-5,
+ 2.8699276212847364E-5,
+ 6.682800671262542E-6
]
},
"SA5P0": {
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.026315550077531773,
- 0.01886782751400864,
- 0.013462119866627414,
- 0.009642188406180623,
- 0.006982393397875128,
- 0.005189724611102401,
- 0.003981747836128958,
- 0.003179960378165442,
- 0.002613513217055899,
- 0.0021426822813899013,
- 0.00168670251695781,
- 0.0012321285996093276,
- 8.109480307289339E-4,
- 4.759879801462898E-4,
- 2.376596216356011E-4,
- 1.0098613813945205E-4,
- 3.5044901614737295E-5,
- 9.649118548509896E-6,
- 1.9698757501144844E-6,
- 2.7967338083447933E-7
+ 0.02452706475911134,
+ 0.017535564620667167,
+ 0.0124865016948244,
+ 0.008938157137606883,
+ 0.0064842796330762155,
+ 0.004844597095602238,
+ 0.0037508320167089905,
+ 0.0030312993403353887,
+ 0.0025223770580440345,
+ 0.002090268199925279,
+ 0.0016586344528279325,
+ 0.0012182750049719946,
+ 8.047589481555737E-4,
+ 4.734597813720815E-4,
+ 2.3676606604988362E-4,
+ 1.0070929911353583E-4,
+ 3.497372872249362E-5,
+ 9.6344127986509E-6,
+ 1.96761739857144E-6,
+ 2.794342112062024E-7
]
}
}
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 a05b27499c4025393dba7bd71e237840a7c03574..3a31184eb7da72fca7805d3934e04e8e400d98af 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.6428726885203377
],
"ys": [
- 0.06387385985841774,
- 0.04878791170303394,
- 0.0367854365389829,
- 0.027190667986352758,
- 0.019636473198452138,
- 0.013824775177858295,
- 0.009478117307065536,
- 0.006290958917226509,
- 0.0040581532820187045,
- 0.0025380991624645494,
- 0.0015449094160849201,
- 8.995071698584924E-4,
- 5.09407739791533E-4,
- 2.729094720111754E-4,
- 1.3825491563590375E-4,
- 6.435096166114982E-5,
- 2.6841851511095405E-5,
- 9.646424996465562E-6,
- 2.9238846727448723E-6,
- 6.877293996647997E-7
+ 0.057428944299842334,
+ 0.04328001982814253,
+ 0.032236717934635076,
+ 0.023579300608674515,
+ 0.016886349168240642,
+ 0.011816341380609711,
+ 0.00806917246833565,
+ 0.005344030607002965,
+ 0.0034444234459118984,
+ 0.002154447987589357,
+ 0.00131223898918333,
+ 7.647616967448111E-4,
+ 4.3352577094510136E-4,
+ 2.3246500523225132E-4,
+ 1.1784879753290282E-4,
+ 5.488073984756874E-5,
+ 2.2899514731275163E-5,
+ 8.231493417583086E-6,
+ 2.495371194868271E-6,
+ 5.869927311427069E-7
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.08897359836186498,
- 0.0675748903291796,
- 0.05000915421337383,
- 0.036141515119834385,
- 0.025154436608518314,
- 0.01706642902100955,
- 0.01118721750317299,
- 0.00706829306941835,
- 0.004321986639291746,
- 0.0025491940977317305,
- 0.0014512879973572021,
- 7.955316758709134E-4,
- 4.183479201839777E-4,
- 2.0966499235166555E-4,
- 9.898790045528424E-5,
- 4.311137584958441E-5,
- 1.6982402990994617E-5,
- 5.8698986859737056E-6,
- 1.699997588555992E-6,
- 3.9364205136362245E-7
+ 0.0817114535042428,
+ 0.061269810540767695,
+ 0.044773120866429254,
+ 0.03198206317012943,
+ 0.022025853348047304,
+ 0.014813651836569403,
+ 0.009641680634831985,
+ 0.006058287279056469,
+ 0.0036898456727801933,
+ 0.0021708373712889294,
+ 0.0012342377192277971,
+ 6.762789727651864E-4,
+ 3.557159801257855E-4,
+ 1.7837776650702795E-4,
+ 8.427490644307862E-5,
+ 3.672762173306049E-5,
+ 1.4475467709516603E-5,
+ 5.00542739495849E-6,
+ 1.4500736222530756E-6,
+ 3.358458507999257E-7
]
},
"SA1P0": {
@@ -115,26 +115,26 @@
1.7119945007591926
],
"ys": [
- 0.037675940959976166,
- 0.025591509027051384,
- 0.01683872594726036,
- 0.010667502750220484,
- 0.006517520841055036,
- 0.0037708388688012595,
- 0.00211522172623776,
- 0.0011300616573363706,
- 5.858085901632643E-4,
- 2.9452828305533125E-4,
- 1.442201070579802E-4,
- 6.853405664262614E-5,
- 3.1233127747528394E-5,
- 1.3384657228636076E-5,
- 5.263428989283831E-6,
- 1.8642310318497474E-6,
- 5.616314888564858E-7,
- 1.4169285173256064E-7,
- 2.8047954950778922E-8,
- 3.907069142607005E-9
+ 0.03512814840771567,
+ 0.02374325855529199,
+ 0.0155390757678235,
+ 0.009781209080590457,
+ 0.005929404719714528,
+ 0.0033975988445890328,
+ 0.0018853515984961755,
+ 9.95575049315363E-4,
+ 5.103591844145769E-4,
+ 2.541507665083607E-4,
+ 1.2358267917687827E-4,
+ 5.848201462228776E-5,
+ 2.6602519232916117E-5,
+ 1.1395281453716885E-5,
+ 4.482197248069898E-6,
+ 1.5882528749799947E-6,
+ 4.787002135757045E-7,
+ 1.208097120949958E-7,
+ 2.3919581348861267E-8,
+ 3.332617055755201E-9
]
},
"SA5P0": {
@@ -161,26 +161,26 @@
0.7929925155296614
],
"ys": [
- 0.009471251328278642,
- 0.006230820167790689,
- 0.003938830466205205,
- 0.002382951307257465,
- 0.0013690937405762466,
- 7.517310490805637E-4,
- 3.9147660168148223E-4,
- 1.9603915750751672E-4,
- 9.473153325149301E-5,
- 4.398019669000669E-5,
- 1.966470099870448E-5,
- 8.413591229100446E-6,
- 3.3757400573966487E-6,
- 1.2792076376049023E-6,
- 4.287096986720477E-7,
- 1.2819192077167395E-7,
- 3.213708658869183E-8,
- 6.497316746166965E-9,
- 9.689262002080116E-10,
- 9.608222097414862E-11
+ 0.009002416194190623,
+ 0.005902306937484354,
+ 0.0037125802152220126,
+ 0.0022309575341053108,
+ 0.0012706838536071063,
+ 6.903909328852548E-4,
+ 3.551071671227193E-4,
+ 1.7542824792763303E-4,
+ 8.360946736537221E-5,
+ 3.832322994657754E-5,
+ 1.6958964593030216E-5,
+ 7.204519951665655E-6,
+ 2.8790957394219304E-6,
+ 1.089211935651729E-6,
+ 3.648783839397916E-7,
+ 1.0912168211121426E-7,
+ 2.736509828911805E-8,
+ 5.534469416872477E-9,
+ 8.25645876831847E-10,
+ 8.190439986733667E-11
]
}
}
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 68f57887f8da453c085e3a6b3805b2031948b5a0..2c6571c684b40649048ed14d8263800b0640d28f 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -117,11 +117,11 @@
"ys": [
0.5038377721817138,
0.36230381390205413,
- 0.25015708080680293,
+ 0.250157080806803,
0.16518580611097067,
0.1048360169373159,
0.06322753117018583,
- 0.037257318651890164,
+ 0.03725731865189016,
0.021195009656910922,
0.011846580279059597,
0.00646045788500985,
@@ -163,10 +163,10 @@
"ys": [
0.13217805298960006,
0.08963133100288148,
- 0.058713226858520165,
+ 0.05871322685852015,
0.0371772372980239,
0.022673057835178038,
- 0.01341500337442213,
+ 0.013415003374422129,
0.007619300962341073,
0.004144845979685093,
0.0021164811090285227,
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 efb39a1345d1596a1b5755d46901cfda2f641d8b..73e3ac459a81399ee459c060551a23338c1afae4 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.6428726885203377
],
"ys": [
- 0.17913734230734826,
- 0.1357684181236626,
- 0.09990651881134907,
- 0.07130329144132078,
- 0.04952410842749165,
- 0.033552010919702786,
- 0.02216631422672736,
- 0.014221790763013983,
- 0.009004023091277832,
- 0.005737050568805529,
- 0.0037660651288834723,
- 0.002500096638743556,
- 0.0016190748699046514,
- 9.265993573052953E-4,
- 4.3788427014813865E-4,
- 1.5964052839221907E-4,
- 4.264228617866765E-5,
- 7.421122726760181E-6,
- 7.19501299751569E-7,
- 2.2616262833951562E-8
+ 0.12803666530641444,
+ 0.09798897319465188,
+ 0.0734141787350921,
+ 0.05382133344457645,
+ 0.038695848305529745,
+ 0.0272579404617904,
+ 0.01873173668216417,
+ 0.012479747563356682,
+ 0.008180145689396538,
+ 0.0053771670339101555,
+ 0.0036208828965719315,
+ 0.002448134093328775,
+ 0.001602140091073752,
+ 9.218365367846167E-4,
+ 4.3672019467009746E-4,
+ 1.5940599274072312E-4,
+ 4.2605396162622546E-5,
+ 7.417151771185504E-6,
+ 7.192650742467391E-7,
+ 2.2611732630957676E-8
]
},
"SA0P2": {
@@ -69,26 +69,26 @@
1.998773638612381
],
"ys": [
- 0.228452193693167,
- 0.17987062537206622,
- 0.13663309030967175,
- 0.1006555512012042,
- 0.07138688333995924,
- 0.04961436045911991,
- 0.033635693410577136,
- 0.022214963365735963,
- 0.01438068164363171,
- 0.009196835936420601,
- 0.005931170696594445,
- 0.003920860898603422,
- 0.002643388564354666,
- 0.0017421680148024723,
- 0.0010470933046818896,
- 5.346964959039087E-4,
- 2.2128654283682777E-4,
- 7.137461709106763E-5,
- 1.6614017473564147E-5,
- 2.3855648355002396E-6
+ 0.1555282192970549,
+ 0.12271278718258177,
+ 0.09438844363459752,
+ 0.0711926293385691,
+ 0.05229210350149548,
+ 0.03792986125892342,
+ 0.026950214485537263,
+ 0.018652242711957645,
+ 0.012606305700194035,
+ 0.008377461442676365,
+ 0.005581704485551772,
+ 0.0037846193621722543,
+ 0.0025954608316088312,
+ 0.0017272043694558034,
+ 0.001043032404772006,
+ 5.337683813303936E-4,
+ 2.2111416818086153E-4,
+ 7.135047803389518E-5,
+ 1.6611908069913576E-5,
+ 2.385484708750045E-6
]
},
"SA1P0": {
@@ -115,25 +115,25 @@
1.7119945007591926
],
"ys": [
- 0.1451090511896964,
- 0.10467066535095923,
- 0.07338664713664103,
- 0.05008674058169957,
- 0.033489621141967116,
- 0.02168155293356069,
- 0.013887608499536097,
- 0.008746183969761826,
- 0.0055719072984710535,
- 0.0036351748079633084,
- 0.002420740435567291,
- 0.0015883868459047863,
- 9.709589742605207E-4,
- 5.22445783725696E-4,
- 2.36296784581689E-4,
- 8.715838803274344E-5,
- 2.4267585514281153E-5,
- 4.631447104590021E-6,
- 4.4388663370114974E-7,
+ 0.11501860561935875,
+ 0.084320741752153,
+ 0.06016362684633475,
+ 0.04185072145214083,
+ 0.028559928291836248,
+ 0.018909098039177896,
+ 0.012397942137971104,
+ 0.008005824580637528,
+ 0.005230778353888359,
+ 0.0034925458813479995,
+ 0.002367428648132774,
+ 0.0015709131286566781,
+ 9.66060611557756E-4,
+ 5.213080155236028E-4,
+ 2.3608818504925437E-4,
+ 8.713048246536412E-5,
+ 2.4265334608078044E-5,
+ 4.631369205421874E-6,
+ 4.438864323787245E-7,
1.3355283894291156E-8
]
},
@@ -161,24 +161,24 @@
0.7929925155296614
],
"ys": [
- 0.04583718047854257,
- 0.03323354400368285,
- 0.02355313646842241,
- 0.016241625822620717,
- 0.01084311866394619,
- 0.007079123034079655,
- 0.004535328481488352,
- 0.0028919517997218337,
- 0.0018216927776096297,
- 0.0010995070091791743,
- 6.122966264768967E-4,
- 3.022762280094454E-4,
- 1.2731644283757869E-4,
- 4.571329917412236E-5,
- 1.282110005660829E-5,
- 2.812353567198677E-6,
- 4.3753763894934663E-7,
- 3.7783578417837754E-8,
+ 0.03856019551714868,
+ 0.028432589784057407,
+ 0.02045148442455979,
+ 0.014288743608690875,
+ 0.009662478209116752,
+ 0.006399131015825902,
+ 0.004171507622631116,
+ 0.0027125116972272446,
+ 0.0017415350218257324,
+ 0.0010679175670471805,
+ 6.014916800939397E-4,
+ 2.991412263109414E-4,
+ 1.2657398101228472E-4,
+ 4.5567845549853095E-5,
+ 1.2799712794697092E-5,
+ 2.8099344132129265E-6,
+ 4.3736273589815415E-7,
+ 3.777796159760153E-8,
9.63624550723746E-10,
0.0
]
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 84460a8cf61ddcd873228a8f5901db193251e7ec..3e9ca2257459148a5e6005ddb9ff699b2163fbb8 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -38,7 +38,7 @@
0.0028729783810932594,
0.001236469287164289,
4.6079610718895874E-4,
- 1.4161676234531953E-4,
+ 1.416167623453195E-4,
3.4670125479440184E-5,
6.4536118509542435E-6,
9.530449289578381E-7,
@@ -70,13 +70,13 @@
],
"ys": [
0.33165085791451066,
- 0.29562065155988015,
+ 0.2956206515598802,
0.25654382703670564,
0.21643729363543543,
0.17579854693610053,
0.13811960066778456,
0.10414965265317788,
- 0.07500154545047683,
+ 0.07500154545047684,
0.051580708007596364,
0.033727178511579844,
0.02094401529606365,
@@ -124,15 +124,15 @@
0.050097384327453795,
0.03304182675492651,
0.021073825668589168,
- 0.012914526917572916,
- 0.007554719328322313,
+ 0.01291452691757292,
+ 0.007554719328322312,
0.004157152149866734,
0.002105437800927276,
9.55353260170581E-4,
3.7662159367333396E-4,
1.256055968956394E-4,
3.266623554836667E-5,
- 6.178368401470126E-6,
+ 6.178368401470125E-6,
6.708301323030964E-7,
2.236707262114731E-8
]
@@ -167,18 +167,18 @@
0.03844117387366226,
0.026205285620643677,
0.01736442988634108,
- 0.011144070075001651,
- 0.0070048493817140445,
- 0.004313240054052287,
+ 0.01114407007500165,
+ 0.007004849381714046,
+ 0.004313240054052286,
0.00256370077748051,
- 0.0014387545485157428,
- 7.365499477329723E-4,
- 3.2961351437766544E-4,
- 1.2767266449166022E-4,
+ 0.0014387545485157424,
+ 7.365499477329721E-4,
+ 3.2961351437766533E-4,
+ 1.276726644916602E-4,
3.943160472022289E-5,
9.54123271561152E-6,
- 1.5452131454874693E-6,
- 1.1322120338908269E-7,
+ 1.5452131454874696E-6,
+ 1.1322120338908268E-7,
2.9610242527464E-10,
4.37902639628605E-12
]