From 438e8f9923cb3923ea057048e396c9c7a1064967 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 5 Dec 2022 14:55:45 -0700
Subject: [PATCH] add actual results
---
build.gradle | 36 ++++
gradle/nshm.gradle | 27 ++-
.../nshm-conus-5.2.0-2018-BOSTON_MA.json} | 154 +++++++++---------
.../nshm-conus-5.2.0-2018-CHICAGO_IL.json} | 118 +++++++-------
...nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json} | 58 +++----
.../nshm-conus-5.2.0-2018-NEW_MADRID_MO.json} | 138 ++++++++--------
.../nshm-conus-5.2.0-2018-NEW_YORK_NY.json} | 136 ++++++++--------
.../nshm-conus-5.2.0-2018-RENO_NV.json} | 82 +++++-----
...m-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json} | 118 +++++++-------
...hm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json} | 54 +++---
.../nshm-conus-5.2.0-2018-SEATTLE_WA.json} | 88 +++++-----
.../nshm-hawaii-2.0.2-2021-HILO_HI.json} | 62 +++----
.../nshm-hawaii-2.0.2-2021-HONOLULU_HI.json} | 40 ++---
...shm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json} | 66 ++++----
14 files changed, 614 insertions(+), 563 deletions(-)
rename src/test/resources/e2e/{nshm-conus-2018-BOSTON_MA.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json} (53%)
rename src/test/resources/e2e/{nshm-conus-2018-CHICAGO_IL.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json} (64%)
rename src/test/resources/e2e/{nshm-conus-2018-LOS_ANGELES_CA.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json} (83%)
rename src/test/resources/e2e/{nshm-conus-2018-NEW_MADRID_MO.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json} (58%)
rename src/test/resources/e2e/{nshm-conus-2018-NEW_YORK_NY.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json} (59%)
rename src/test/resources/e2e/{nshm-conus-2018-RENO_NV.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json} (75%)
rename src/test/resources/e2e/{nshm-conus-2018-SALT_LAKE_CITY_UT.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json} (64%)
rename src/test/resources/e2e/{nshm-conus-2018-SAN_FRANCISCO_CA.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json} (84%)
rename src/test/resources/e2e/{nshm-conus-2018-SEATTLE_WA.json => nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json} (73%)
rename src/test/resources/e2e/{nshm-hawaii-2021-HILO_HI.json => nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json} (81%)
rename src/test/resources/e2e/{nshm-hawaii-2021-HONOLULU_HI.json => nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json} (88%)
rename src/test/resources/e2e/{nshm-hawaii-2021-KAILUA_KONA_HI.json => nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json} (80%)
diff --git a/build.gradle b/build.gradle
index 5110420ec..6619f6d7c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -82,3 +82,39 @@ test {
excludeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsHawaii"
}
}
+
+task testNshms(type: Test) {
+ useJUnitPlatform()
+ jvmArgs(
+ '-Xms2g',
+ '-Xmx32g',
+ )
+
+ filter {
+ includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests"
+ }
+}
+
+task testConus2018(type: Test) {
+ useJUnitPlatform()
+ jvmArgs(
+ '-Xms2g',
+ '-Xmx32g',
+ )
+
+ filter {
+ includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsConus2018"
+ }
+}
+
+task testHawaii2021(type: Test) {
+ useJUnitPlatform()
+ jvmArgs(
+ '-Xms2g',
+ '-Xmx32g',
+ )
+
+ filter {
+ includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTestsHawaii2021"
+ }
+}
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 56bf10cf7..939658a43 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -1,7 +1,8 @@
apply plugin: "de.undercouch.download"
ext {
- archiveUrl = "https://code.usgs.gov/ghsc/nshmp/nshms/nshm-conus/-/archive"
+ conusArchiveUrl = "https://code.usgs.gov/ghsc/nshmp/nshms/nshm-conus/-/archive"
+ hawaiiArchiveUrl = "https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii/-/archive"
nshmDir = "nshms";
}
@@ -11,17 +12,31 @@ ext {
task downloadNshms() {
doLast {
// Download and unzip nshm-conus tag 5.2.0
- def zipFile = new File(nshmDir, "nshm-conus-5.2.0.zip")
+ def conus2018 = new File(nshmDir, "nshm-conus-5.2.0.zip")
download.run {
- src "${archiveUrl}/5.2.0/nshm-conus-5.2.0.zip"
- dest zipFile
+ src "${conusArchiveUrl}/5.2.0/nshm-conus-5.2.0.zip"
+ dest conus2018
}
copy {
- from zipTree(zipFile)
+ from zipTree(conus2018)
into nshmDir
}
delete {
- delete zipFile
+ delete conus2018
+ }
+
+ // Download and unzip nshm-hawaii tag 2.0.2
+ def hawaii2021 = new File(nshmDir, "nshm-hawaii-2.0.2.zip")
+ download.run {
+ src "${hawaiiArchiveUrl}/2.0.2/nshm-hawaii-2.0.2.zip"
+ dest hawaii2021
+ }
+ copy {
+ from zipTree(hawaii2021)
+ into nshmDir
+ }
+ delete {
+ delete hawaii2021
}
}
}
diff --git a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
similarity index 53%
rename from src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
index cd25c781f..4ba51b726 100644
--- a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-BOSTON_MA.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.02078455097994014,
- 0.013752036153143975,
+ 0.020784550979940135,
+ 0.01375203615314397,
0.008853912425965713,
- 0.005504502737593541,
- 0.0032956032209899913,
- 0.001851496392326522,
- 9.93143597796057E-4,
- 4.956595518220795E-4,
- 2.3401548992797768E-4,
- 1.0471944598011259E-4,
- 4.5084212737722855E-5,
- 1.8896301560235415E-5,
- 7.725874681605789E-6,
- 3.039143578552158E-6,
- 1.1170515811344104E-6,
- 3.745132401726646E-7,
- 1.0752962397804165E-7,
- 2.596070736658151E-8,
- 4.917918081492094E-9,
- 6.503383766857791E-10
+ 0.005504502737593539,
+ 0.0032956032209899917,
+ 0.0018514963923265215,
+ 9.931435977960567E-4,
+ 4.956595518220793E-4,
+ 2.3401548992797762E-4,
+ 1.0471944598011257E-4,
+ 4.508421273772284E-5,
+ 1.889630156023541E-5,
+ 7.725874681605785E-6,
+ 3.0391435785521572E-6,
+ 1.11705158113441E-6,
+ 3.745132401726645E-7,
+ 1.0752962397804161E-7,
+ 2.5960707366581506E-8,
+ 4.917918081492093E-9,
+ 6.50338376685779E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.003849668670011357,
+ 0.0038496686700113564,
0.0025078664183317764,
0.0015597948853785955,
- 9.157017059864715E-4,
- 5.001931310456336E-4,
+ 9.157017059864713E-4,
+ 5.001931310456335E-4,
2.547249918503188E-4,
- 1.194486623970574E-4,
- 5.2327359356867026E-5,
- 2.1561183371151274E-5,
- 8.4003477208669E-6,
- 3.1469958181727803E-6,
- 1.1420236854051995E-6,
+ 1.1944866239705738E-4,
+ 5.232735935686702E-5,
+ 2.156118337115127E-5,
+ 8.400347720866899E-6,
+ 3.14699581817278E-6,
+ 1.1420236854051993E-6,
3.9303700685767165E-7,
- 1.2947742656347805E-7,
- 3.718668812692663E-8,
- 9.324871744942211E-9,
- 1.8778829487123563E-9,
- 2.846632932077524E-10,
- 2.6974731510803602E-11,
- 1.0385526508492285E-12
+ 1.2947742656347803E-7,
+ 3.7186688126926624E-8,
+ 9.324871744942213E-9,
+ 1.877882948712356E-9,
+ 2.8466329320775234E-10,
+ 2.6974731510803595E-11,
+ 1.0385526508492283E-12
]
},
"Peak Ground Acceleration": {
@@ -107,33 +107,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.039154336261104566,
- 0.028874987776381145,
+ 0.03915433626110455,
+ 0.028874987776381138,
0.020883581441243287,
- 0.014675088491569479,
+ 0.014675088491569477,
0.009966398305490464,
0.006525399875535823,
0.004122194389111176,
- 0.0025039012846601923,
+ 0.002503901284660192,
0.0014759816292745382,
- 8.455590549998983E-4,
- 4.744378692952328E-4,
- 2.5614908673281055E-4,
- 1.357929724979682E-4,
- 6.854218948534535E-5,
- 3.291803684798866E-5,
- 1.4569587193494361E-5,
- 5.782794746110382E-6,
- 1.9737183250309452E-6,
- 5.657594675445636E-7,
+ 8.455590549998979E-4,
+ 4.7443786929523266E-4,
+ 2.5614908673281044E-4,
+ 1.3579297249796823E-4,
+ 6.854218948534534E-5,
+ 3.291803684798865E-5,
+ 1.4569587193494358E-5,
+ 5.782794746110381E-6,
+ 1.9737183250309444E-6,
+ 5.657594675445634E-7,
1.2462940285422407E-7
]
},
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.06054799387340501,
- 0.045010937165688894,
- 0.032384225534707246,
- 0.022605947101161122,
- 0.015060131175111444,
- 0.009690757366506481,
- 0.005957079199326996,
- 0.003490107511158219,
- 0.001962702434309726,
- 0.0010598138716072614,
- 5.526846406248315E-4,
- 2.7876439975788514E-4,
- 1.3582948573407556E-4,
- 6.359388081275608E-5,
- 2.8287825293638217E-5,
- 1.1707073491487452E-5,
- 4.419923256430148E-6,
- 1.4745471754128646E-6,
- 4.1424535992947296E-7,
+ 0.060547993873405,
+ 0.04501093716568888,
+ 0.03238422553470723,
+ 0.022605947101161112,
+ 0.01506013117511144,
+ 0.009690757366506484,
+ 0.005957079199326997,
+ 0.0034901075111582196,
+ 0.0019627024343097255,
+ 0.0010598138716072616,
+ 5.526846406248313E-4,
+ 2.787643997578851E-4,
+ 1.358294857340756E-4,
+ 6.359388081275606E-5,
+ 2.8287825293638214E-5,
+ 1.1707073491487447E-5,
+ 4.4199232564301465E-6,
+ 1.4745471754128641E-6,
+ 4.142453599294728E-7,
9.342364439170645E-8
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
similarity index 64%
rename from src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
index 68072a3b0..04374779e 100644
--- a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-CHICAGO_IL.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.01767550023787113,
- 0.011804993270225165,
+ 0.017675500237871122,
+ 0.011804993270225163,
0.007916670756587606,
0.0053491472480445695,
- 0.003631390427708423,
+ 0.003631390427708422,
0.002384405538478485,
- 0.0014870231028831253,
- 8.355484214788523E-4,
- 4.1460657776932683E-4,
- 1.757911127856578E-4,
- 6.240935342700552E-5,
- 1.8240832144136128E-5,
- 4.414927964063778E-6,
+ 0.0014870231028831248,
+ 8.355484214788524E-4,
+ 4.1460657776932694E-4,
+ 1.7579111278565783E-4,
+ 6.240935342700551E-5,
+ 1.824083214413613E-5,
+ 4.4149279640637774E-6,
9.994457044956116E-7,
2.4855133647506633E-7,
- 7.726459746150786E-8,
+ 7.726459746150785E-8,
2.121042318488014E-8,
- 4.860565864414978E-9,
- 8.64105244261508E-10,
- 1.0633132855584107E-10
+ 4.8605658644149765E-9,
+ 8.641052442615079E-10,
+ 1.0633132855584105E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.004904504983066266,
- 0.0037556118245414046,
- 0.0029006854981177593,
- 0.002197256906365074,
- 0.0015714972511203787,
- 0.0010317853455482512,
- 5.988137176440332E-4,
+ 0.004904504983066265,
+ 0.003755611824541404,
+ 0.002900685498117759,
+ 0.0021972569063650727,
+ 0.001571497251120379,
+ 0.001031785345548251,
+ 5.98813717644033E-4,
2.999898092710794E-4,
1.2636087757687215E-4,
- 4.334153727062957E-5,
- 1.1727951025836871E-5,
- 2.383247006424206E-6,
+ 4.334153727062956E-5,
+ 1.1727951025836876E-5,
+ 2.3832470064242063E-6,
3.5209264942037673E-7,
3.7851796592772213E-8,
- 5.963076928168122E-9,
+ 5.963076928168123E-9,
1.4910332126633127E-9,
- 3.141788737237651E-10,
+ 3.1417887372376505E-10,
5.2511189664780556E-11,
- 5.968234937924545E-12,
+ 5.968234937924543E-12,
3.1469632224157163E-13
]
},
@@ -107,31 +107,31 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.022709150996398572,
+ 0.02270915099639857,
0.015516400129389082,
0.01063565058866354,
- 0.007250987342509733,
+ 0.007250987342509732,
0.00484747526482874,
- 0.0031114243186504235,
- 0.0018782779132334622,
+ 0.003111424318650424,
+ 0.0018782779132334618,
0.0010500224979932131,
5.534113089259502E-4,
2.81605357092695E-4,
- 1.4369489671881903E-4,
+ 1.4369489671881906E-4,
7.346403339083293E-5,
3.8325297999058965E-5,
- 1.9431569974270378E-5,
+ 1.9431569974270375E-5,
9.42159253961068E-6,
- 4.1976884388553816E-6,
- 1.6696279770654772E-6,
+ 4.197688438855381E-6,
+ 1.6696279770654767E-6,
5.688244700978395E-7,
1.6230550529800464E-7,
3.549954903295298E-8
@@ -162,25 +162,25 @@
],
"ys": [
0.04184772415672415,
- 0.02851981218255562,
- 0.01902862263652819,
- 0.012597694078764635,
- 0.008183488070776039,
- 0.005256326568188244,
+ 0.028519812182555615,
+ 0.019028622636528186,
+ 0.01259769407876463,
+ 0.008183488070776035,
+ 0.005256326568188243,
0.0032378832457639964,
- 0.0018635316801681953,
- 9.90711951482253E-4,
- 4.830130551236983E-4,
+ 0.001863531680168195,
+ 9.907119514822528E-4,
+ 4.8301305512369827E-4,
2.1935879450693264E-4,
- 9.551470151347582E-5,
- 4.1247826827249706E-5,
+ 9.551470151347578E-5,
+ 4.124782682724971E-5,
1.7924007974639768E-5,
- 7.691633829460732E-6,
- 3.129256114185964E-6,
+ 7.69163382946073E-6,
+ 3.1292561141859636E-6,
1.1644839692951632E-6,
- 3.8155425174464243E-7,
- 1.0444941528551557E-7,
- 2.265638077580196E-8
+ 3.815542517446424E-7,
+ 1.0444941528551554E-7,
+ 2.2656380775801956E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
similarity index 83%
rename from src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
index c22520b8f..72661624b 100644
--- a/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-LOS_ANGELES_CA.json
@@ -3,44 +3,44 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
0.6366574720501088,
- 0.47180374791963997,
+ 0.4718037479196399,
0.336364557146257,
- 0.2311796226192394,
+ 0.23117962261923944,
0.15426255108470943,
0.09868641697941964,
- 0.06168226983900997,
+ 0.061682269839009964,
0.037095482704419605,
0.021775137700280892,
0.012418053525144834,
0.006834724125143083,
0.0035759571677002966,
0.0017322386889934245,
- 7.490722245704205E-4,
+ 7.490722245704206E-4,
2.781308992738419E-4,
- 8.55525189246937E-5,
+ 8.555251892469371E-5,
1.9638736883809428E-5,
- 2.96393173511507E-6,
+ 2.9639317351150696E-6,
2.2713550419680115E-7,
2.172828515836533E-9
]
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,9 +69,9 @@
0.7929925155296614
],
"ys": [
- 0.16844377244854847,
+ 0.1684437724485485,
0.11829589663275786,
- 0.08101452065128258,
+ 0.08101452065128259,
0.05406282717487072,
0.035127313944556586,
0.02246250359719528,
@@ -82,11 +82,11 @@
0.0011102558974719061,
4.306689571156029E-4,
1.3931953053831388E-4,
- 3.7833745729080926E-5,
+ 3.783374572908093E-5,
8.044063188459818E-6,
1.3835389066707896E-6,
1.5518435606411874E-7,
- 7.36238777232291E-9,
+ 7.362387772322911E-9,
8.557445185989779E-13,
0.0
]
@@ -107,10 +107,10 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
@@ -118,15 +118,15 @@
0.7850465833348313,
0.6149388088135578,
0.46880770081149936,
- 0.348104179748503,
- 0.25232659558218706,
+ 0.34810417974850305,
+ 0.252326595582187,
0.17814867226367861,
0.12154240052962642,
0.07901532677500141,
0.04903288877565289,
0.02903200372417984,
0.016462922915925538,
- 0.00872825444898973,
+ 0.008728254448989729,
0.004380357672598145,
0.001967488906616791,
7.622024986858485E-4,
@@ -161,23 +161,23 @@
1.998773638612381
],
"ys": [
- 0.9277678999858486,
- 0.753748033038108,
- 0.5931923233025838,
+ 0.9277678999858487,
+ 0.7537480330381081,
+ 0.5931923233025839,
0.45540482519284387,
0.3391134734752599,
- 0.24809053741765913,
+ 0.2480905374176591,
0.1766116798966622,
- 0.12123002464436061,
+ 0.1212300246443606,
0.07985280215586492,
0.050147609948821836,
0.030081503068165788,
0.01724538444217736,
- 0.009432364207667705,
+ 0.009432364207667703,
0.004883172427187242,
0.002333377346825734,
9.819488750632801E-4,
- 3.476070212087309E-4,
+ 3.4760702120873095E-4,
9.771982942272988E-5,
1.9713363600257578E-5,
2.3576513888748996E-6
diff --git a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
similarity index 58%
rename from src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
index 2345a4a76..cd06e3826 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_MADRID_MO.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.05460474620644813,
+ 0.05460474620644812,
0.039322200263679656,
- 0.027742521888583595,
- 0.019256487920663257,
- 0.013309032474447959,
+ 0.02774252188858359,
+ 0.019256487920663253,
+ 0.013309032474447957,
0.009158100387208452,
- 0.0064699544926735564,
+ 0.006469954492673559,
0.004711825464791655,
- 0.00361441996860359,
- 0.0029237508993505794,
- 0.002458976181859003,
- 0.0020724707675324793,
- 0.0016635058660181773,
- 0.001206920974532014,
- 7.58005194921214E-4,
- 4.028136886385925E-4,
+ 0.003614419968603591,
+ 0.002923750899350579,
+ 0.0024589761818590034,
+ 0.002072470767532478,
+ 0.001663505866018177,
+ 0.0012069209745320132,
+ 7.580051949212139E-4,
+ 4.028136886385924E-4,
1.7473743872927871E-4,
6.14366486371895E-5,
- 1.660370716466393E-5,
+ 1.6603707164663944E-5,
3.2819885795529328E-6
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.011183350950193821,
- 0.00820850133786319,
- 0.0061259943786559495,
+ 0.01118335095019382,
+ 0.008208501337863189,
+ 0.006125994378655951,
0.004704029030923133,
- 0.0037445097750955785,
- 0.0031134253259270835,
+ 0.0037445097750955776,
+ 0.003113425325927084,
0.0026896900327019677,
- 0.0023879637030226153,
- 0.002117544110718752,
- 0.0018011501748482462,
- 0.0014173471729516552,
- 0.0010068130175955078,
+ 0.0023879637030226144,
+ 0.0021175441107187517,
+ 0.0018011501748482464,
+ 0.0014173471729516554,
+ 0.0010068130175955076,
6.301951022408455E-4,
- 3.4447816991405093E-4,
- 1.561396083486973E-4,
- 5.887416288449927E-5,
- 1.748301261392189E-5,
- 3.857677678049851E-6,
+ 3.4447816991405077E-4,
+ 1.5613960834869736E-4,
+ 5.887416288449928E-5,
+ 1.7483012613921885E-5,
+ 3.8576776780498505E-6,
5.776336202494065E-7,
- 3.6035648979050635E-8
+ 3.603564897905063E-8
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
0.11111072621136198,
- 0.09432125494016415,
- 0.07822805599600462,
- 0.06292369383675941,
- 0.048970144357273364,
+ 0.09432125494016416,
+ 0.0782280559960046,
+ 0.06292369383675939,
+ 0.04897014435727336,
0.036942153943163344,
- 0.027163843299139248,
- 0.019537877568746243,
- 0.013915832488455515,
+ 0.027163843299139255,
+ 0.019537877568746236,
+ 0.013915832488455513,
0.009887221698272164,
- 0.0070940413496668455,
- 0.005146435316179508,
- 0.003865608590322207,
- 0.0029837666408947206,
- 0.0023260711475453035,
- 0.0017237133487967339,
+ 0.007094041349666844,
+ 0.0051464353161795075,
+ 0.0038656085903222065,
+ 0.00298376664089472,
+ 0.002326071147545303,
+ 0.001723713348796734,
0.0011265388791854103,
- 6.015982295191782E-4,
- 2.5104779111283416E-4,
- 7.632592705118943E-5
+ 6.015982295191785E-4,
+ 2.510477911128342E-4,
+ 7.632592705118941E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.13557175676510386,
+ 0.13557175676510383,
0.11487697773688868,
- 0.09473336922159181,
- 0.07576523916620488,
- 0.058061656399242885,
- 0.04307702076073272,
- 0.03089333087514904,
+ 0.09473336922159178,
+ 0.0757652391662049,
+ 0.05806165639924289,
+ 0.04307702076073271,
+ 0.030893330875149033,
0.02154336192618488,
- 0.014802677054253843,
- 0.01011911451019241,
- 0.006988258677940676,
- 0.00495471722552012,
- 0.003663126515262553,
+ 0.014802677054253841,
+ 0.010119114510192404,
+ 0.006988258677940673,
+ 0.004954717225520118,
+ 0.003663126515262554,
0.002832444396585898,
- 0.002237940845752877,
+ 0.002237940845752876,
0.0017164930070629656,
0.0011926180558950762,
6.965535536645009E-4,
- 3.211131756404801E-4,
- 1.1269789534198825E-4
+ 3.2111317564048023E-4,
+ 1.1269789534198828E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
similarity index 59%
rename from src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
index 5ba624ee1..a37b667f8 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-NEW_YORK_NY.json
@@ -3,44 +3,44 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.018666421015364296,
- 0.012277714382170502,
+ 0.018666421015364292,
+ 0.012277714382170499,
0.007819753747405414,
- 0.0047835883866622865,
- 0.0028112191687725907,
- 0.0015540453407317347,
+ 0.004783588386662285,
+ 0.00281121916877259,
+ 0.0015540453407317345,
8.285075887238436E-4,
- 4.1827330817572424E-4,
+ 4.182733081757242E-4,
2.0477961806545264E-4,
- 9.76841382864806E-5,
- 4.582979651500823E-5,
+ 9.768413828648057E-5,
+ 4.582979651500822E-5,
2.1108151934584483E-5,
- 9.40307880873417E-6,
- 3.952177823009206E-6,
- 1.5239368107090302E-6,
- 5.283693302216128E-7,
- 1.5532448868679193E-7,
- 3.807576669004164E-8,
+ 9.403078808734168E-6,
+ 3.952177823009205E-6,
+ 1.52393681070903E-6,
+ 5.283693302216127E-7,
+ 1.553244886867919E-7,
+ 3.807576669004163E-8,
7.285190754922316E-9,
9.713305930824852E-10
]
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.0036839290291613555,
- 0.002335050751486981,
- 0.001402579620737425,
- 7.930112908299476E-4,
- 4.1808903382999877E-4,
+ 0.003683929029161356,
+ 0.0023350507514869807,
+ 0.0014025796207374245,
+ 7.930112908299475E-4,
+ 4.1808903382999866E-4,
2.0733134457052304E-4,
- 9.623213274255234E-5,
- 4.279209350393817E-5,
+ 9.623213274255237E-5,
+ 4.2792093503938167E-5,
1.8488428033840786E-5,
- 7.785121676935125E-6,
- 3.2094244668835695E-6,
- 1.2788721198896172E-6,
- 4.7640365740538307E-7,
- 1.651037823961913E-7,
- 4.9341854768598423E-8,
- 1.2738983551119943E-8,
+ 7.785121676935123E-6,
+ 3.20942446688357E-6,
+ 1.2788721198896168E-6,
+ 4.764036574053829E-7,
+ 1.6510378239619124E-7,
+ 4.934185476859842E-8,
+ 1.2738983551119938E-8,
2.6202525850572688E-9,
4.0485837495960446E-10,
- 3.904486628199482E-11,
- 1.5324451927867105E-12
+ 3.9044866281994814E-11,
+ 1.53244519278671E-12
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.029878942979656188,
- 0.02169931498570595,
+ 0.029878942979656185,
+ 0.021699314985705948,
0.015627345176841466,
0.011107491120984697,
- 0.007776586292284123,
- 0.005349775331002555,
- 0.0036068398003160375,
- 0.00236476621256421,
- 0.0015114836562529481,
- 9.383042482967955E-4,
- 5.672612883032052E-4,
- 3.2775630190425736E-4,
- 1.8379026685332687E-4,
- 9.707147245294277E-5,
- 4.8216709391054424E-5,
- 2.1867540425618328E-5,
+ 0.007776586292284122,
+ 0.005349775331002554,
+ 0.003606839800316037,
+ 0.002364766212564209,
+ 0.001511483656252948,
+ 9.383042482967953E-4,
+ 5.672612883032051E-4,
+ 3.2775630190425725E-4,
+ 1.837902668533268E-4,
+ 9.707147245294275E-5,
+ 4.8216709391054403E-5,
+ 2.186754042561832E-5,
8.83267345573992E-6,
3.054523154324783E-6,
8.84797873298568E-7,
- 1.9672786782893157E-7
+ 1.9672786782893154E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,25 +162,25 @@
],
"ys": [
0.048301983959234095,
- 0.0350497356176406,
- 0.024744052454742888,
- 0.017095234304717735,
+ 0.035049735617640576,
+ 0.024744052454742878,
+ 0.01709523430471773,
0.01141511174006545,
0.007482577963101015,
- 0.0047698738556462535,
- 0.0029480912847476026,
- 0.0017725798590443338,
+ 0.004769873855646253,
+ 0.002948091284747602,
+ 0.0017725798590443333,
0.0010323738247512593,
- 5.823000408387339E-4,
- 3.1694058457143036E-4,
+ 5.823000408387338E-4,
+ 3.169405845714303E-4,
1.656074574036077E-4,
- 8.238484623559816E-5,
- 3.852324830287548E-5,
+ 8.238484623559815E-5,
+ 3.852324830287547E-5,
1.657549901909999E-5,
- 6.439186747078616E-6,
- 2.1925820654928877E-6,
- 6.249719391706649E-7,
- 1.4238886738032344E-7
+ 6.439186747078615E-6,
+ 2.1925820654928872E-6,
+ 6.249719391706647E-7,
+ 1.423888673803234E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
similarity index 75%
rename from src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
index 0bab9a416..6cc0d1e22 100644
--- a/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-RENO_NV.json
@@ -3,28 +3,28 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.5639424382793682,
- 0.41970430872704,
+ 0.5639424382793681,
+ 0.41970430872703995,
0.2996355631700337,
0.20436506496344023,
0.13386011296908937,
@@ -32,23 +32,23 @@
0.05072763584783538,
0.02970332088645175,
0.016962428614047866,
- 0.009368748098138393,
- 0.004942501068704084,
+ 0.009368748098138395,
+ 0.004942501068704083,
0.002420101079214425,
- 0.0010564988095787106,
+ 0.0010564988095787104,
3.945561117465654E-4,
1.2048922319737728E-4,
2.8266770250121335E-5,
- 4.252380705836177E-6,
+ 4.252380705836178E-6,
4.4029329263288646E-7,
- 2.573585831849357E-8,
+ 2.5735858318493567E-8,
8.240992980384035E-11
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.16195200240025112,
- 0.11197070315750861,
+ 0.1619520024002511,
+ 0.11197070315750862,
0.07461644808670248,
- 0.04806931482649302,
- 0.029904421907731293,
- 0.01809720511043038,
- 0.010526649862628145,
+ 0.048069314826493036,
+ 0.029904421907731286,
+ 0.018097205110430375,
+ 0.010526649862628149,
0.0058497036090659794,
0.003024869157973338,
0.001398899091725516,
- 5.607903420664931E-4,
+ 5.607903420664932E-4,
1.884917390363045E-4,
- 5.034839107343867E-5,
- 1.0331505761726529E-5,
+ 5.034839107343866E-5,
+ 1.033150576172653E-5,
1.5403732253339458E-6,
1.766940560506774E-7,
- 9.230578884022922E-9,
+ 9.230578884022919E-9,
0.0,
0.0,
0.0
@@ -107,30 +107,30 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.6547357887817037,
+ 0.6547357887817038,
0.5154175476805015,
- 0.3956456162265481,
+ 0.39564561622654804,
0.2946377853731455,
0.21261726439098355,
0.14856083770157558,
- 0.10023112298791949,
+ 0.1002311229879195,
0.06449394268051883,
0.03938928323399141,
- 0.022644338964053448,
- 0.012321069753420741,
+ 0.02264433896405345,
+ 0.012321069753420743,
0.006191664090278571,
- 0.0028672800399024167,
+ 0.0028672800399024163,
0.001131585475187518,
3.666664317975439E-4,
- 9.021209601637859E-5,
+ 9.021209601637857E-5,
1.523566711127091E-5,
1.4539154793262797E-6,
6.099357830874233E-8,
@@ -164,21 +164,21 @@
0.7737520693137596,
0.626158058671475,
0.4943026693905384,
- 0.38152373161093633,
+ 0.3815237316109364,
0.2849928378328236,
- 0.20811270361164624,
- 0.14726293268062962,
- 0.1003374121401908,
- 0.06562437576887946,
+ 0.20811270361164622,
+ 0.14726293268062965,
+ 0.10033741214019079,
+ 0.06562437576887947,
0.04081755703105158,
- 0.02407438562720991,
+ 0.024074385627209913,
0.013446854247539834,
0.007078613802080741,
0.003434334658947344,
- 0.0014729955574711105,
+ 0.0014729955574711107,
5.304815215680369E-4,
1.5325010460188717E-4,
- 3.2864405116884194E-5,
+ 3.28644051168842E-5,
4.5541957008082325E-6,
3.3625843088903307E-7
]
diff --git a/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
similarity index 64%
rename from src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
index b8b668efa..07ded0139 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SALT_LAKE_CITY_UT.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.10141210582180435,
- 0.07447849798602046,
+ 0.10141210582180434,
+ 0.07447849798602045,
0.05330127231316856,
- 0.037102818795138215,
- 0.025232028167263765,
+ 0.03710281879513821,
+ 0.02523202816726377,
0.01661034649634634,
- 0.010874067593129609,
- 0.00708922479836808,
+ 0.010874067593129606,
+ 0.0070892247983680825,
0.004735625457686324,
0.003249464756093951,
- 0.002245495226811022,
- 0.0014914478772558575,
- 8.988552768687256E-4,
- 4.656680939512108E-4,
- 1.9882970591587768E-4,
+ 0.0022454952268110232,
+ 0.0014914478772558568,
+ 8.988552768687258E-4,
+ 4.65668093951211E-4,
+ 1.9882970591587773E-4,
6.785029212800548E-5,
- 1.6876651512201575E-5,
- 2.6537417417255936E-6,
+ 1.6876651512201572E-5,
+ 2.653741741725594E-6,
1.731813940276621E-7,
- 1.0355704040041718E-10
+ 1.0355704040041717E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.03338701576491687,
+ 0.033387015764916865,
0.02465096645560166,
0.01764423071929716,
0.012269680846161648,
0.008337057201618096,
- 0.005635024432572457,
- 0.0037891327023550233,
- 0.0025149123784953846,
- 0.0015863429059217115,
- 9.014315449747968E-4,
- 4.414029650416536E-4,
- 1.7921117169766217E-4,
- 5.754118100356993E-5,
+ 0.005635024432572455,
+ 0.0037891327023550246,
+ 0.002514912378495384,
+ 0.001586342905921711,
+ 9.014315449747966E-4,
+ 4.4140296504165355E-4,
+ 1.7921117169766214E-4,
+ 5.754118100356994E-5,
1.4224526877692228E-5,
- 2.207856914416273E-6,
+ 2.2078569144162738E-6,
1.8880753843912258E-7,
2.916565870061635E-9,
1.3533194681297857E-11,
1.4761223207476851E-12,
- 7.365315902026219E-14
+ 7.365315902026218E-14
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.13047100258720734,
- 0.09849712329595019,
- 0.07246017969843056,
+ 0.1304710025872074,
+ 0.09849712329595017,
+ 0.07246017969843055,
0.05191828655903307,
- 0.03636526505318484,
- 0.024993217741374765,
+ 0.036365265053184825,
+ 0.024993217741374762,
0.01690096807101634,
- 0.011231650127527283,
- 0.007452801108191979,
- 0.005017181957434341,
+ 0.011231650127527285,
+ 0.007452801108191982,
+ 0.005017181957434342,
0.003470567929844281,
- 0.0024023685398152327,
- 0.0016078002266633948,
- 9.514053815001429E-4,
- 4.656644721669267E-4,
+ 0.002402368539815233,
+ 0.0016078002266633955,
+ 9.51405381500143E-4,
+ 4.6566447216692683E-4,
1.7536330043880214E-4,
4.811667218966291E-5,
- 8.632653500921545E-6,
+ 8.632653500921544E-6,
8.008388400062674E-7,
- 2.268010646406833E-8
+ 2.2680106464068337E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,24 +162,24 @@
],
"ys": [
0.16740950916822125,
- 0.13018273718211873,
+ 0.1301827371821187,
0.09802333688436565,
0.0720099099078939,
0.05129669394322607,
0.03606585232915037,
- 0.02491600581620359,
- 0.01691309964162624,
- 0.011363408680915814,
- 0.007619737320678116,
+ 0.024916005816203585,
+ 0.016913099641626243,
+ 0.011363408680915812,
+ 0.0076197373206781166,
0.0051864199911304905,
0.003611556059854821,
- 0.00253928053666354,
- 0.0017305585661145017,
- 0.0010724055561078662,
+ 0.002539280536663541,
+ 0.0017305585661145013,
+ 0.0010724055561078668,
5.639609734298516E-4,
- 2.39568674519544E-4,
- 7.88212371379923E-5,
- 1.8675841989591893E-5,
+ 2.3956867451954396E-4,
+ 7.882123713799232E-5,
+ 1.8675841989591896E-5,
2.701116080577684E-6
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
similarity index 84%
rename from src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
index 6e30c26a5..bdab6add0 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SAN_FRANCISCO_CA.json
@@ -3,33 +3,33 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
0.5831008919911462,
0.4284199090706749,
0.3043299517318651,
- 0.20991504534178368,
+ 0.20991504534178365,
0.14211631298661964,
0.09374868521078619,
- 0.06138384495043732,
+ 0.061383844950437326,
0.039071093308164724,
0.024201671562405724,
0.014386438506911663,
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,18 +69,18 @@
0.7929925155296614
],
"ys": [
- 0.15758937503731726,
- 0.11247692685397596,
- 0.07946884297427434,
+ 0.15758937503731724,
+ 0.11247692685397598,
+ 0.07946884297427435,
0.05560574371886311,
0.03824085383493095,
0.02585465059626231,
- 0.017050534628279736,
+ 0.01705053462827973,
0.011010094459237604,
0.006875269673181763,
- 0.004031893488663088,
- 0.002153405881721278,
- 0.0010132607735766973,
+ 0.004031893488663089,
+ 0.002153405881721273,
+ 0.001013260773576697,
4.0392561747766895E-4,
1.357315165926373E-4,
3.5070265791185964E-5,
@@ -107,17 +107,17 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
0.7094470259373502,
0.5498428629048978,
- 0.4155123147834937,
+ 0.41551231478349365,
0.3063031193282665,
0.22104888785899784,
0.15688910340717468,
@@ -126,8 +126,8 @@
0.04928602923975804,
0.030791659709764246,
0.018082373041434497,
- 0.009607207734429656,
- 0.004562768246986616,
+ 0.009607207734429657,
+ 0.004562768246986615,
0.0017919912792970505,
5.570645285749892E-4,
1.2499276983585092E-4,
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.846343456814455,
+ 0.8463434568144551,
0.6798282480043856,
0.529575106126662,
0.4029924331123037,
0.2978878788706715,
0.21720849261933428,
- 0.15561695133652087,
- 0.10937917498336787,
+ 0.15561695133652084,
+ 0.10937917498336788,
0.07525155479744264,
0.05001008517906983,
0.031720239807918466,
- 0.018914948303394897,
+ 0.018914948303394893,
0.010396290099441215,
0.005116134863810127,
0.002168905715322163,
7.537255830739884E-4,
2.043519900756787E-4,
- 3.950315353965148E-5,
+ 3.950315353965147E-5,
4.114149996331726E-6,
- 1.1332666265240459E-7
+ 1.1332666265240457E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
similarity index 73%
rename from src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
rename to src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
index 8829099b7..f9d0ce422 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-5.2.0/nshm-conus-5.2.0-2018-SEATTLE_WA.json
@@ -3,41 +3,41 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
0.18974076473276455,
0.15035830377424855,
- 0.11450746102005707,
- 0.08372212205395724,
- 0.05905693494677333,
+ 0.11450746102005706,
+ 0.08372212205395722,
+ 0.059056934946773325,
0.03979043310304015,
- 0.026081869846344616,
- 0.016390117896193383,
+ 0.02608186984634462,
+ 0.01639011789619338,
0.009939769051733804,
- 0.005732292608201421,
- 0.003091115228735578,
+ 0.0057322926082014215,
+ 0.0030911152287355775,
0.0015239775147447624,
6.709168675782273E-4,
2.574847006859803E-4,
- 8.378741714286619E-5,
+ 8.37874171428662E-5,
2.251661394813441E-5,
4.500727576177568E-6,
6.144243207535918E-7,
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,22 +69,22 @@
0.7929925155296614
],
"ys": [
- 0.05798340021258257,
- 0.041904227365681966,
- 0.02936624320782965,
+ 0.05798340021258256,
+ 0.04190422736568196,
+ 0.029366243207829653,
0.01992526977609041,
- 0.013059136945119225,
- 0.008356470041248175,
+ 0.013059136945119223,
+ 0.008356470041248173,
0.005219092927360337,
- 0.0032087975808839644,
+ 0.0032087975808839635,
0.0019199405262616408,
- 0.0010855264302155057,
- 5.619278902307797E-4,
- 2.5632708456344976E-4,
- 9.795826467321657E-5,
- 3.093950684856507E-5,
+ 0.0010855264302155059,
+ 5.619278902307794E-4,
+ 2.563270845634498E-4,
+ 9.795826467321658E-5,
+ 3.0939506848565075E-5,
7.164683336505891E-6,
- 9.927613969917703E-7,
+ 9.927613969917701E-7,
3.041624502650113E-8,
2.0591305604095127E-11,
0.0,
@@ -107,32 +107,32 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.247718930784228,
+ 0.24771893078422802,
0.21523675836712636,
- 0.18161823548824618,
+ 0.18161823548824615,
0.1478057991464071,
- 0.11545178047071233,
- 0.08622984829115032,
- 0.06143083405840739,
+ 0.11545178047071235,
+ 0.08622984829115031,
+ 0.061430834058407394,
0.0414783202603966,
- 0.026613647847004047,
+ 0.026613647847004044,
0.016122062107857667,
0.009167459234650009,
- 0.004722903807205595,
+ 0.0047229038072055946,
0.002214599540841417,
8.96285507325836E-4,
3.067999345972684E-4,
8.267322513113308E-5,
1.5932119719803484E-5,
- 1.7946631532952554E-6,
+ 1.7946631532952552E-6,
1.06895828117477E-7,
6.68125464781831E-10
]
@@ -166,20 +166,20 @@
0.2111408438896052,
0.17854755392401112,
0.14527845926431035,
- 0.11415150096883397,
+ 0.11415150096883399,
0.08587864028339966,
- 0.06154846143016319,
- 0.04205905132892356,
- 0.02729969817162939,
+ 0.061548461430163195,
+ 0.04205905132892357,
+ 0.027299698171629392,
0.01678063082631571,
0.009668716589318763,
0.005145168066638075,
0.002484010178699564,
- 0.0010642217286274949,
+ 0.0010642217286274947,
3.910335843512345E-4,
- 1.18838326388187E-4,
+ 1.1883832638818702E-4,
2.8076658021732084E-5,
- 4.561137287903132E-6,
+ 4.561137287903131E-6,
4.7281340794708457E-7
]
}
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
similarity index 81%
rename from src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
index e617904ad..123eb8f48 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021-HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HILO_HI.json
@@ -3,36 +3,36 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 1.139427959929886,
- 0.9096459257402049,
+ 1.1394279599298858,
+ 0.909645925740205,
0.6810439562313703,
- 0.48213438998284375,
+ 0.48213438998284386,
0.3270662494936988,
0.2122733790095776,
0.13579352589768764,
0.08466990088453301,
- 0.0514796672410259,
- 0.0295922152331615,
+ 0.051479667241025914,
+ 0.029592215233161495,
0.015605186053687877,
0.007369438722986227,
0.003079134500128523,
@@ -40,15 +40,15 @@
3.683841726832001E-4,
1.0771529770871671E-4,
2.7590429340726252E-5,
- 6.106383784135074E-6,
- 9.141545957726994E-7,
+ 6.106383784135073E-6,
+ 9.141545957726993E-7,
4.716658318737339E-8
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,17 +69,17 @@
0.7929925155296614
],
"ys": [
- 0.24225805041057027,
+ 0.24225805041057025,
0.1626494298061276,
0.11286823232748022,
0.08019936527365806,
0.057001082377164766,
- 0.03977231046422921,
+ 0.0397723104642292,
0.026270923994779784,
0.0159300182060438,
0.008586807484419113,
0.0040091692633346795,
- 0.0016237229130359049,
+ 0.0016237229130359047,
5.831580842583807E-4,
1.935491083341371E-4,
6.446411351755592E-5,
@@ -87,8 +87,8 @@
5.89324452995356E-6,
1.3026715401568408E-6,
2.061368668443604E-7,
- 2.231361292849435E-8,
- 3.427414499140028E-10
+ 2.2313612928494348E-8,
+ 3.4274144991400273E-10
]
},
"Peak Ground Acceleration": {
@@ -107,10 +107,10 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
@@ -122,17 +122,17 @@
0.868541087272583,
0.6793538859833672,
0.4895776766820634,
- 0.32305214036758084,
+ 0.3230521403675808,
0.19728774899189122,
- 0.11230291486323442,
+ 0.11230291486323443,
0.05999879240178362,
- 0.02903842762547559,
+ 0.029038427625475594,
0.012752442114810743,
0.004825259624029285,
0.0015856433122290355,
- 4.467361996202859E-4,
+ 4.4673619962028584E-4,
1.0815891326044897E-4,
- 2.1501975995084007E-5,
+ 2.1501975995084003E-5,
3.0877820264321665E-6,
2.0121735347546392E-7
]
@@ -165,14 +165,14 @@
1.3442294606163505,
1.2504550788598903,
1.145108478540398,
- 1.0076845134906758,
+ 1.0076845134906756,
0.8393355383077514,
0.6496537972367906,
0.4625305796292689,
- 0.3035348264320895,
- 0.18409848770017573,
+ 0.30353482643208957,
+ 0.1840984877001757,
0.10404729414822564,
- 0.05492082710147257,
+ 0.054920827101472565,
0.026929508320917738,
0.012117250742785222,
0.004912231979440461,
@@ -180,7 +180,7 @@
5.433850247572385E-4,
1.4341185451814312E-4,
3.1018961899754435E-5,
- 5.1396679710212166E-6
+ 5.139667971021216E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
similarity index 88%
rename from src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
index 2e565934a..33d143aca 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021-HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-HONOLULU_HI.json
@@ -3,29 +3,29 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
0.1096176362431887,
0.07712267985209978,
- 0.05236216472551224,
+ 0.052362164725512236,
0.03410083982464372,
0.021327885700315224,
0.012597455865731777,
@@ -38,7 +38,7 @@
8.354936782969439E-5,
3.0262362405560818E-5,
9.700628718654082E-6,
- 2.73388661760168E-6,
+ 2.7338866176016795E-6,
6.418080520161567E-7,
1.2432205810419981E-7,
1.6644800833465068E-8,
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -70,11 +70,11 @@
],
"ys": [
0.023279814179665247,
- 0.015258454706800595,
+ 0.015258454706800593,
0.009636588671134795,
0.0058636185962218715,
0.0034303179683354557,
- 0.0019508911864085043,
+ 0.0019508911864085045,
0.0010720245656982627,
5.727230032611106E-4,
2.940392779991596E-4,
@@ -107,29 +107,29 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
0.16241112120908746,
0.12117474522250349,
- 0.08821017091766083,
- 0.062475455947759634,
+ 0.08821017091766084,
+ 0.06247545594775962,
0.0429411432751231,
0.028525687803782396,
0.018224455950293393,
0.011059987400758736,
0.006364262004183082,
0.0034377054571609225,
- 0.001738825379832288,
+ 0.0017388253798322879,
7.965440914871203E-4,
3.3531414903647464E-4,
1.2359465951104756E-4,
- 3.997349646564974E-5,
+ 3.997349646564973E-5,
1.1017452326436623E-5,
2.556220564845531E-6,
4.819237373193018E-7,
@@ -161,13 +161,13 @@
1.998773638612381
],
"ys": [
- 0.20884911299107897,
+ 0.20884911299107894,
0.16145810468844024,
- 0.11999074916434269,
+ 0.1199907491643427,
0.08664281640904029,
0.06035281081025548,
0.04113660286620183,
- 0.027122373299762817,
+ 0.02712237329976281,
0.017158998663766196,
0.010389832056442814,
0.005966842420004629,
diff --git a/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
similarity index 80%
rename from src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
index 3196aec25..7907a733e 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021-KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2.0.2/nshm-hawaii-2.0.2-2021-KAILUA_KONA_HI.json
@@ -3,31 +3,31 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
0.9310649618626425,
- 0.7152683525622628,
- 0.5254960437436177,
- 0.37057192881004786,
- 0.25360306935928917,
+ 0.7152683525622627,
+ 0.5254960437436178,
+ 0.37057192881004797,
+ 0.2536030693592891,
0.1673342748557868,
0.10852163641624823,
0.06764805605345484,
@@ -40,15 +40,15 @@
4.913127725890904E-4,
1.6916652515186739E-4,
4.608184816695928E-5,
- 9.142956045358948E-6,
+ 9.142956045358946E-6,
1.067682459238504E-6,
- 4.4135240737735364E-8
+ 4.413524073773537E-8
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873972,
+ -6.502290170873973,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -78,15 +78,15 @@
0.020129540279605004,
0.011639202185119844,
0.0061951399190677625,
- 0.0030758835356592923,
+ 0.0030758835356592914,
0.0014771509658122375,
7.061929082246017E-4,
- 3.3451441585971104E-4,
+ 3.34514415859711E-4,
1.5467986387544445E-4,
6.363609376236911E-5,
2.247131683032451E-5,
- 6.219516642047414E-6,
- 1.2615492254822045E-6,
+ 6.219516642047412E-6,
+ 1.2615492254822047E-6,
1.5297532779407637E-7,
7.198489307670766E-9
]
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
1.3099486083268739,
- 1.199523417668875,
- 1.0517265084684115,
+ 1.1995234176688747,
+ 1.0517265084684118,
0.8707860874217463,
0.6765138623146243,
- 0.493401638622512,
+ 0.49340163862251196,
0.33992289432676787,
0.22192803156480623,
0.13847632521718928,
- 0.08175333860325448,
- 0.04511099205028913,
+ 0.0817533386032545,
+ 0.04511099205028912,
0.022490754664834876,
- 0.010374939794256521,
- 0.004313773760782855,
- 0.0016216028906538636,
+ 0.01037493979425652,
+ 0.004313773760782856,
+ 0.0016216028906538638,
5.238693662990279E-4,
1.377271763315316E-4,
2.6761997339916372E-5,
- 3.504591338211114E-6,
- 2.3097496341714198E-7
+ 3.5045913382111136E-6,
+ 2.30974963417142E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -170,15 +170,15 @@
0.47242900392024684,
0.32217060882735266,
0.20861884543377657,
- 0.12835589658796198,
+ 0.128355896587962,
0.07482094551740774,
- 0.04095407995887267,
+ 0.040954079958872666,
0.02092944382070038,
- 0.009967533485864724,
+ 0.009967533485864722,
0.004400165256626161,
0.0017609227596797569,
6.180891817013114E-4,
- 1.8154635267886136E-4,
+ 1.815463526788613E-4,
4.1290331752591286E-5,
6.280186508295586E-6
]
--
GitLab