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 ef91cad4e72fc662afa90e56f0f28d830b875c1d..85927eac35ad14d37149ddb15ad7110e269241ec 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -95,7 +95,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);
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 138f30db2429533acfe07d66ad215fbd456f1e56..4b53dcbef9cb5fe1bc544d7d2217fd0983a6a1c5 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.7119945007591924
],
"ys": [
- 0.033467645100364915,
- 0.02255731474903664,
- 0.014764102885642854,
- 0.00932742536862986,
- 0.005685585081840404,
- 0.0032698510455971635,
- 0.0018082283691248805,
- 9.397523751119597E-4,
- 4.665216653497552E-4,
- 2.21311876130225E-4,
- 1.013420665395574E-4,
- 4.502836662189109E-5,
- 1.934731997822941E-5,
- 7.918765642714748E-6,
- 3.0093520060664596E-6,
- 1.0399554965154735E-6,
- 3.077763262822755E-7,
- 7.675113969568764E-8,
- 1.5088640004525927E-8,
- 2.0979463548973946E-9
+ 0.034140124524401905,
+ 0.022996758272726864,
+ 0.015043403291769857,
+ 0.009499014416585823,
+ 0.005787553958793812,
+ 0.0033272472192361607,
+ 0.001839552284077412,
+ 9.560239115187544E-4,
+ 4.7475120990463364E-4,
+ 2.2539035174014697E-4,
+ 1.0334735728954467E-4,
+ 4.6006986494045055E-5,
+ 1.9813826529752363E-5,
+ 8.129796400746868E-6,
+ 3.0969361779079166E-6,
+ 1.0724925749896956E-6,
+ 3.179875072442146E-7,
+ 7.941384728317632E-8,
+ 1.5631082627119162E-8,
+ 2.1759631112132076E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.007758842908797929,
- 0.005149163820278125,
- 0.003302014238353026,
- 0.0020285696349212692,
- 0.0011783369527133014,
- 6.47747904988567E-4,
- 3.3291850411255506E-4,
- 1.617362438442745E-4,
- 7.449189898315069E-5,
- 3.246446216296383E-5,
- 1.3518785608064903E-5,
- 5.39181511144338E-6,
- 2.0344156214059335E-6,
- 7.354690350729374E-7,
- 2.3824440103395323E-7,
- 6.950123036934147E-8,
- 1.712556382235624E-8,
- 3.426698721381284E-9,
- 5.082066799507751E-10,
- 5.066343706695574E-11
+ 0.007903887706570899,
+ 0.005241415828342099,
+ 0.003358765496510537,
+ 0.002062236342198035,
+ 0.0011974265717558203,
+ 6.581346095286463E-4,
+ 3.3828123260531674E-4,
+ 1.6439089763304547E-4,
+ 7.575311546049768E-5,
+ 3.303730843395667E-5,
+ 1.3769453847428236E-5,
+ 5.497669147626031E-6,
+ 2.076993455240851E-6,
+ 7.519197222974893E-7,
+ 2.4394598117779956E-7,
+ 7.127632256133505E-8,
+ 1.7589707849391878E-8,
+ 3.524521937943962E-9,
+ 5.234716675441611E-10,
+ 5.229662716256705E-11
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.061592447786729475,
- 0.04639974229258597,
- 0.03432459497873905,
- 0.02473366727709542,
- 0.017280801450424373,
- 0.011677696356528568,
- 0.00763251672254187,
- 0.004804519556899061,
- 0.0029342230403746907,
- 0.0017389764981837867,
- 0.0010066503796589347,
- 5.594364156532158E-4,
- 3.042936479444236E-4,
- 1.573493201386991E-4,
- 7.73390729644225E-5,
- 3.5050103418906365E-5,
- 1.4266757376659537E-5,
- 5.007113179397132E-6,
- 1.4815699147526697E-6,
- 3.3934865452667515E-7
+ 0.06280362919338868,
+ 0.04723192992454075,
+ 0.03487303678639892,
+ 0.025077268653052404,
+ 0.017487440054238673,
+ 0.011800856568647267,
+ 0.0077088747884492045,
+ 0.00485533109784549,
+ 0.002970458049892235,
+ 0.0017654727315382435,
+ 0.0010257307937179595,
+ 5.724510494335054E-4,
+ 3.126870519006663E-4,
+ 1.6232983441098812E-4,
+ 8.005198098637073E-5,
+ 3.637408153200208E-5,
+ 1.4834328636117501E-5,
+ 5.213753689217435E-6,
+ 1.5443331884889456E-6,
+ 3.5401386082877373E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.08650888397838606,
- 0.06528043106679644,
- 0.04771906302557905,
- 0.03386761240022137,
- 0.022983890944325232,
- 0.015099415540518699,
- 0.009510193999359514,
- 0.005731287460882947,
- 0.0033251487143996224,
- 0.001855287307071394,
- 9.99133518490477E-4,
- 5.191872616640555E-4,
- 2.5976530177954305E-4,
- 1.244138651804819E-4,
- 5.6393675077766515E-5,
- 2.3685300743977286E-5,
- 9.034732099489303E-6,
- 3.033496151492734E-6,
- 8.549667856323727E-7,
- 1.927768075329351E-7
+ 0.08840949087978585,
+ 0.06662099002739914,
+ 0.04862237659478602,
+ 0.034452008336861656,
+ 0.023342752120996797,
+ 0.015315067528164902,
+ 0.009638015838324677,
+ 0.005807354940786627,
+ 0.0033713872373271497,
+ 0.0018838298686472878,
+ 0.00101674836790084,
+ 5.298117647953759E-4,
+ 2.6590749566827494E-4,
+ 1.2776174248125812E-4,
+ 5.8086279166964426E-5,
+ 2.4461727225544027E-5,
+ 9.351763530360808E-6,
+ 3.1456056263895486E-6,
+ 8.878514484949065E-7,
+ 2.004285363822191E-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 48e180da1f97c59beb41a9091095276ffd2ea389..64045111b3460d022a7eaad14c8c029e4d0c387b 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.7119945007591924
],
"ys": [
- 0.02996481512076463,
- 0.019678558102287778,
- 0.012726786180465239,
- 0.00812470521725433,
- 0.005148224420806258,
- 0.0031549608010712285,
- 0.001863424624369617,
- 0.001008728000798177,
- 4.907936765817723E-4,
- 2.0713280362524947E-4,
- 7.418827864821864E-5,
- 2.221379851940245E-5,
- 5.614550796498904E-6,
- 1.337724334235127E-6,
- 3.4249728366288295E-7,
- 1.0703188884019855E-7,
- 2.9796982314831965E-8,
- 7.002571211474242E-9,
- 1.2894093601737816E-9,
- 1.67102661159449E-10
+ 0.03135725218822521,
+ 0.02063513494836405,
+ 0.013365226757157627,
+ 0.008532068157203192,
+ 0.005394114751401507,
+ 0.0032908784812738508,
+ 0.001933037803789934,
+ 0.001040622588925618,
+ 5.039738690989495E-4,
+ 2.1200950619937434E-4,
+ 7.58320340581136E-5,
+ 2.2740678178255835E-5,
+ 5.7869320625718405E-6,
+ 1.3973316773906963E-6,
+ 3.6337940428009047E-7,
+ 1.1385114569297925E-7,
+ 3.1704766349290966E-8,
+ 7.4501614780895174E-9,
+ 1.3716779825061576E-9,
+ 1.7774636897699117E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.008882681904568684,
- 0.00624957685845368,
- 0.00443889967000697,
- 0.0031656471283540767,
- 0.0022130793325516786,
- 0.001477821494442916,
- 9.063847925138167E-4,
- 4.9794696686327E-4,
- 2.377908806682916E-4,
- 9.545556219116022E-5,
- 3.1537673566688204E-5,
- 8.307714692274412E-6,
- 1.6619784820297114E-6,
- 2.6415653631573427E-7,
- 3.336255563701559E-8,
- 6.093850327400648E-9,
- 1.4576367616076917E-9,
- 3.002002178318448E-10,
- 4.834643182724521E-11,
- 5.6117455631448516E-12
+ 0.009345625234480587,
+ 0.006574876442465404,
+ 0.004656603648936798,
+ 0.003302647529702358,
+ 0.0022927829064374457,
+ 0.0015204831435768897,
+ 9.269402804612737E-4,
+ 5.068516290057169E-4,
+ 2.4121707317102952E-4,
+ 9.660310004720301E-5,
+ 3.187187379412594E-5,
+ 8.393597524084288E-6,
+ 1.6825762628351352E-6,
+ 2.6944079895203686E-7,
+ 3.479148327094692E-8,
+ 6.484847561777669E-9,
+ 1.552680390939133E-9,
+ 3.1977644617796417E-10,
+ 5.148314866822282E-11,
+ 5.973257867891577E-12
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.03693486053663318,
- 0.02447034689090222,
- 0.01605947251589719,
- 0.010409172279029759,
- 0.0066282390674138,
- 0.004091032821266369,
- 0.0024048991269373923,
- 0.0013222712295030362,
- 6.884339150903425E-4,
- 3.4553420275528385E-4,
- 1.7301681396310017E-4,
- 8.647522747487573E-5,
- 4.425199926638887E-5,
- 2.218476743124493E-5,
- 1.0741759072955684E-5,
- 4.8215968297647115E-6,
- 1.9457388902219244E-6,
- 6.765558778655967E-7,
- 1.981733516671513E-7,
- 4.4867201263683655E-8
+ 0.038831826132400014,
+ 0.02576399052237043,
+ 0.016918946582474326,
+ 0.01095891934373803,
+ 0.006965358859620503,
+ 0.004289616845894357,
+ 0.0025181360514077954,
+ 0.0013849848975063244,
+ 7.227430485631245E-4,
+ 3.641450368842957E-4,
+ 1.8309424861504635E-4,
+ 9.180416612879497E-5,
+ 4.7053232168305155E-5,
+ 2.3599573386277656E-5,
+ 1.1426015796876628E-5,
+ 5.127829852689393E-6,
+ 2.068964865105813E-6,
+ 7.193033853228008E-7,
+ 2.1067326196680176E-7,
+ 4.7693449532928206E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.06346135855391184,
- 0.042670772619062616,
- 0.027800218392687634,
- 0.017762328063338894,
- 0.011002049677500144,
- 0.006703806831740803,
- 0.003921987319964639,
- 0.0021582018724859487,
- 0.0011076626918678251,
- 5.263317603868954E-4,
- 2.3477465347310677E-4,
- 1.0080931653186259E-4,
- 4.2928950055953734E-5,
- 1.834568538422175E-5,
- 7.749565860435877E-6,
- 3.112298186945968E-6,
- 1.1474102153935985E-6,
- 3.7324435098356717E-7,
- 1.0153003800904256E-7,
- 2.1876963839126116E-8
+ 0.0665732762258882,
+ 0.04482593685797904,
+ 0.029239778748198948,
+ 0.018691138345740835,
+ 0.011568335069275744,
+ 0.007034631275880489,
+ 0.004104911619872562,
+ 0.0022539698879928114,
+ 0.0011558262326008804,
+ 5.49795662099864E-4,
+ 2.4599994309126513E-4,
+ 1.06108926566201E-4,
+ 4.539325061828138E-5,
+ 1.946324271149397E-5,
+ 8.235518127785476E-6,
+ 3.309615592894283E-6,
+ 1.2203858775884328E-6,
+ 3.969683232968708E-7,
+ 1.0797100762607447E-7,
+ 2.3262394059408082E-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 b2b04b215373444f7b9a7c0f249727096557d41a..5ed8cf75d7e295b2f97bca080b443cb07cd0869f 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.8930449519019783,
- 0.6749969659753676,
- 0.49303885051075713,
- 0.3475054264030445,
- 0.23683138092363426,
- 0.15354016120592875,
- 0.09615046387268711,
- 0.05711825926134556,
+ 0.8930394300275821,
+ 0.6749918381679874,
+ 0.49303515325532005,
+ 0.34750344309204567,
+ 0.23683057852368883,
+ 0.15353992971871455,
+ 0.0961504205688885,
+ 0.057118255524974404,
0.03254983412381369,
0.017706551998919143,
0.009199256321560047,
@@ -69,17 +69,17 @@
0.7929925155296614
],
"ys": [
- 0.27349090881301874,
- 0.1978420981749357,
- 0.13848906814382847,
- 0.09329324674608401,
- 0.06015937982113755,
- 0.037455218019174744,
- 0.022411312341210694,
- 0.012923513590814936,
- 0.007068623105797562,
- 0.003570755888867055,
- 0.0016390605242597017,
+ 0.27348424396332727,
+ 0.19783508806705066,
+ 0.1384820333106381,
+ 0.09328684511002477,
+ 0.06015381428487856,
+ 0.03745072919769844,
+ 0.02240846172409476,
+ 0.01292221354972295,
+ 0.007068213472104339,
+ 0.0035706726317248933,
+ 0.0016390539611305112,
6.752487606634823E-4,
2.4533284562506884E-4,
8.032285440828849E-5,
@@ -115,11 +115,11 @@
1.6428726885203377
],
"ys": [
- 1.0408793391971658,
- 0.8228826460484955,
- 0.6353831504644993,
- 0.47852783291878337,
- 0.3510224552701482,
+ 1.0408774927742945,
+ 0.8228815592058314,
+ 0.6353827790239575,
+ 0.47852776659542795,
+ 0.35102245255593834,
0.2495855477480165,
0.1707599949868633,
0.11090265514843083,
@@ -161,10 +161,10 @@
1.998773638612381
],
"ys": [
- 1.2322845948043493,
- 1.0061598465683435,
- 0.7986159298404086,
- 0.6201221957030617,
+ 1.2322842421810511,
+ 1.0061597602503232,
+ 0.7986159168246194,
+ 0.6201221946003167,
0.4676124373980192,
0.3456609702956266,
0.247711664304258,
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 4c50ba26a9cb685514adc3e9ad72eb1641a059a4..88ececb0f28ae1a2d9874ec64ff19b29481108cf 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.10862105279541635,
- 0.08165947536542632,
- 0.059995229864402304,
- 0.04307097673528893,
- 0.030364358908987584,
- 0.02083125364837016,
- 0.014202191808198142,
- 0.009586307658653568,
- 0.006570076098277394,
- 0.004648984561824664,
- 0.0034431288049768844,
- 0.002641116137706031,
- 0.00201819306477022,
- 0.0014549433630508962,
- 9.393340073177629E-4,
- 5.254079048744595E-4,
- 2.4450302713741913E-4,
- 9.407692714172437E-5,
- 2.8782866454993592E-5,
- 6.69942572700161E-6
+ 0.11443891919536114,
+ 0.08617987073173887,
+ 0.06341011863765277,
+ 0.04558938778556612,
+ 0.03219115304867416,
+ 0.022123712914637106,
+ 0.015105385561292508,
+ 0.010196566351738967,
+ 0.006966398174996786,
+ 0.004891284147012434,
+ 0.003580482939033717,
+ 0.0027123799513555104,
+ 0.002051688508124924,
+ 0.0014690904037393062,
+ 9.446659961148896E-4,
+ 5.272033868089062E-4,
+ 2.4502289831120555E-4,
+ 9.420764352199944E-5,
+ 2.8810319073444973E-5,
+ 6.703925835075132E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.024530314046554685,
- 0.01757990831464154,
- 0.012528851607268094,
- 0.00894988613165413,
- 0.006459133844032859,
- 0.004795503373771293,
- 0.003696858469788254,
- 0.002986781285756636,
- 0.0024926315737724453,
- 0.002073930037039539,
- 0.0016513477008498298,
- 0.001215785598606242,
- 8.042554806213793E-4,
- 4.73525219280476E-4,
- 2.368926845395888E-4,
- 1.0078048232087253E-4,
- 3.5000665277206334E-5,
- 9.64188381511637E-6,
- 1.968999957682065E-6,
- 2.796133615562724E-7
+ 0.02584615652637672,
+ 0.018579319755662165,
+ 0.013287432283307131,
+ 0.009521297399456233,
+ 0.006879224545983419,
+ 0.005092871105945046,
+ 0.0038950406088637487,
+ 0.003110206584836829,
+ 0.0025637151164687004,
+ 0.002111223503910751,
+ 0.0016690438461587575,
+ 0.0012233087464873704,
+ 8.070734144378035E-4,
+ 4.744746274525545E-4,
+ 2.371650677546818E-4,
+ 1.0084961104742617E-4,
+ 3.50155905256611E-5,
+ 9.644567735209852E-6,
+ 1.96937309904246E-6,
+ 2.796507143377928E-7
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.19003250910809658,
- 0.16344178879479004,
- 0.1377374347925007,
- 0.1131551148682328,
- 0.09048517197002545,
- 0.07047280040074728,
- 0.053558629253129014,
- 0.03965363176678579,
- 0.0287504507082319,
- 0.020426306734937883,
- 0.01430649496717778,
- 0.009813343152014063,
- 0.006726570411124061,
- 0.004565211367583447,
- 0.0030787805906867757,
- 0.0020054195939523843,
- 0.0012056016468158333,
- 6.26244211704487E-4,
- 2.680339783108176E-4,
- 8.761713500064396E-5
+ 0.20153343863066206,
+ 0.1738240853513121,
+ 0.14678429583021144,
+ 0.12073845792265267,
+ 0.09660000326712054,
+ 0.07522929063718366,
+ 0.057143821282328935,
+ 0.04227240543728441,
+ 0.030612544187388655,
+ 0.021707706932396337,
+ 0.015153890104753015,
+ 0.010336962475302467,
+ 0.007030622559647016,
+ 0.004726872732572119,
+ 0.0031582251757611016,
+ 0.0020409670909132226,
+ 0.0012199076476002615,
+ 6.312579948869293E-4,
+ 2.6953331972370034E-4,
+ 8.796833421459317E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.22073290404435011,
- 0.19040599799093288,
- 0.1601767937821178,
- 0.13114397091422006,
- 0.10347487060688548,
- 0.07940173459453344,
- 0.059067247685937005,
- 0.0426383760251058,
- 0.030013182373905878,
- 0.02059436368173501,
- 0.013842097182240819,
- 0.009187938750875648,
- 0.00611057175911593,
- 0.004132107908236167,
- 0.0028421270909669265,
- 0.0019304112418350651,
- 0.0012250563819192475,
- 6.772278920636926E-4,
- 3.053219499076044E-4,
- 1.0753304827569297E-4
+ 0.23286196515853597,
+ 0.20161676779547133,
+ 0.17011159846949805,
+ 0.1395735907671064,
+ 0.110272951764528,
+ 0.084666169231571,
+ 0.06298145137335848,
+ 0.045442839066931806,
+ 0.03196224782058494,
+ 0.02190393267137673,
+ 0.014686769873750595,
+ 0.00970317866203249,
+ 0.006402827405022937,
+ 0.004283977056377879,
+ 0.0029136021846499598,
+ 0.001960487126474647,
+ 0.0012363099308865468,
+ 6.809155093872539E-4,
+ 3.0634374346337885E-4,
+ 1.07763096593597E-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 490b99af544fcbdc2020c9efc3fe36616f520e66..e7ad4abbfb7678223abd88a36ff9798cf0ffe829 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.03407226942036369,
- 0.022982814921679987,
- 0.015008406111340931,
- 0.009432436423167994,
- 0.005716475258084713,
- 0.0032797288160610746,
- 0.0018241819862603308,
- 9.656867516021692E-4,
- 4.957371142667414E-4,
- 2.4671439533343475E-4,
- 1.1959008182377565E-4,
- 5.630478235127674E-5,
- 2.5455606777734668E-5,
- 1.0836149662170067E-5,
- 4.237930949595059E-6,
- 1.4944103204824412E-6,
- 4.486596040856405E-7,
- 1.1294028594918225E-7,
- 2.2342324308523975E-8,
- 3.1220867882903023E-9
+ 0.03509019788270474,
+ 0.023672043210050033,
+ 0.015461485757251958,
+ 0.009720859117992194,
+ 0.005895073366015707,
+ 0.0033855697856321324,
+ 0.001885538074362394,
+ 9.998085436733444E-4,
+ 5.141862182733718E-4,
+ 2.563642074000904E-4,
+ 1.2447201188700214E-4,
+ 5.868023247408325E-5,
+ 2.6554460076681254E-5,
+ 1.1310951244249482E-5,
+ 4.425335683649439E-6,
+ 1.5608457515917777E-6,
+ 4.686633450593086E-7,
+ 1.1798360523614773E-7,
+ 2.3340930684216454E-8,
+ 3.26172321192792E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.008158803555679018,
- 0.005336148630595297,
- 0.0033554820990660417,
- 0.002018453740225622,
- 0.00115123218218696,
- 6.26105412850544E-4,
- 3.2215024226018093E-4,
- 1.5912285857150514E-4,
- 7.580689616285952E-5,
- 3.472043856901112E-5,
- 1.5340269126857917E-5,
- 6.4985377923203855E-6,
- 2.5867863686456793E-6,
- 9.742706359897133E-7,
- 3.2498938546034085E-7,
- 9.689165258246799E-8,
- 2.426566177806144E-8,
- 4.914603732486728E-9,
- 7.368045782603923E-10,
- 7.412792780617275E-11
+ 0.008377282812600046,
+ 0.005476844637973868,
+ 0.0034436262299643123,
+ 0.002072114140374086,
+ 0.0011827637162730514,
+ 6.440748955771398E-4,
+ 3.319815028194056E-4,
+ 1.643292227687863E-4,
+ 7.84693595634633E-5,
+ 3.602258495773719E-5,
+ 1.5947992659543457E-5,
+ 6.7669098447223684E-6,
+ 2.696748714096915E-6,
+ 1.016464108113229E-6,
+ 3.392355330334583E-7,
+ 1.0117067756070208E-7,
+ 2.534217137374941E-8,
+ 5.133261263594803E-9,
+ 7.696469754433571E-10,
+ 7.743740364093729E-11
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.05811518523318233,
- 0.04414316168675036,
- 0.0330681578670971,
- 0.024270364494600762,
- 0.017399096042500943,
- 0.01215812943488983,
- 0.008271908095306328,
- 0.005447182012383277,
- 0.0034861535737541476,
- 0.0021634657088707965,
- 0.0013071311993435974,
- 7.554821748123944E-4,
- 4.247133423862543E-4,
- 2.2568258926431527E-4,
- 1.1326027066437292E-4,
- 5.2136820652783796E-5,
- 2.1469539475466853E-5,
- 7.603582374434526E-6,
- 2.266968044465042E-6,
- 5.229352726822007E-7
+ 0.059836867159019626,
+ 0.045516758737146105,
+ 0.034156674346348455,
+ 0.025115768817839612,
+ 0.01803708685195293,
+ 0.012623813542426124,
+ 0.008600310243214374,
+ 0.005669934234218897,
+ 0.0036321765951007425,
+ 0.002255850871109844,
+ 0.001363787634638478,
+ 7.886024999850143E-4,
+ 4.4348111236770826E-4,
+ 2.3570968271206984E-4,
+ 1.183098098256845E-4,
+ 5.446617653660456E-5,
+ 2.24299649120295E-5,
+ 7.943991154558558E-6,
+ 2.3685115488022294E-6,
+ 5.463678230612657E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.08132980849390072,
- 0.0614745882572146,
- 0.04520368318287055,
- 0.032414729660971614,
- 0.02235614818913707,
- 0.015023173250012055,
- 0.009750875933444487,
- 0.006099106095366765,
- 0.003691961810029137,
- 0.0021557507980630945,
- 0.0012151562938347684,
- 6.595885962118877E-4,
- 3.434227776294976E-4,
- 1.7029391231894578E-4,
- 7.944972105094808E-5,
- 3.413628636282667E-5,
- 1.3243611397904753E-5,
- 4.501598257162602E-6,
- 1.2799775932982995E-6,
- 2.90402066799299E-7
+ 0.08365637087581765,
+ 0.06328091751692146,
+ 0.046584611885054375,
+ 0.033452127341389866,
+ 0.023108697668719053,
+ 0.015553782424031421,
+ 0.010110754664545038,
+ 0.00633314983898454,
+ 0.003838481095569623,
+ 0.0022438161088123455,
+ 0.0012660232441720149,
+ 6.877554096479659E-4,
+ 3.5831753841646097E-4,
+ 1.7776416830023428E-4,
+ 8.296222379738778E-5,
+ 3.565312965801539E-5,
+ 1.3833941676241391E-5,
+ 4.702643288690328E-6,
+ 1.3372112510983788E-6,
+ 3.033970972209854E-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 ec40a089969123f0d3c28a5b35eb6636777ab1a0..7aa1e653f64a8adf6c9824882a84e8be2700d27f 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -23,20 +23,20 @@
1.7119945007591924
],
"ys": [
- 0.42663430795869045,
- 0.3003467472262207,
- 0.20319530417849585,
- 0.13172372204867963,
- 0.08239857262974332,
- 0.04930264064974211,
- 0.029113825168265967,
- 0.016797393720477255,
- 0.009627805457452166,
- 0.005423970546348264,
- 0.00294662554992069,
- 0.0014926423160633157,
- 6.766246375270382E-4,
- 2.6336018828411093E-4,
+ 0.42663422439067866,
+ 0.30034534474600294,
+ 0.20319181287826804,
+ 0.1317182804744252,
+ 0.08239186580714886,
+ 0.049295392461194326,
+ 0.02910710156537928,
+ 0.01679236513036096,
+ 0.009624862833596362,
+ 0.005422635011184332,
+ 0.0029461698418783333,
+ 0.0014925315566456988,
+ 6.766086847822063E-4,
+ 2.633598609025862E-4,
8.418508555076697E-5,
2.0903797690684733E-5,
3.450979358876711E-6,
@@ -69,20 +69,20 @@
0.7929925155296614
],
"ys": [
- 0.11148054518889577,
- 0.07597909201139702,
- 0.05010979224215273,
- 0.03200264848330886,
- 0.019723905842089263,
- 0.011816223886996515,
- 0.006807018937827313,
- 0.003757454987631028,
- 0.00194510546759472,
- 9.138143942870923E-4,
- 3.791980077818598E-4,
- 1.3436087629974052E-4,
- 3.8630935874022573E-5,
- 8.866582442380385E-6,
+ 0.1114803801635311,
+ 0.07597754261786671,
+ 0.0501055535519571,
+ 0.031995614416187104,
+ 0.01971567273072919,
+ 0.011808741802172805,
+ 0.006801160884047568,
+ 0.0037530702390507526,
+ 0.0019421497128878798,
+ 9.122577764241953E-4,
+ 3.785896263413558E-4,
+ 1.341923952396422E-4,
+ 3.8601805959510175E-5,
+ 8.864649889289734E-6,
1.3237321176197512E-6,
1.1421820637782702E-7,
3.9762479918198074E-9,
@@ -115,20 +115,20 @@
1.6428726885203377
],
"ys": [
- 0.46843903570760426,
- 0.3392537828599918,
- 0.24003974825928925,
- 0.1660549338343667,
- 0.11287964242218389,
- 0.0756852029197655,
- 0.05004227092744465,
- 0.03228556801117789,
- 0.02025665343493218,
- 0.012227175612939806,
- 0.007066820867803847,
- 0.003771111811374731,
- 0.0018360834550886144,
- 7.578195219145997E-4,
+ 0.4684376217858109,
+ 0.3392503567268995,
+ 0.24003411818483583,
+ 0.1660473101168749,
+ 0.11287127625863354,
+ 0.07567810091139443,
+ 0.05003751350413061,
+ 0.032283004508963264,
+ 0.020255514423656928,
+ 0.012226776028886202,
+ 0.007066698930791792,
+ 0.0037710888995055518,
+ 0.0018360803139157917,
+ 7.578194493417702E-4,
2.569613864931385E-4,
6.711383488815794E-5,
1.2520271060591594E-5,
@@ -161,21 +161,21 @@
1.998773638612381
],
"ys": [
- 0.5879763201422652,
- 0.4403633132180404,
- 0.3201161994754228,
- 0.22806111702254894,
- 0.15830604631732248,
- 0.10911475120959392,
- 0.07421820518158218,
- 0.04963191634743468,
- 0.03257033708786812,
- 0.020765482277540576,
- 0.012780764783517275,
- 0.007528184615038731,
- 0.0041830151982948476,
- 0.002131828030432534,
- 9.575627846970414E-4,
+ 0.587975786269801,
+ 0.44036140193430356,
+ 0.320112093545525,
+ 0.22805481267112981,
+ 0.15829875762666953,
+ 0.10910808265547933,
+ 0.07421316234424216,
+ 0.04962871575469566,
+ 0.03256862264345402,
+ 0.020764710851960265,
+ 0.012780484539353841,
+ 0.0075280980055690856,
+ 0.0041829972051391625,
+ 0.002131825886551728,
+ 9.575627615492798E-4,
3.6218289173164323E-4,
1.1127544422929404E-4,
2.6205999047220843E-5,
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 da76be9fbfc704f18d4dc77b49f6f856959a5fe5..f4f20c58742c2d9e36cc452372610c3c45883d63 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,21 +23,21 @@
1.7119945007591924
],
"ys": [
- 0.11219418149955272,
- 0.08193809804890372,
- 0.058427224056747246,
- 0.04072996942810843,
- 0.02788747322775262,
- 0.01851282278224689,
- 0.012146584111612459,
- 0.007835754705143829,
- 0.005113698062574506,
- 0.0034167358909599215,
- 0.0023236889978207856,
- 0.0015492366206914317,
- 9.571342183052802E-4,
- 5.18388722942248E-4,
- 2.3538879216005956E-4,
+ 0.11219098214739304,
+ 0.08193542790248964,
+ 0.05842502282318569,
+ 0.04072857499162738,
+ 0.02788677472071821,
+ 0.018512543004405645,
+ 0.012146480839269105,
+ 0.007835718613338807,
+ 0.005113686294432937,
+ 0.003416732614470255,
+ 0.002323688239482103,
+ 0.0015492364832766833,
+ 9.571342003723067E-4,
+ 5.183887216670749E-4,
+ 2.3538879216000952E-4,
8.703406774261094E-5,
2.42709025241149E-5,
4.63551520457338E-6,
@@ -69,21 +69,21 @@
0.7929925155296614
],
"ys": [
- 0.03752282829007021,
- 0.02790235818081157,
- 0.020291473335101944,
- 0.014347620127278641,
- 0.009811815760070251,
- 0.006551698266619544,
- 0.0042851040081763915,
- 0.002780263825877548,
- 0.0017748261534795582,
- 0.001081374446409297,
- 6.059682111978197E-4,
- 3.0037487645006406E-4,
- 1.2686530093694687E-4,
- 4.5638086646417654E-5,
- 1.2816776692410322E-5,
+ 0.037528458578661966,
+ 0.027907820940292698,
+ 0.020296660680350048,
+ 0.0143517988889845,
+ 0.009814590351937193,
+ 0.006552910312885635,
+ 0.004285136570175629,
+ 0.0027799919960277125,
+ 0.0017746532324514148,
+ 0.00108132707111879,
+ 6.059660460962039E-4,
+ 3.0037482195210605E-4,
+ 1.2686529173816776E-4,
+ 4.563808543711145E-5,
+ 1.2816776643999983E-5,
2.813751553242538E-6,
4.3798093187898446E-7,
3.78243276990977E-8,
@@ -115,20 +115,20 @@
1.6428726885203377
],
"ys": [
- 0.1475571169201867,
- 0.11336141469770701,
- 0.08421118977554562,
- 0.06044141833552082,
- 0.042098281820023224,
- 0.028562264308952985,
- 0.018900976564553452,
- 0.012177895604798079,
- 0.007791882310459542,
- 0.005068144405177846,
- 0.003426460779667623,
- 0.0023483155891848477,
- 0.0015592502150927824,
- 9.072292226127481E-4,
+ 0.14755329378979273,
+ 0.113359294048349,
+ 0.08421019134105376,
+ 0.0604410154779526,
+ 0.042098126497287454,
+ 0.028562208412314292,
+ 0.01890095822589587,
+ 0.012177890259887565,
+ 0.007791880932176469,
+ 0.005068144100918392,
+ 0.003426460724381372,
+ 0.002348315582046171,
+ 0.0015592502145499016,
+ 9.072292226041189E-4,
4.3288277746987157E-4,
1.587108237468096E-4,
4.254229381134994E-5,
@@ -161,21 +161,21 @@
1.998773638612381
],
"ys": [
- 0.18980101512671516,
- 0.15158198357596697,
- 0.11629027480882584,
- 0.08609678194538066,
- 0.06109712680718186,
- 0.04236120642631215,
- 0.028624171292861354,
- 0.018867527952970933,
- 0.01223753966006653,
- 0.007900717612203576,
- 0.005198868455619458,
- 0.0035401723899006064,
- 0.0024646394180179664,
- 0.0016681578114901069,
- 0.0010209101740967954,
+ 0.18978988971700783,
+ 0.15157605579328254,
+ 0.11628733503254238,
+ 0.08609542143308128,
+ 0.061096559370017914,
+ 0.04236098763195781,
+ 0.02862409554558565,
+ 0.01886750482585816,
+ 0.0122375335022219,
+ 0.007900716230762248,
+ 0.005198868201063042,
+ 0.003540172353396182,
+ 0.002464639414487041,
+ 0.0016681578113355898,
+ 0.0010209101740962269,
5.271544454673987E-4,
2.1961669569318387E-4,
7.112998803514315E-5,
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 9b9b29ae5ff120d782d4c7af3e82101a27605e76..359c3198eb2e56ecb2f9c0aee76651b596471bd2 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,20 +23,20 @@
1.7119945007591924
],
"ys": [
- 0.7746375558648337,
- 0.568608027319152,
- 0.40228086776428584,
- 0.27559721539753224,
- 0.1847827745007173,
- 0.1202674102611144,
- 0.07755735738676434,
- 0.0487178660298033,
- 0.029946300572326875,
- 0.017735321826355236,
- 0.009943636050519693,
- 0.00513399800045274,
- 0.002353254885729413,
- 9.186108472798267E-4,
+ 0.7746367562815772,
+ 0.5686052431806999,
+ 0.40227467541483064,
+ 0.2755871907406573,
+ 0.18476999731569105,
+ 0.12025386508322182,
+ 0.07754541783037242,
+ 0.048709426308416584,
+ 0.02994162599286055,
+ 0.01773333819383354,
+ 0.009943003674454587,
+ 0.0051338708921865464,
+ 0.0023532435289291965,
+ 9.186108388174573E-4,
2.91134922239425E-4,
7.081671567626723E-5,
1.0380093911107993E-5,
@@ -69,20 +69,20 @@
0.7929925155296614
],
"ys": [
- 0.20264046469596886,
- 0.146785546746948,
- 0.10463148505795675,
- 0.07286464975049436,
- 0.04906793152679367,
- 0.03202953707619522,
- 0.020197661449521717,
- 0.012473510851131452,
- 0.007536752836142,
- 0.004348527883314365,
- 0.002316103872775049,
- 0.0010915405967481125,
- 4.3296555332394715E-4,
- 1.4215533451047177E-4,
+ 0.20263986131553968,
+ 0.14678294845713188,
+ 0.10462524254291136,
+ 0.07285460878576448,
+ 0.04905617784732996,
+ 0.03201875897479764,
+ 0.020189248475681296,
+ 0.012467468773957125,
+ 0.007532959771686708,
+ 0.004346640850204765,
+ 0.0023153926031180033,
+ 0.001091335657598864,
+ 4.329297811692454E-4,
+ 1.421540893693734E-4,
3.464257319303906E-5,
5.721595674845194E-6,
4.629202269862235E-7,
@@ -115,19 +115,19 @@
1.6428726885203377
],
"ys": [
- 0.9950179058848737,
- 0.7822116902616046,
- 0.5931072843627333,
- 0.4328514313357769,
- 0.305188328750542,
- 0.20928402445847188,
- 0.14061888645114712,
- 0.09247830305455766,
- 0.05964811129813068,
- 0.0372505023766337,
- 0.022180991743776555,
- 0.01198763610743114,
- 0.005763069890657762,
+ 0.9950149041471343,
+ 0.7822054510524109,
+ 0.5930970746391648,
+ 0.43283746778356513,
+ 0.30517281769505006,
+ 0.20927080695971087,
+ 0.14061027134169302,
+ 0.09247391728292101,
+ 0.059646322474660424,
+ 0.0372499286478018,
+ 0.022180858795201035,
+ 0.011987617233244183,
+ 0.005763068284039041,
0.002281406462237881,
7.143583176709967E-4,
1.6231834263474734E-4,
@@ -161,20 +161,20 @@
1.998773638612381
],
"ys": [
- 1.1725741716734674,
- 0.9595448806565294,
- 0.7565438991370887,
- 0.576472742231797,
- 0.4212006252611162,
- 0.2998904805496203,
- 0.20772257575475678,
- 0.14052059166903696,
- 0.0935254813599675,
- 0.06102243181561299,
- 0.0387387274822507,
- 0.023464483095253383,
- 0.013157433556152297,
- 0.006578117582739971,
+ 1.1725719133529338,
+ 0.9595400391715598,
+ 0.7565353507328292,
+ 0.5764603342356731,
+ 0.4211860880325202,
+ 0.29987701376720033,
+ 0.2077125723429759,
+ 0.1405145495941157,
+ 0.09352246860961959,
+ 0.06102120142703036,
+ 0.03873832947352556,
+ 0.023464391399195275,
+ 0.01315742042994123,
+ 0.006578116613440269,
0.0028173300502167117,
9.861066793382697E-4,
2.697271888406998E-4,
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 991e87fbf0c3897256bd866f5ef133910dd2d92d..5d653cfed98cf359e9b8edc7f340b2407311e96b 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
@@ -23,25 +23,25 @@
1.7119945007591924
],
"ys": [
- 0.22603899409570882,
- 0.18673287857100462,
- 0.14894826450333923,
- 0.11449459686752474,
- 0.0850627247739281,
- 0.06050753617727411,
- 0.04186494832203915,
- 0.02784640178887962,
- 0.017965013572680627,
- 0.01116739219449549,
- 0.0066388484141217926,
- 0.0037150173260031916,
- 0.0019124416127275232,
- 8.808346988467723E-4,
- 3.517917729362406E-4,
- 1.1860606208826518E-4,
- 3.113245832600558E-5,
- 5.934336491073473E-6,
- 6.490377038051989E-7,
+ 0.2260389941027982,
+ 0.18673287871717797,
+ 0.14894826654797788,
+ 0.11449461648567111,
+ 0.08506284895448553,
+ 0.06050807474287691,
+ 0.04186643845074871,
+ 0.027849209529987005,
+ 0.017968829044643447,
+ 0.011171394311388378,
+ 0.0066417651372260526,
+ 0.0037158797491691348,
+ 0.00191167641932664,
+ 8.796636053695822E-4,
+ 3.509779712411307E-4,
+ 1.182406018533433E-4,
+ 3.102542758912421E-5,
+ 5.9153879649216E-6,
+ 6.471765277197742E-7,
2.1638094074644876E-8
]
},
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.0848684854211798,
- 0.06356710902622462,
- 0.04641117501036812,
- 0.03297846975590124,
- 0.022699517574026544,
- 0.015213732656235435,
- 0.009902496814137251,
- 0.006335145928490495,
- 0.0039865864894636045,
- 0.0024309339594358248,
- 0.0014028975755141129,
- 7.387740265158948E-4,
- 3.393430532791158E-4,
- 1.3424893838340544E-4,
- 4.2162858860582E-5,
- 1.0279967292669856E-5,
- 1.6366373926494018E-6,
+ 0.08486848560499322,
+ 0.0635671121445339,
+ 0.04641120376548576,
+ 0.03297860619359377,
+ 0.022699906546387684,
+ 0.01521446969486093,
+ 0.009903407719051592,
+ 0.006335747888701792,
+ 0.0039865876097801385,
+ 0.0024302704469097176,
+ 0.0014012006706543927,
+ 7.363411888351279E-4,
+ 3.373119800831176E-4,
+ 1.331554495380604E-4,
+ 4.1773579822682375E-5,
+ 1.0192004683187488E-5,
+ 1.6283915890889046E-6,
1.142921653056598E-7,
1.671555398835124E-10,
2.447116464287589E-12
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.24758645115268763,
- 0.213680508278707,
- 0.17903575455114873,
- 0.1447166722646258,
- 0.11240804045758426,
- 0.08366238121494166,
- 0.05952571077492732,
- 0.040196367575692185,
- 0.025818675997801164,
- 0.01571518445393729,
- 0.00907213783291749,
- 0.0048344042416248924,
- 0.0023938865208150435,
- 0.0010445259209416996,
- 3.930237514796485E-4,
- 1.2076919550002056E-4,
- 2.8969461152055297E-5,
- 5.0477322294193E-6,
- 6.459554826292055E-7,
+ 0.24758645161159107,
+ 0.21368051350451356,
+ 0.17903579294302124,
+ 0.14471686198216982,
+ 0.11240870512653817,
+ 0.08366414518041265,
+ 0.05952936285783296,
+ 0.040201939466709996,
+ 0.025824445204410205,
+ 0.01571897546733584,
+ 0.009073275949873377,
+ 0.0048338434728619935,
+ 0.002392938789438222,
+ 0.001043844605181894,
+ 3.926954996484337E-4,
+ 1.2065853222813827E-4,
+ 2.8945445199153775E-5,
+ 5.0431958827163675E-6,
+ 6.458915879250966E-7,
5.0977545729106306E-8
]
},
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.2746411101459637,
- 0.24397151645607723,
- 0.21108720518096571,
- 0.17760528084413568,
- 0.14385801332012899,
- 0.11269779324956575,
- 0.08472302218446734,
- 0.06083642715252092,
- 0.04175350824686377,
- 0.0272975988326612,
- 0.017001713053876735,
- 0.010050897612300014,
- 0.005599456824679152,
- 0.0029018624369537933,
- 0.001370110554625004,
- 5.715559501985186E-4,
- 2.059564046566074E-4,
- 6.24922964316318E-5,
- 1.534827774557806E-5,
- 3.0293876035503556E-6
+ 0.27464111040686656,
+ 0.24397151910936232,
+ 0.21108722461286616,
+ 0.1776053800398283,
+ 0.143858391830204,
+ 0.11269887180037957,
+ 0.08472552519443224,
+ 0.060841173672394874,
+ 0.04176039523356019,
+ 0.027304863909348488,
+ 0.01700707209018706,
+ 0.010053394813066925,
+ 0.005599824780819147,
+ 0.0029013745282167906,
+ 0.001369595818065326,
+ 5.712689186226531E-4,
+ 2.0583910689957137E-4,
+ 6.246219285651837E-5,
+ 1.534383975886173E-5,
+ 3.029313657208876E-6
]
}
}
\ No newline at end of file