diff --git a/gradle.properties b/gradle.properties
index df14f14418b9847d99fe1079656ed61091d669b7..9ec679a3e76756df042d985acbcb11b0f34b5897 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.3.10
+nshmpLibVersion = 1.3.13
nshmpWsUtilsVersion = 0.3.12
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 3b3ce34fd9e586c4b0c4492025f647420a5df18e..0aad9e2f57e6de4ba66c985e4ac0d5ecaa1cf227 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -164,7 +164,7 @@ task testConus2023(type: Test) {
useJUnitPlatform()
jvmArgs(
"-Xms2g",
- "-Xmx8g",
+ "-Xmx16g",
)
filter {
diff --git a/nshms.yml b/nshms.yml
index 029867c063d98d8fa4bf5d8cdbfc4b2f2697865e..f9cace13249607eb2e4abbe3b9c30ad81fc8f1b4 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -73,7 +73,7 @@ nshms:
# CONUS 2023 NSHM
-
repo: nshm-conus
- tag: 6.b.2
+ tag: 6.b.3
year: 2023
deployment:
baseHref: /ws/nshmp/conus-2023/dynamic
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
index ba7c7c07059aa39cc3795150291521130b7d193f..ae7cb13e77582ee9cb78da46c58325cedd516a6d 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
@@ -102,10 +102,10 @@ public class DisaggController {
@PathVariable double latitude,
@Schema(
minimum = "150",
- maximum = "3000") @PathVariable double vs30,
+ maximum = "1500") @PathVariable double vs30,
@Schema(
- minimum = "150",
- maximum = "3000") @PathVariable double returnPeriod,
+ minimum = "50",
+ maximum = "10000") @PathVariable double returnPeriod,
@QueryValue @Nullable Set<Imt> imt,
@QueryValue @Nullable Set<DisaggDataType> out) {
try {
@@ -149,7 +149,7 @@ public class DisaggController {
minimum = "150",
maximum = "3000") @PathVariable double vs30,
@Schema(
- example = "{\"PGA\": 0, \"SA0P2\": 0, \"SA1P0\": 0, \"SA2P0\": 0}") @QueryValue @Nullable Map<Imt, Double> imls,
+ example = "{\"PGA\": 0.1, \"SA0P2\": 0.2, \"SA1P0\": 0.05, \"SA2P0\": 0.01}") @QueryValue @Nullable Map<Imt, Double> imls,
@QueryValue @Nullable Set<DisaggDataType> out) {
try {
Map<Imt, Double> imtImlMap = http.getParameters().asMap(Imt.class, Double.class);
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 4b53dcbef9cb5fe1bc544d7d2217fd0983a6a1c5..78d802b8b44b7a58fa8193547ef7af39a51121e2 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.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
+ 0.03781690942134722,
+ 0.02560998712695722,
+ 0.01683517841756172,
+ 0.010675317900339305,
+ 0.006527977980738499,
+ 0.0037666741939616057,
+ 0.0020910571328798195,
+ 0.0010923590899631103,
+ 5.458772566494526E-4,
+ 2.6104985735441133E-4,
+ 1.2062939801655834E-4,
+ 5.4113647550187295E-5,
+ 2.347538999109399E-5,
+ 9.699580588310418E-6,
+ 3.7213621990011277E-6,
+ 1.2984686317975073E-6,
+ 3.8820660002283173E-7,
+ 9.785045471794203E-8,
+ 1.946037843483608E-8,
+ 2.7422728345358543E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 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
+ 0.00921320730094861,
+ 0.00612172117222991,
+ 0.003927784889616463,
+ 0.002415843378135533,
+ 0.0014072769298912606,
+ 7.774423342976144E-4,
+ 4.024693099758766E-4,
+ 1.9730634218575704E-4,
+ 9.182408947706067E-5,
+ 4.0465849036853986E-5,
+ 1.703760017497274E-5,
+ 6.866482223986137E-6,
+ 2.6160622771360306E-6,
+ 9.542403834324573E-7,
+ 3.1185607453236485E-7,
+ 9.181884057053901E-8,
+ 2.2848239268149787E-8,
+ 4.620311222721343E-9,
+ 6.936412711209975E-10,
+ 7.028579358099718E-11
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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.06599397975220576,
+ 0.04951601624256741,
+ 0.036513738982136494,
+ 0.026258583569526425,
+ 0.01833916291963426,
+ 0.012411914456006224,
+ 0.008141006833289569,
+ 0.005152225174879873,
+ 0.003167899870405807,
+ 0.001891726179226934,
+ 0.0011035470885633653,
+ 6.179966567302162E-4,
+ 3.385611975149567E-4,
+ 1.7630584453206903E-4,
+ 8.72617228563019E-5,
+ 3.982648113280293E-5,
+ 1.632507906376405E-5,
+ 5.769066788130919E-6,
+ 1.7184900721224076E-6,
+ 3.963193550050803E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 0.09353115905390523,
+ 0.0703016736669049,
+ 0.05123931616345851,
+ 0.03630581145641291,
+ 0.024635985605014427,
+ 0.016213078359687383,
+ 0.010249801865790506,
+ 0.0062122987954390104,
+ 0.0036307543903602354,
+ 0.0020431384223740232,
+ 0.0011103316932372833,
+ 5.822894133817993E-4,
+ 2.9401954680419504E-4,
+ 1.4214673052602845E-4,
+ 6.507484914740439E-5,
+ 2.762583302658458E-5,
+ 1.065899008792829E-5,
+ 3.622386410973509E-6,
+ 1.0342006360285484E-6,
+ 2.3647467423869639E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
index 64045111b3460d022a7eaad14c8c029e4d0c387b..36cd5380080df31e2469aac4fb6d54b167a5ff78 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.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
+ 0.03324893310902484,
+ 0.022004431105884844,
+ 0.01431014775274047,
+ 0.009151239631673426,
+ 0.0057796167722751765,
+ 0.00351403260771589,
+ 0.0020552936759178297,
+ 0.0011024828423755128,
+ 5.332796764095534E-4,
+ 2.2502078443087167E-4,
+ 8.132456018629311E-5,
+ 2.4983602810937415E-5,
+ 6.6829514950423814E-6,
+ 1.744963240725027E-6,
+ 4.909788509372824E-7,
+ 1.5684348441413008E-7,
+ 4.4159912147687756E-8,
+ 1.0492474877263185E-8,
+ 1.9576567710691036E-9,
+ 2.5802146447004877E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 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
+ 0.010005966930455426,
+ 0.0070201385492799345,
+ 0.004946069582032201,
+ 0.0034831512155612545,
+ 0.0023991290974655823,
+ 0.0015793614229230987,
+ 9.569588656999187E-4,
+ 5.209847415833335E-4,
+ 2.4735052236108E-4,
+ 9.904665205541751E-5,
+ 3.277868452186688E-5,
+ 8.712990693707899E-6,
+ 1.7904539860522427E-6,
+ 3.053453022508045E-7,
+ 4.5864222733130684E-8,
+ 9.670711470276267E-9,
+ 2.3562950445765526E-9,
+ 4.914029457128014E-10,
+ 7.99798410640728E-11,
+ 9.381018392075352E-12
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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.04088625408517391,
+ 0.02742434591762619,
+ 0.01821903404509547,
+ 0.011934422965670087,
+ 0.007663011513102015,
+ 0.004765114308889278,
+ 0.0028282312853084653,
+ 0.0015783077414236475,
+ 8.390693640246431E-4,
+ 4.318004979848098E-4,
+ 2.2144131101680214E-4,
+ 1.1266780710891709E-4,
+ 5.821356278132561E-5,
+ 2.9316226798325754E-5,
+ 1.4233176969030012E-5,
+ 6.407467702128437E-6,
+ 2.5948292983347617E-6,
+ 9.058302958854361E-7,
+ 2.664550977482879E-7,
+ 6.060200630189976E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 0.0691554767286036,
+ 0.04697296493489196,
+ 0.030953931061635506,
+ 0.020002703636453695,
+ 0.012514413169193663,
+ 0.007683322438550794,
+ 0.004524345762442764,
+ 0.0025095609630764104,
+ 0.001303814344569991,
+ 6.313143767624346E-4,
+ 2.8898318737977953E-4,
+ 1.2787451423137346E-4,
+ 5.6009010931444306E-5,
+ 2.444851739501035E-5,
+ 1.0472190893854823E-5,
+ 4.248516889956776E-6,
+ 1.5807570795442502E-6,
+ 5.190573795746768E-7,
+ 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 5ed8cf75d7e295b2f97bca080b443cb07cd0869f..899d3f46738821d851e6df33f14de16fc8b9c2f4 100644
--- a/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.8930394300275821,
- 0.6749918381679874,
- 0.49303515325532005,
- 0.34750344309204567,
- 0.23683057852368883,
- 0.15353992971871455,
- 0.0961504205688885,
- 0.057118255524974404,
- 0.03254983412381369,
- 0.017706551998919143,
- 0.009199256321560047,
- 0.004564415356652822,
- 0.0021562936253538795,
- 9.547518736988405E-4,
- 3.843661108834438E-4,
- 1.3593109798767843E-4,
- 3.889249998627689E-5,
- 8.457986321819216E-6,
- 1.1051308985395114E-6,
- 5.259011100968705E-8
+ 0.7868229507766732,
+ 0.5989999740713615,
+ 0.4411933145811913,
+ 0.3138528363617102,
+ 0.21596260906881826,
+ 0.14138668083572575,
+ 0.08936175659864179,
+ 0.053571208295266515,
+ 0.030805802165079648,
+ 0.01691363012419211,
+ 0.00887050490251598,
+ 0.004442451953532403,
+ 0.00211670264649697,
+ 9.438419330811554E-4,
+ 3.819154377529803E-4,
+ 1.3550505201544378E-4,
+ 3.8845344810999264E-5,
+ 8.454437599000299E-6,
+ 1.1049521824670764E-6,
+ 5.2588487621771735E-8
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 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,
- 2.247175730385522E-5,
- 5.411418886960912E-6,
- 9.928107472863706E-7,
- 1.1743055609458905E-7,
- 5.982617399200269E-9,
- 3.071987966436827E-14
+ 0.2542985961896629,
+ 0.1860513815459171,
+ 0.13155312718011508,
+ 0.08938668609700867,
+ 0.05807099427773341,
+ 0.03639542346903606,
+ 0.021912933201174326,
+ 0.012707809816302823,
+ 0.0069846599769759305,
+ 0.003542480929942337,
+ 0.0016311355865872895,
+ 6.735471519384868E-4,
+ 2.4513239707115337E-4,
+ 8.03508366264512E-5,
+ 2.2497141682863387E-5,
+ 5.4211128874109765E-6,
+ 9.955933871382086E-7,
+ 1.1798184600469259E-7,
+ 6.032781739742643E-9,
+ 3.1737259531833734E-14
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.0408774927742945,
- 0.8228815592058314,
- 0.6353827790239575,
- 0.47852776659542795,
- 0.35102245255593834,
- 0.2495855477480165,
- 0.1707599949868633,
- 0.11090265514843083,
- 0.06815040581058016,
- 0.03924877869438323,
- 0.02116071390003618,
- 0.010447140759295407,
- 0.0048755764198802195,
- 0.002092817691903345,
- 8.186454543042516E-4,
- 2.734436254989102E-4,
- 7.233828570932013E-5,
- 1.3617045711482666E-5,
- 1.5643150627006195E-6,
- 5.836979641093877E-8
+ 0.9060051232217639,
+ 0.7175752958409577,
+ 0.5558555572960041,
+ 0.42078460948974206,
+ 0.3107593352604376,
+ 0.22259208945018233,
+ 0.15336119255340921,
+ 0.10025626794045822,
+ 0.0620233986634114,
+ 0.03600102576167425,
+ 0.019590569749519476,
+ 0.009779698336973813,
+ 0.004621183161915629,
+ 0.0020103826897193175,
+ 7.962597777072059E-4,
+ 2.687947423527658E-4,
+ 7.171139765481873E-5,
+ 1.3578410116556566E-5,
+ 1.5629304265358868E-6,
+ 5.830091651054837E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.2322842421810511,
- 1.0061597602503232,
- 0.7986159168246194,
- 0.6201221946003167,
- 0.4676124373980192,
- 0.3456609702956266,
- 0.247711664304258,
- 0.1705552243103603,
- 0.11226595990131216,
- 0.06992833061816081,
- 0.04100714363585288,
- 0.022529752631688313,
- 0.011592421694006833,
- 0.005606862118102381,
- 0.002546612025525221,
- 0.0010623256549632133,
- 3.933660299968117E-4,
- 1.2270161178495203E-4,
- 2.972703740529991E-5,
- 5.047438500391396E-6
+ 1.070491121815655,
+ 0.874908825634708,
+ 0.6955542513007297,
+ 0.5416958681285222,
+ 0.4104584089223994,
+ 0.30531106839534905,
+ 0.22031724779258055,
+ 0.1527501072974481,
+ 0.10121660039467142,
+ 0.06347142603560565,
+ 0.03749794864850485,
+ 0.020783089957195106,
+ 0.010808160040269188,
+ 0.0052941181283052766,
+ 0.0024377564292367812,
+ 0.0010302190494455154,
+ 3.8564882358079914E-4,
+ 1.2133563966813449E-4,
+ 2.959166719348735E-5,
+ 5.041371572081886E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
index 88ececb0f28ae1a2d9874ec64ff19b29481108cf..bccd4ff496ae5dca417c1ff3ab97ae35218e04d7 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.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
+ 0.11534974599388693,
+ 0.08698148362667113,
+ 0.06406292276167219,
+ 0.046078192405115966,
+ 0.03253637462327355,
+ 0.022366693877149558,
+ 0.015293415446741955,
+ 0.010356860424666315,
+ 0.007106470813094831,
+ 0.00500706584678398,
+ 0.0036674141315344282,
+ 0.0027708487867755156,
+ 0.002086773137749997,
+ 0.001487821691947794,
+ 9.535157338758259E-4,
+ 5.308929783756661E-4,
+ 2.4632953188630317E-4,
+ 9.45996695314454E-5,
+ 2.890552912548327E-5,
+ 6.721429379688254E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 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
+ 0.026538247127206118,
+ 0.01906655327064791,
+ 0.013626789983486496,
+ 0.00976641241039197,
+ 0.00706601708351237,
+ 0.005239513882617428,
+ 0.004007441363707505,
+ 0.0031914729308122084,
+ 0.002618022856257823,
+ 0.0021443231305726383,
+ 0.0016874006667018065,
+ 0.0012325536428221145,
+ 8.112607839937964E-4,
+ 4.7620846546351115E-4,
+ 2.3778952000443155E-4,
+ 1.0104841608143451E-4,
+ 3.506862368489196E-5,
+ 9.65602594855597E-6,
+ 1.9712202459681616E-6,
+ 2.798557895371194E-7
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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.2008267606411687,
+ 0.1730315848271916,
+ 0.14594179639708077,
+ 0.11988197257474568,
+ 0.0957725674466078,
+ 0.07448415764500856,
+ 0.05653535014883013,
+ 0.04183964847744843,
+ 0.0303591809822878,
+ 0.021603536983251643,
+ 0.015147902209371053,
+ 0.010380513858986464,
+ 0.007086868639928332,
+ 0.004776405847494422,
+ 0.003194033664349469,
+ 0.002063032278608447,
+ 0.0012314821193950324,
+ 6.362959860235963E-4,
+ 2.7133142360006776E-4,
+ 8.845979888500936E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 0.23235672977120592,
+ 0.2010308578772427,
+ 0.16949594749416608,
+ 0.13897123143573237,
+ 0.10971503991301251,
+ 0.08417324450282236,
+ 0.06257442666659786,
+ 0.045144369921103086,
+ 0.03178577283279019,
+ 0.021843269000236743,
+ 0.014712774190862492,
+ 0.009775248303873085,
+ 0.006484422014715581,
+ 0.004352494841555028,
+ 0.002960985572647082,
+ 0.0019882654343830203,
+ 0.0012502056040323956,
+ 6.867898974882985E-4,
+ 3.0838031869483585E-4,
+ 1.083218280210284E-4
]
}
}
\ 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 e7ad4abbfb7678223abd88a36ff9798cf0ffe829..9ce8bc6283fe9511fea3eb17959cadb3613f95e3 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.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
+ 0.0382624680623094,
+ 0.026030463448604706,
+ 0.017155400855241892,
+ 0.010885390093212644,
+ 0.006660097241570285,
+ 0.003858088495130119,
+ 0.0021663261007892464,
+ 0.0011583421935267536,
+ 6.009032500164473E-4,
+ 3.0233926709153134E-4,
+ 1.4817587290785013E-4,
+ 7.050104808577861E-5,
+ 3.218992880314699E-5,
+ 1.3832096806263693E-5,
+ 5.459529842118775E-6,
+ 1.9428392150340858E-6,
+ 5.888734403531783E-7,
+ 1.4974470891297607E-7,
+ 2.995182697021266E-8,
+ 4.239346142112846E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 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
+ 0.009600199498981159,
+ 0.006320598140568551,
+ 0.003998495592416973,
+ 0.002420968116332609,
+ 0.0013922805998762867,
+ 7.653511087722587E-4,
+ 3.9910028144341994E-4,
+ 2.0013103147428781E-4,
+ 9.684010210476128E-5,
+ 4.501923579779383E-5,
+ 2.0158227838894868E-5,
+ 8.640044965400363E-6,
+ 3.4752442404719267E-6,
+ 1.3213285385796125E-6,
+ 4.4489663641411424E-7,
+ 1.3385272064306846E-7,
+ 3.383715559062798E-8,
+ 6.9217291724856125E-9,
+ 1.0496384684360479E-9,
+ 1.071989454665421E-10
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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.06295212478082787,
+ 0.04804845815748257,
+ 0.0361916108234815,
+ 0.0267152751305139,
+ 0.01926073686033505,
+ 0.013535182229688402,
+ 0.009262342125760426,
+ 0.006136637176633701,
+ 0.003951706514772565,
+ 0.0024672025970475927,
+ 0.001499024950979399,
+ 8.710019776437941E-4,
+ 4.921002498934159E-4,
+ 2.6283929164592834E-4,
+ 1.3262871270711607E-4,
+ 6.141179303724591E-5,
+ 2.544365025981951E-5,
+ 9.06649630578154E-6,
+ 2.7195777970597315E-6,
+ 6.313004310982964E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 0.08776972431938838,
+ 0.06659157694814948,
+ 0.049225799499276135,
+ 0.03552861479492542,
+ 0.024688518599665057,
+ 0.016720836145648118,
+ 0.01094027406228688,
+ 0.006899372453907445,
+ 0.004211132882578026,
+ 0.0024795228150876546,
+ 0.0014092415433829238,
+ 7.711400309583001E-4,
+ 4.0474448623951237E-4,
+ 2.0238516038224294E-4,
+ 9.527876089291166E-5,
+ 4.134621298433285E-5,
+ 1.6214324144157016E-5,
+ 5.575162343216448E-6,
+ 1.6050336029577984E-6,
+ 3.6913561822247894E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
index 7aa1e653f64a8adf6c9824882a84e8be2700d27f..8367876f96232970d50cf6c5a5bf5a4df46815e4 100644
--- a/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.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,
- 3.0109881252425987E-7,
- 5.0815529053615285E-9,
- 1.0636033291493928E-11
+ 0.42208271051403046,
+ 0.29741505562391685,
+ 0.20134874165633232,
+ 0.1305394914031066,
+ 0.08159855815766615,
+ 0.048747243858519765,
+ 0.028728543066498365,
+ 0.0165441497545661,
+ 0.00947241143924665,
+ 0.005336503708211274,
+ 0.0029018426273452174,
+ 0.0014720823187714567,
+ 6.683502338795141E-4,
+ 2.6054273485112787E-4,
+ 8.340470321860671E-5,
+ 2.0739047756728618E-5,
+ 3.4299913798081007E-6,
+ 2.997988841557021E-7,
+ 5.025722906176405E-9,
+ 1.0054998350751101E-11
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 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,
- 4.54506897153046E-11,
+ 0.11164603476372417,
+ 0.07615302033867133,
+ 0.05023218916490202,
+ 0.03206205379070699,
+ 0.01973607720387932,
+ 0.011805505973328502,
+ 0.006791558526586791,
+ 0.003745403489667254,
+ 0.0019379262080626738,
+ 9.104396500283078E-4,
+ 3.779357081441099E-4,
+ 1.3398373542307244E-4,
+ 3.8539619855725496E-5,
+ 8.848137363408722E-6,
+ 1.3209823866585529E-6,
+ 1.1402111764402845E-7,
+ 3.993898781907206E-9,
+ 4.57747291671781E-11,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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,
- 1.4773362122043648E-6,
- 9.218341162439102E-8,
- 1.7917352823542414E-10
+ 0.4599155461589819,
+ 0.3319649086597787,
+ 0.23409206986520695,
+ 0.16154647326844573,
+ 0.10974945705851255,
+ 0.07368404021013333,
+ 0.04881628439753486,
+ 0.03151539823238062,
+ 0.019734131847006696,
+ 0.011863259940844108,
+ 0.006829054480992549,
+ 0.0036370634708222313,
+ 0.0017718673884405407,
+ 7.330338912127748E-4,
+ 2.4937961771369805E-4,
+ 6.540575764264173E-5,
+ 1.2274495275130132E-5,
+ 1.4624587583248914E-6,
+ 9.203515745538137E-8,
+ 1.7885452404470933E-10
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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,
- 4.246048820908114E-6,
- 4.026984526362189E-7
+ 0.5781736131159295,
+ 0.4317558628608713,
+ 0.3127299521443648,
+ 0.22201616924311307,
+ 0.15372574540645126,
+ 0.10590175150198311,
+ 0.07213141667988376,
+ 0.04834103453366969,
+ 0.031763983053272216,
+ 0.020237222675818754,
+ 0.012424027707767982,
+ 0.0072957051804368265,
+ 0.004046254486904427,
+ 0.0020623972288192683,
+ 9.280649502297485E-4,
+ 3.520634680161896E-4,
+ 1.0857326034440289E-4,
+ 2.5689366239442765E-5,
+ 4.192750623848367E-6,
+ 4.01123348460218E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
index f4f20c58742c2d9e36cc452372610c3c45883d63..d7a96302b72858a8c4704d87d469b11383864122 100644
--- a/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.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,
- 4.445081399101097E-7,
- 1.3384862684136067E-8
+ 0.1066205260901246,
+ 0.07825583368489923,
+ 0.056109842470212556,
+ 0.03934203889371674,
+ 0.027094158525910624,
+ 0.018091906437977468,
+ 0.011936509153668218,
+ 0.007741438737676913,
+ 0.005076325830295601,
+ 0.00340464389948409,
+ 0.002321055813108433,
+ 0.0015492739820206014,
+ 9.575059527875631E-4,
+ 5.18588452697687E-4,
+ 2.3545109060021696E-4,
+ 8.704532042458257E-5,
+ 2.427075127671637E-5,
+ 4.6354399691063655E-6,
+ 4.445186505995051E-7,
+ 1.3362154203028717E-8
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 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,
- 9.645509292239546E-10,
+ 0.03668139913725896,
+ 0.027416185277202007,
+ 0.020013441545351698,
+ 0.014186157289335533,
+ 0.00971580082012322,
+ 0.006493622679459942,
+ 0.004251065202650582,
+ 0.0027618184401512072,
+ 0.0017658984392134578,
+ 0.0010776067815833582,
+ 6.045776102932352E-4,
+ 2.999138195955864E-4,
+ 1.2672661498885026E-4,
+ 4.5597555745573066E-5,
+ 1.2806028374110111E-5,
+ 2.811031292211179E-6,
+ 4.3749715102153516E-7,
+ 3.7783452369069785E-8,
+ 9.623240540872695E-10,
0.0
]
},
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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,
- 7.418489918810133E-6,
- 7.197558643861303E-7,
- 2.263720678874752E-8
+ 0.1349931553096723,
+ 0.10345943906469635,
+ 0.0769239914133015,
+ 0.055486209971864056,
+ 0.03900001317460326,
+ 0.02678500066257991,
+ 0.017968206202401048,
+ 0.01173766157331265,
+ 0.007606679496527605,
+ 0.005001050150819256,
+ 0.0034065854722393333,
+ 0.002344470201826488,
+ 0.0015592089355909338,
+ 9.075635513349779E-4,
+ 4.330276156939576E-4,
+ 1.5874554685976004E-4,
+ 4.254754130488548E-5,
+ 7.419397242177774E-6,
+ 7.200876073546254E-7,
+ 2.266803290550335E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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,
- 1.6600250552528635E-5,
- 2.386272725595525E-6
+ 0.1728841872965669,
+ 0.1375827373817079,
+ 0.10543463713960693,
+ 0.07824019989964623,
+ 0.055887122092807634,
+ 0.039159099313921884,
+ 0.02682324594932466,
+ 0.017949410300669166,
+ 0.011815578180490236,
+ 0.007730434545688283,
+ 0.005141237870537882,
+ 0.0035259505457939508,
+ 0.0024637091317716063,
+ 0.0016696333053445832,
+ 0.0010219552979188978,
+ 5.275816856796742E-4,
+ 2.1974043251097854E-4,
+ 7.115551098628321E-5,
+ 1.660393923546466E-5,
+ 2.386951424389801E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
index 359c3198eb2e56ecb2f9c0aee76651b596471bd2..a9bf63d5fd0bc622cd4984e9ddf10414650e4ca2 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.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,
- 5.655988991794296E-7,
- 4.335520555056763E-9,
- 4.1099056908468094E-11
+ 0.7412020069287325,
+ 0.546771097372181,
+ 0.3895666182491331,
+ 0.2693187943302815,
+ 0.18242338921639994,
+ 0.11995038403977892,
+ 0.07799644881444773,
+ 0.04927358342759975,
+ 0.030376607486987953,
+ 0.018008349759277505,
+ 0.010097680914907158,
+ 0.00521278561086945,
+ 0.0023892049050663073,
+ 9.327513480139984E-4,
+ 2.9569244893226095E-4,
+ 7.195033306131465E-5,
+ 1.0565214635249342E-5,
+ 5.827800074435574E-7,
+ 4.900599416825652E-9,
+ 4.275194655099434E-11
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 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,
- 1.0201961208946842E-8,
+ 0.19989802787063055,
+ 0.1454791924374374,
+ 0.10406351582976882,
+ 0.07264283835386522,
+ 0.04900244150364073,
+ 0.03203461887322696,
+ 0.0202326926768266,
+ 0.012514319742195705,
+ 0.007570412205123908,
+ 0.004370698137649081,
+ 0.002328097436837211,
+ 0.0010968941346559207,
+ 4.3491809840385653E-4,
+ 1.427451566651518E-4,
+ 3.477749217799798E-5,
+ 5.745950716089173E-6,
+ 4.6551996044968885E-7,
+ 1.0273248639993878E-8,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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,
- 2.3172627377515066E-5,
- 1.3221435247206632E-6,
- 1.0390900005539278E-8,
- 2.4891617693814247E-11
+ 0.941446692674993,
+ 0.7407885169406322,
+ 0.563676262226526,
+ 0.4142531765743614,
+ 0.2952951724787791,
+ 0.2055261969138869,
+ 0.1405332525902355,
+ 0.09407170389206379,
+ 0.06152413341756263,
+ 0.03870360907811028,
+ 0.02306193103598436,
+ 0.01242056330021445,
+ 0.005944148449743759,
+ 0.002343796648641668,
+ 7.320727193201749E-4,
+ 1.6617918651901805E-4,
+ 2.373369787480074E-5,
+ 1.3637344746821936E-6,
+ 1.1750308079023131E-8,
+ 2.573279141406786E-11
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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,
- 5.3391584263627216E-5,
- 6.048245836640893E-6,
- 2.123505790177978E-7
+ 1.1094705753560454,
+ 0.9074498058082456,
+ 0.7162917121900128,
+ 0.5477892655903103,
+ 0.4030663143449499,
+ 0.29003473458033724,
+ 0.20377246183432465,
+ 0.14019231121072628,
+ 0.09489231245407237,
+ 0.06276041979515903,
+ 0.0401527687724505,
+ 0.024367211576743906,
+ 0.0136370347718493,
+ 0.006794920278788953,
+ 0.002900600612398345,
+ 0.00101273146372814,
+ 2.7665341473606154E-4,
+ 5.4736799591264516E-5,
+ 6.206212855747993E-6,
+ 2.2238003232261039E-7
]
}
}
\ 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 5d653cfed98cf359e9b8edc7f340b2407311e96b..649aa23fe7b18031f38c1a3cb2877929b8f859a5 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.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
+ 0.2720012839099464,
+ 0.22500101891286955,
+ 0.1795956127957704,
+ 0.1380152103367654,
+ 0.10236460084101376,
+ 0.07254027934989354,
+ 0.04987402230582741,
+ 0.03285731579837476,
+ 0.0209271590832584,
+ 0.012804398289015523,
+ 0.007478196138367596,
+ 0.004109055516008944,
+ 0.002078683165252033,
+ 9.424289908426162E-4,
+ 3.712971432068213E-4,
+ 1.2376763365575736E-4,
+ 3.217585650066018E-5,
+ 6.088764006370009E-6,
+ 6.638069060296292E-7,
+ 2.2338042216476536E-8
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 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
+ 0.10112155116443493,
+ 0.07536274297033069,
+ 0.05467225443720265,
+ 0.03855135589753426,
+ 0.026295074114303603,
+ 0.017434536142098132,
+ 0.011196417577343755,
+ 0.0070428555522426255,
+ 0.004340897633319749,
+ 0.002584434083125346,
+ 0.0014543142944078412,
+ 7.472476663557046E-4,
+ 3.358110282768571E-4,
+ 1.3061836671336092E-4,
+ 4.0509946695418904E-5,
+ 9.83906313046857E-6,
+ 1.5976112911162914E-6,
+ 1.1702442353526242E-7,
+ 2.9729067075443623E-10,
+ 4.389238001777538E-12
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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
+ 0.2997574596960255,
+ 0.2594970677904381,
+ 0.21800348948407317,
+ 0.17666524901866726,
+ 0.1375855038726806,
+ 0.10267707671363704,
+ 0.07323059909803735,
+ 0.0495145751290026,
+ 0.031761383858285856,
+ 0.019223717074444042,
+ 0.010977650963636176,
+ 0.005754173014131576,
+ 0.002791308105856049,
+ 0.001189193451117029,
+ 4.3628590817867453E-4,
+ 1.305744694545304E-4,
+ 3.0452965136500134E-5,
+ 5.153654934301513E-6,
+ 6.486338325711446E-7,
+ 5.098248660411605E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 0.33134195947353257,
+ 0.2952442825082112,
+ 0.2561058686047792,
+ 0.21595142650255816,
+ 0.1752830008987528,
+ 0.1375976824795585,
+ 0.10364510277886793,
+ 0.07453632475792718,
+ 0.05117114296700223,
+ 0.033382624917334625,
+ 0.020666555202340092,
+ 0.012084714154117097,
+ 0.006625971666421022,
+ 0.0033650785545447535,
+ 0.0015524800541055423,
+ 6.317979271851182E-4,
+ 2.219466181801561E-4,
+ 6.563867979464505E-5,
+ 1.5714570279941968E-5,
+ 3.047854069812862E-6
]
}
}
\ No newline at end of file