diff --git a/gradle.properties b/gradle.properties
index 0877baf82977acbd4e579b138627d39688983547..ed01cd021329e37765701b4bdb21055934d3e58b 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.1.15
+nshmpLibVersion = 1.1.16-rc
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 2cdd51db6dcc22a92bd15ed4a03f8f98301e78a2..56bf10cf71c7ac143974d49c553ecfa65c02826c 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -10,10 +10,10 @@ ext {
*/
task downloadNshms() {
doLast {
- // Download and unzip nshm-conus tag 5.1.2
- def zipFile = new File(nshmDir, "nshm-conus-5.1.2.zip")
+ // Download and unzip nshm-conus tag 5.2.0
+ def zipFile = new File(nshmDir, "nshm-conus-5.2.0.zip")
download.run {
- src "${archiveUrl}/5.1.2/nshm-conus-5.1.2.zip"
+ src "${archiveUrl}/5.2.0/nshm-conus-5.2.0.zip"
dest zipFile
}
copy {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 431a339ff4b0ba4ef0fcc0f7fac5f51f8ddfd252..6ae5685ebdab7e1a7d477fab3068da324d310324 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -21,4 +21,4 @@ nshmp-haz:
# To specify the model to use:
# java -jar build/libs/nshmp-haz.jar --model=<path/to/model>
#
- model-path: ${model:nshms/nshm-conus-5.1.2}
+ model-path: ${model:nshms/nshm-conus-5.2.0}
diff --git a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
index 36fe54bf81b3a350fef4261c9491036c01f0ee0b..cd25c781fbd2acfd900512de86d4343324becdd0 100644
--- a/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-BOSTON_MA.json
@@ -23,22 +23,22 @@
1.7119945007591924
],
"ys": [
- 0.020784550979940135,
+ 0.02078455097994014,
0.013752036153143975,
- 0.008853912425965714,
- 0.00550450273759354,
+ 0.008853912425965713,
+ 0.005504502737593541,
0.0032956032209899913,
- 0.0018514963923265224,
- 9.931435977960565E-4,
- 4.956595518220796E-4,
+ 0.001851496392326522,
+ 9.93143597796057E-4,
+ 4.956595518220795E-4,
2.3401548992797768E-4,
1.0471944598011259E-4,
- 4.508421273772285E-5,
- 1.8896301560235418E-5,
+ 4.5084212737722855E-5,
+ 1.8896301560235415E-5,
7.725874681605789E-6,
3.039143578552158E-6,
- 1.1170515811344102E-6,
- 3.7451324017266463E-7,
+ 1.1170515811344104E-6,
+ 3.745132401726646E-7,
1.0752962397804165E-7,
2.596070736658151E-8,
4.917918081492094E-9,
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.0038496686700113573,
- 0.002507866418331776,
+ 0.003849668670011357,
+ 0.0025078664183317764,
0.0015597948853785955,
- 9.157017059864716E-4,
+ 9.157017059864715E-4,
5.001931310456336E-4,
- 2.5472499185031885E-4,
+ 2.547249918503188E-4,
1.194486623970574E-4,
- 5.232735935686701E-5,
- 2.1561183371151277E-5,
- 8.400347720866902E-6,
- 3.14699581817278E-6,
+ 5.2327359356867026E-5,
+ 2.1561183371151274E-5,
+ 8.4003477208669E-6,
+ 3.1469958181727803E-6,
1.1420236854051995E-6,
3.9303700685767165E-7,
1.2947742656347805E-7,
3.718668812692663E-8,
9.324871744942211E-9,
- 1.877882948712356E-9,
- 2.8466329320775244E-10,
+ 1.8778829487123563E-9,
+ 2.846632932077524E-10,
2.6974731510803602E-11,
1.0385526508492285E-12
]
@@ -116,25 +116,25 @@
],
"ys": [
0.039154336261104566,
- 0.028874987776381138,
+ 0.028874987776381145,
0.020883581441243287,
0.014675088491569479,
0.009966398305490464,
- 0.006525399875535824,
+ 0.006525399875535823,
0.004122194389111176,
- 0.002503901284660192,
- 0.0014759816292745384,
- 8.455590549998981E-4,
- 4.744378692952327E-4,
- 2.5614908673281044E-4,
+ 0.0025039012846601923,
+ 0.0014759816292745382,
+ 8.455590549998983E-4,
+ 4.744378692952328E-4,
+ 2.5614908673281055E-4,
1.357929724979682E-4,
6.854218948534535E-5,
- 3.2918036847988655E-5,
- 1.456958719349436E-5,
- 5.782794746110383E-6,
- 1.973718325030945E-6,
- 5.657594675445635E-7,
- 1.246294028542241E-7
+ 3.291803684798866E-5,
+ 1.4569587193494361E-5,
+ 5.782794746110382E-6,
+ 1.9737183250309452E-6,
+ 5.657594675445636E-7,
+ 1.2462940285422407E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -163,24 +163,24 @@
"ys": [
0.06054799387340501,
0.045010937165688894,
- 0.03238422553470724,
- 0.022605947101161115,
- 0.015060131175111442,
- 0.009690757366506483,
- 0.005957079199326997,
+ 0.032384225534707246,
+ 0.022605947101161122,
+ 0.015060131175111444,
+ 0.009690757366506481,
+ 0.005957079199326996,
0.003490107511158219,
- 0.0019627024343097264,
+ 0.001962702434309726,
0.0010598138716072614,
5.526846406248315E-4,
- 2.787643997578851E-4,
+ 2.7876439975788514E-4,
1.3582948573407556E-4,
6.359388081275608E-5,
2.8287825293638217E-5,
- 1.170707349148745E-5,
- 4.419923256430147E-6,
- 1.4745471754128643E-6,
- 4.142453599294729E-7,
- 9.342364439170646E-8
+ 1.1707073491487452E-5,
+ 4.419923256430148E-6,
+ 1.4745471754128646E-6,
+ 4.1424535992947296E-7,
+ 9.342364439170645E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
index b73992f140f304b5be313059b0cd8dd60fe64f29..68072a3b07c47964b1c8d8be6ac1212986120a0c 100644
--- a/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018-CHICAGO_IL.json
@@ -23,25 +23,25 @@
1.7119945007591924
],
"ys": [
- 0.017675500237871126,
- 0.011804993270225167,
+ 0.01767550023787113,
+ 0.011804993270225165,
0.007916670756587606,
- 0.00534914724804457,
+ 0.0053491472480445695,
0.003631390427708423,
0.002384405538478485,
0.0014870231028831253,
- 8.355484214788524E-4,
- 4.1460657776932694E-4,
- 1.7579111278565786E-4,
- 6.240935342700551E-5,
- 1.824083214413612E-5,
+ 8.355484214788523E-4,
+ 4.1460657776932683E-4,
+ 1.757911127856578E-4,
+ 6.240935342700552E-5,
+ 1.8240832144136128E-5,
4.414927964063778E-6,
9.994457044956116E-7,
2.4855133647506633E-7,
- 7.726459746150788E-8,
- 2.1210423184880143E-8,
+ 7.726459746150786E-8,
+ 2.121042318488014E-8,
4.860565864414978E-9,
- 8.641052442615079E-10,
+ 8.64105244261508E-10,
1.0633132855584107E-10
]
},
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.004904504983066265,
- 0.003755611824541404,
- 0.002900685498117759,
- 0.0021972569063650736,
- 0.0015714972511203789,
- 0.001031785345548251,
- 5.988137176440331E-4,
- 2.999898092710795E-4,
+ 0.004904504983066266,
+ 0.0037556118245414046,
+ 0.0029006854981177593,
+ 0.002197256906365074,
+ 0.0015714972511203787,
+ 0.0010317853455482512,
+ 5.988137176440332E-4,
+ 2.999898092710794E-4,
1.2636087757687215E-4,
- 4.334153727062956E-5,
- 1.1727951025836873E-5,
- 2.3832470064242063E-6,
- 3.520926494203766E-7,
- 3.785179659277222E-8,
+ 4.334153727062957E-5,
+ 1.1727951025836871E-5,
+ 2.383247006424206E-6,
+ 3.5209264942037673E-7,
+ 3.7851796592772213E-8,
5.963076928168122E-9,
1.4910332126633127E-9,
- 3.1417887372376505E-10,
- 5.251118966478055E-11,
+ 3.141788737237651E-10,
+ 5.2511189664780556E-11,
5.968234937924545E-12,
3.1469632224157163E-13
]
@@ -116,9 +116,9 @@
],
"ys": [
0.022709150996398572,
- 0.015516400129389084,
- 0.010635650588663541,
- 0.007250987342509732,
+ 0.015516400129389082,
+ 0.01063565058866354,
+ 0.007250987342509733,
0.00484747526482874,
0.0031114243186504235,
0.0018782779132334622,
@@ -127,14 +127,14 @@
2.81605357092695E-4,
1.4369489671881903E-4,
7.346403339083293E-5,
- 3.832529799905896E-5,
- 1.9431569974270375E-5,
- 9.421592539610682E-6,
+ 3.8325297999058965E-5,
+ 1.9431569974270378E-5,
+ 9.42159253961068E-6,
4.1976884388553816E-6,
1.6696279770654772E-6,
5.688244700978395E-7,
1.6230550529800464E-7,
- 3.5499549032952975E-8
+ 3.549954903295298E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,25 +162,25 @@
],
"ys": [
0.04184772415672415,
- 0.028519812182555622,
- 0.019028622636528186,
+ 0.02851981218255562,
+ 0.01902862263652819,
0.012597694078764635,
0.008183488070776039,
- 0.005256326568188245,
- 0.0032378832457639973,
- 0.001863531680168195,
- 9.907119514822528E-4,
- 4.830130551236984E-4,
- 2.193587945069326E-4,
- 9.55147015134758E-5,
+ 0.005256326568188244,
+ 0.0032378832457639964,
+ 0.0018635316801681953,
+ 9.90711951482253E-4,
+ 4.830130551236983E-4,
+ 2.1935879450693264E-4,
+ 9.551470151347582E-5,
4.1247826827249706E-5,
- 1.792400797463977E-5,
- 7.69163382946073E-6,
- 3.1292561141859645E-6,
- 1.1644839692951635E-6,
+ 1.7924007974639768E-5,
+ 7.691633829460732E-6,
+ 3.129256114185964E-6,
+ 1.1644839692951632E-6,
3.8155425174464243E-7,
- 1.0444941528551558E-7,
- 2.2656380775801956E-8
+ 1.0444941528551557E-7,
+ 2.265638077580196E-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-2018-LOS_ANGELES_CA.json
index edcf930790a366d3a4de42d504c2842e86911016..c22520b8f6aab09eaba96e4d4d8e32ef33a2686f 100644
--- a/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-LOS_ANGELES_CA.json
@@ -24,19 +24,19 @@
],
"ys": [
0.6366574720501088,
- 0.4718037479196399,
+ 0.47180374791963997,
0.336364557146257,
- 0.23117962261923944,
+ 0.2311796226192394,
0.15426255108470943,
0.09868641697941964,
- 0.061682269839009964,
+ 0.06168226983900997,
0.037095482704419605,
0.021775137700280892,
0.012418053525144834,
0.006834724125143083,
0.0035759571677002966,
0.0017322386889934245,
- 7.490722245704206E-4,
+ 7.490722245704205E-4,
2.781308992738419E-4,
8.55525189246937E-5,
1.9638736883809428E-5,
@@ -69,9 +69,9 @@
0.7929925155296614
],
"ys": [
- 0.1684437724485485,
+ 0.16844377244854847,
0.11829589663275786,
- 0.08101452065128259,
+ 0.08101452065128258,
0.05406282717487072,
0.035127313944556586,
0.02246250359719528,
@@ -118,8 +118,8 @@
0.7850465833348313,
0.6149388088135578,
0.46880770081149936,
- 0.34810417974850305,
- 0.252326595582187,
+ 0.348104179748503,
+ 0.25232659558218706,
0.17814867226367861,
0.12154240052962642,
0.07901532677500141,
@@ -161,19 +161,19 @@
1.998773638612381
],
"ys": [
- 0.9277678999858487,
- 0.7537480330381081,
- 0.5931923233025839,
+ 0.9277678999858486,
+ 0.753748033038108,
+ 0.5931923233025838,
0.45540482519284387,
0.3391134734752599,
- 0.2480905374176591,
+ 0.24809053741765913,
0.1766116798966622,
- 0.1212300246443606,
+ 0.12123002464436061,
0.07985280215586492,
0.050147609948821836,
0.030081503068165788,
0.01724538444217736,
- 0.009432364207667703,
+ 0.009432364207667705,
0.004883172427187242,
0.002333377346825734,
9.819488750632801E-4,
diff --git a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
index 98471e4fb87d9a011e19c92bc12532196056b0d5..2345a4a769fe0d63556ecbaeed31aa4f238a350c 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018-NEW_MADRID_MO.json
@@ -26,23 +26,23 @@
0.05460474620644813,
0.039322200263679656,
0.027742521888583595,
- 0.01925648792066326,
- 0.013309032474447955,
- 0.009158100387208455,
- 0.006469954492673559,
+ 0.019256487920663257,
+ 0.013309032474447959,
+ 0.009158100387208452,
+ 0.0064699544926735564,
0.004711825464791655,
- 0.0036144199686035917,
- 0.002923750899350579,
- 0.0024589761818590047,
- 0.002072470767532479,
- 0.0016635058660181771,
- 0.0012069209745320141,
- 7.580051949212138E-4,
+ 0.00361441996860359,
+ 0.0029237508993505794,
+ 0.002458976181859003,
+ 0.0020724707675324793,
+ 0.0016635058660181773,
+ 0.001206920974532014,
+ 7.58005194921214E-4,
4.028136886385925E-4,
- 1.747374387292788E-4,
- 6.143664863718953E-5,
+ 1.7473743872927871E-4,
+ 6.14366486371895E-5,
1.660370716466393E-5,
- 3.2819885795529336E-6
+ 3.2819885795529328E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.01118335095019382,
- 0.008208501337863192,
- 0.006125994378655951,
- 0.004704029030923135,
- 0.0037445097750955793,
- 0.003113425325927083,
+ 0.011183350950193821,
+ 0.00820850133786319,
+ 0.0061259943786559495,
+ 0.004704029030923133,
+ 0.0037445097750955785,
+ 0.0031134253259270835,
0.0026896900327019677,
- 0.002387963703022616,
+ 0.0023879637030226153,
0.002117544110718752,
- 0.001801150174848246,
- 0.001417347172951655,
+ 0.0018011501748482462,
+ 0.0014173471729516552,
0.0010068130175955078,
6.301951022408455E-4,
- 3.444781699140509E-4,
- 1.5613960834869736E-4,
+ 3.4447816991405093E-4,
+ 1.561396083486973E-4,
5.887416288449927E-5,
- 1.7483012613921882E-5,
+ 1.748301261392189E-5,
3.857677678049851E-6,
- 5.776336202494063E-7,
+ 5.776336202494065E-7,
3.6035648979050635E-8
]
},
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.111110726211362,
- 0.09432125494016416,
- 0.07822805599600459,
+ 0.11111072621136198,
+ 0.09432125494016415,
+ 0.07822805599600462,
0.06292369383675941,
- 0.04897014435727336,
- 0.03694215394316335,
- 0.027163843299139255,
- 0.019537877568746247,
+ 0.048970144357273364,
+ 0.036942153943163344,
+ 0.027163843299139248,
+ 0.019537877568746243,
0.013915832488455515,
0.009887221698272164,
- 0.007094041349666846,
- 0.0051464353161795075,
+ 0.0070940413496668455,
+ 0.005146435316179508,
0.003865608590322207,
0.0029837666408947206,
- 0.002326071147545305,
- 0.0017237133487967337,
+ 0.0023260711475453035,
+ 0.0017237133487967339,
0.0011265388791854103,
- 6.015982295191785E-4,
- 2.510477911128341E-4,
+ 6.015982295191782E-4,
+ 2.5104779111283416E-4,
7.632592705118943E-5
]
},
@@ -163,24 +163,24 @@
"ys": [
0.13557175676510386,
0.11487697773688868,
- 0.09473336922159183,
- 0.0757652391662049,
- 0.058061656399242906,
- 0.043077020760732714,
- 0.030893330875149044,
- 0.021543361926184886,
- 0.014802677054253846,
+ 0.09473336922159181,
+ 0.07576523916620488,
+ 0.058061656399242885,
+ 0.04307702076073272,
+ 0.03089333087514904,
+ 0.02154336192618488,
+ 0.014802677054253843,
0.01011911451019241,
- 0.0069882586779406765,
+ 0.006988258677940676,
0.00495471722552012,
- 0.003663126515262555,
- 0.0028324443965858995,
- 0.0022379408457528765,
+ 0.003663126515262553,
+ 0.002832444396585898,
+ 0.002237940845752877,
0.0017164930070629656,
0.0011926180558950762,
6.965535536645009E-4,
- 3.2111317564048023E-4,
- 1.1269789534198826E-4
+ 3.211131756404801E-4,
+ 1.1269789534198825E-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-2018-NEW_YORK_NY.json
index 444ad5af52d83f518194b94e109b2c124868f4bf..5ba624ee1ed64628c767732885b4b8bdf22e27aa 100644
--- a/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018-NEW_YORK_NY.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.018666421015364292,
+ 0.018666421015364296,
0.012277714382170502,
- 0.007819753747405416,
+ 0.007819753747405414,
0.0047835883866622865,
0.0028112191687725907,
- 0.001554045340731735,
- 8.285075887238437E-4,
+ 0.0015540453407317347,
+ 8.285075887238436E-4,
4.1827330817572424E-4,
2.0477961806545264E-4,
- 9.768413828648058E-5,
+ 9.76841382864806E-5,
4.582979651500823E-5,
- 2.1108151934584487E-5,
+ 2.1108151934584483E-5,
9.40307880873417E-6,
3.952177823009206E-6,
- 1.52393681070903E-6,
+ 1.5239368107090302E-6,
5.283693302216128E-7,
1.5532448868679193E-7,
- 3.8075766690041645E-8,
+ 3.807576669004164E-8,
7.285190754922316E-9,
- 9.71330593082485E-10
+ 9.713305930824852E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.0036839290291613568,
- 0.0023350507514869807,
- 0.0014025796207374252,
- 7.930112908299474E-4,
+ 0.0036839290291613555,
+ 0.002335050751486981,
+ 0.001402579620737425,
+ 7.930112908299476E-4,
4.1808903382999877E-4,
2.0733134457052304E-4,
- 9.623213274255235E-5,
+ 9.623213274255234E-5,
4.279209350393817E-5,
1.8488428033840786E-5,
7.785121676935125E-6,
3.2094244668835695E-6,
- 1.2788721198896174E-6,
- 4.76403657405383E-7,
+ 1.2788721198896172E-6,
+ 4.7640365740538307E-7,
1.651037823961913E-7,
- 4.934185476859843E-8,
- 1.273898355111994E-8,
+ 4.9341854768598423E-8,
+ 1.2738983551119943E-8,
2.6202525850572688E-9,
- 4.048583749596044E-10,
+ 4.0485837495960446E-10,
3.904486628199482E-11,
1.5324451927867105E-12
]
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.029878942979656195,
- 0.021699314985705948,
+ 0.029878942979656188,
+ 0.02169931498570595,
0.015627345176841466,
0.011107491120984697,
- 0.007776586292284122,
- 0.005349775331002556,
- 0.003606839800316038,
+ 0.007776586292284123,
+ 0.005349775331002555,
+ 0.0036068398003160375,
0.00236476621256421,
- 0.001511483656252948,
+ 0.0015114836562529481,
9.383042482967955E-4,
5.672612883032052E-4,
3.2775630190425736E-4,
- 1.8379026685332682E-4,
- 9.707147245294275E-5,
+ 1.8379026685332687E-4,
+ 9.707147245294277E-5,
4.8216709391054424E-5,
- 2.186754042561833E-5,
- 8.832673455739918E-6,
+ 2.1867540425618328E-5,
+ 8.83267345573992E-6,
3.054523154324783E-6,
- 8.847978732985682E-7,
+ 8.84797873298568E-7,
1.9672786782893157E-7
]
},
@@ -162,25 +162,25 @@
],
"ys": [
0.048301983959234095,
- 0.03504973561764059,
- 0.024744052454742885,
+ 0.0350497356176406,
+ 0.024744052454742888,
0.017095234304717735,
- 0.011415111740065452,
- 0.007482577963101016,
+ 0.01141511174006545,
+ 0.007482577963101015,
0.0047698738556462535,
- 0.002948091284747602,
- 0.0017725798590443342,
+ 0.0029480912847476026,
+ 0.0017725798590443338,
0.0010323738247512593,
5.823000408387339E-4,
3.1694058457143036E-4,
- 1.6560745740360768E-4,
- 8.238484623559819E-5,
+ 1.656074574036077E-4,
+ 8.238484623559816E-5,
3.852324830287548E-5,
- 1.6575499019099995E-5,
+ 1.657549901909999E-5,
6.439186747078616E-6,
- 2.192582065492888E-6,
+ 2.1925820654928877E-6,
6.249719391706649E-7,
- 1.4238886738032342E-7
+ 1.4238886738032344E-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-2018-RENO_NV.json
index f629ba624e302c67c3485436f7b6141aecb8b1a0..0bab9a4167f4ae414456339ecd5d6e27f182b34f 100644
--- a/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018-RENO_NV.json
@@ -23,8 +23,8 @@
1.7119945007591924
],
"ys": [
- 0.5639424382793681,
- 0.41970430872703995,
+ 0.5639424382793682,
+ 0.41970430872704,
0.2996355631700337,
0.20436506496344023,
0.13386011296908937,
@@ -33,15 +33,15 @@
0.02970332088645175,
0.016962428614047866,
0.009368748098138393,
- 0.004942501068704083,
+ 0.004942501068704084,
0.002420101079214425,
0.0010564988095787106,
3.945561117465654E-4,
1.2048922319737728E-4,
2.8266770250121335E-5,
- 4.252380705836178E-6,
+ 4.252380705836177E-6,
4.4029329263288646E-7,
- 2.5735858318493567E-8,
+ 2.573585831849357E-8,
8.240992980384035E-11
]
},
@@ -69,16 +69,16 @@
0.7929925155296614
],
"ys": [
- 0.1619520024002511,
+ 0.16195200240025112,
0.11197070315750861,
0.07461644808670248,
- 0.04806931482649303,
+ 0.04806931482649302,
0.029904421907731293,
- 0.018097205110430375,
- 0.010526649862628149,
+ 0.01809720511043038,
+ 0.010526649862628145,
0.0058497036090659794,
0.003024869157973338,
- 0.0013988990917255157,
+ 0.001398899091725516,
5.607903420664931E-4,
1.884917390363045E-4,
5.034839107343867E-5,
@@ -115,20 +115,20 @@
1.6428726885203377
],
"ys": [
- 0.6547357887817038,
+ 0.6547357887817037,
0.5154175476805015,
- 0.39564561622654804,
+ 0.3956456162265481,
0.2946377853731455,
0.21261726439098355,
0.14856083770157558,
- 0.1002311229879195,
+ 0.10023112298791949,
0.06449394268051883,
- 0.0393892832339914,
- 0.02264433896405345,
+ 0.03938928323399141,
+ 0.022644338964053448,
0.012321069753420741,
0.006191664090278571,
- 0.0028672800399024163,
- 0.0011315854751875179,
+ 0.0028672800399024167,
+ 0.001131585475187518,
3.666664317975439E-4,
9.021209601637859E-5,
1.523566711127091E-5,
@@ -164,21 +164,21 @@
0.7737520693137596,
0.626158058671475,
0.4943026693905384,
- 0.3815237316109364,
+ 0.38152373161093633,
0.2849928378328236,
- 0.20811270361164622,
- 0.14726293268062965,
- 0.10033741214019079,
- 0.06562437576887947,
+ 0.20811270361164624,
+ 0.14726293268062962,
+ 0.1003374121401908,
+ 0.06562437576887946,
0.04081755703105158,
- 0.024074385627209906,
+ 0.02407438562720991,
0.013446854247539834,
- 0.0070786138020807405,
- 0.0034343346589473444,
- 0.0014729955574711107,
+ 0.007078613802080741,
+ 0.003434334658947344,
+ 0.0014729955574711105,
5.304815215680369E-4,
- 1.532501046018872E-4,
- 3.28644051168842E-5,
+ 1.5325010460188717E-4,
+ 3.2864405116884194E-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-2018-SALT_LAKE_CITY_UT.json
index bb4d0841860eeb760318701161150602fe41ce60..b8b668efa388771d33b89ed4f18d16a53c073d05 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SALT_LAKE_CITY_UT.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.10141210582180434,
- 0.07447849798602045,
+ 0.10141210582180435,
+ 0.07447849798602046,
0.05330127231316856,
- 0.03710281879513821,
- 0.02523202816726377,
- 0.016610346496346337,
- 0.010874067593129606,
- 0.0070892247983680825,
+ 0.037102818795138215,
+ 0.025232028167263765,
+ 0.01661034649634634,
+ 0.010874067593129609,
+ 0.00708922479836808,
0.004735625457686324,
0.003249464756093951,
- 0.0022454952268110224,
- 0.001491447877255857,
- 8.988552768687258E-4,
+ 0.002245495226811022,
+ 0.0014914478772558575,
+ 8.988552768687256E-4,
4.656680939512108E-4,
1.9882970591587768E-4,
- 6.785029212800547E-5,
- 1.6876651512201572E-5,
- 2.653741741725593E-6,
- 1.7318139402766213E-7,
- 1.035570404004172E-10
+ 6.785029212800548E-5,
+ 1.6876651512201575E-5,
+ 2.6537417417255936E-6,
+ 1.731813940276621E-7,
+ 1.0355704040041718E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -70,23 +70,23 @@
],
"ys": [
0.03338701576491687,
- 0.024650966455601657,
+ 0.02465096645560166,
0.01764423071929716,
- 0.01226968084616165,
+ 0.012269680846161648,
0.008337057201618096,
- 0.005635024432572453,
+ 0.005635024432572457,
0.0037891327023550233,
- 0.002514912378495384,
- 0.0015863429059217106,
+ 0.0025149123784953846,
+ 0.0015863429059217115,
9.014315449747968E-4,
- 4.414029650416535E-4,
- 1.792111716976621E-4,
- 5.7541181003569944E-5,
- 1.4224526877692225E-5,
- 2.2078569144162738E-6,
- 1.888075384391226E-7,
+ 4.414029650416536E-4,
+ 1.7921117169766217E-4,
+ 5.754118100356993E-5,
+ 1.4224526877692228E-5,
+ 2.207856914416273E-6,
+ 1.8880753843912258E-7,
2.916565870061635E-9,
- 1.353319468129786E-11,
+ 1.3533194681297857E-11,
1.4761223207476851E-12,
7.365315902026219E-14
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.13047100258720737,
- 0.09849712329595017,
+ 0.13047100258720734,
+ 0.09849712329595019,
0.07246017969843056,
0.05191828655903307,
- 0.03636526505318483,
+ 0.03636526505318484,
0.024993217741374765,
0.01690096807101634,
- 0.011231650127527281,
+ 0.011231650127527283,
0.007452801108191979,
- 0.005017181957434343,
- 0.0034705679298442805,
- 0.0024023685398152335,
- 0.0016078002266633952,
- 9.514053815001427E-4,
- 4.656644721669266E-4,
+ 0.005017181957434341,
+ 0.003470567929844281,
+ 0.0024023685398152327,
+ 0.0016078002266633948,
+ 9.514053815001429E-4,
+ 4.656644721669267E-4,
1.7536330043880214E-4,
4.811667218966291E-5,
- 8.632653500921544E-6,
- 8.008388400062675E-7,
- 2.2680106464068324E-8
+ 8.632653500921545E-6,
+ 8.008388400062674E-7,
+ 2.268010646406833E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -167,15 +167,15 @@
0.0720099099078939,
0.05129669394322607,
0.03606585232915037,
- 0.024916005816203582,
+ 0.02491600581620359,
0.01691309964162624,
- 0.011363408680915812,
- 0.0076197373206781166,
- 0.00518641999113049,
+ 0.011363408680915814,
+ 0.007619737320678116,
+ 0.0051864199911304905,
0.003611556059854821,
0.00253928053666354,
0.0017305585661145017,
- 0.0010724055561078664,
+ 0.0010724055561078662,
5.639609734298516E-4,
2.39568674519544E-4,
7.88212371379923E-5,
diff --git a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
index 2a1414295b982788fac99e599aa36c4721e02513..6e30c26a5c8734de58b750dc80b374cc0a842af2 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SAN_FRANCISCO_CA.json
@@ -24,12 +24,12 @@
],
"ys": [
0.5831008919911462,
- 0.42841990907067484,
- 0.30432995173186517,
- 0.20991504534178365,
+ 0.4284199090706749,
+ 0.3043299517318651,
+ 0.20991504534178368,
0.14211631298661964,
0.09374868521078619,
- 0.06138384495043733,
+ 0.06138384495043732,
0.039071093308164724,
0.024201671562405724,
0.014386438506911663,
@@ -69,20 +69,20 @@
0.7929925155296614
],
"ys": [
- 0.15758937503731724,
- 0.11247692685397598,
- 0.07946884297427433,
+ 0.15758937503731726,
+ 0.11247692685397596,
+ 0.07946884297427434,
0.05560574371886311,
- 0.03824085383493094,
+ 0.03824085383493095,
0.02585465059626231,
0.017050534628279736,
0.011010094459237604,
- 0.006875269673181764,
- 0.004031893488663087,
+ 0.006875269673181763,
+ 0.004031893488663088,
0.002153405881721278,
0.0010132607735766973,
- 4.039256174776689E-4,
- 1.3573151659263734E-4,
+ 4.0392561747766895E-4,
+ 1.357315165926373E-4,
3.5070265791185964E-5,
6.763084787261478E-6,
8.40775820950977E-7,
@@ -117,7 +117,7 @@
"ys": [
0.7094470259373502,
0.5498428629048978,
- 0.41551231478349365,
+ 0.4155123147834937,
0.3063031193282665,
0.22104888785899784,
0.15688910340717468,
@@ -126,7 +126,7 @@
0.04928602923975804,
0.030791659709764246,
0.018082373041434497,
- 0.009607207734429657,
+ 0.009607207734429656,
0.004562768246986616,
0.0017919912792970505,
5.570645285749892E-4,
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.8463434568144551,
+ 0.846343456814455,
0.6798282480043856,
0.529575106126662,
0.4029924331123037,
0.2978878788706715,
0.21720849261933428,
- 0.15561695133652084,
- 0.10937917498336788,
+ 0.15561695133652087,
+ 0.10937917498336787,
0.07525155479744264,
- 0.050010085179069824,
+ 0.05001008517906983,
0.031720239807918466,
- 0.018914948303394893,
- 0.010396290099441213,
- 0.005116134863810128,
+ 0.018914948303394897,
+ 0.010396290099441215,
+ 0.005116134863810127,
0.002168905715322163,
7.537255830739884E-4,
2.043519900756787E-4,
- 3.950315353965147E-5,
+ 3.950315353965148E-5,
4.114149996331726E-6,
- 1.1332666265240457E-7
+ 1.1332666265240459E-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-2018-SEATTLE_WA.json
index 93b1b3cab23bd24ac2a30ca79536fa0fb115c3d0..8829099b790ff08a132d70589f2e0f688c11034b 100644
--- a/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018-SEATTLE_WA.json
@@ -23,24 +23,24 @@
1.7119945007591924
],
"ys": [
- 0.18974076470885137,
- 0.15035830376044862,
- 0.11450746101346057,
- 0.08372212205176174,
- 0.059056934947110895,
- 0.03979043310491079,
- 0.026081869849010786,
- 0.016390117898980407,
- 0.009939769054053986,
- 0.005732292609750042,
- 0.0030911152295593288,
- 0.0015239775150885813,
- 6.709168676869215E-4,
- 2.57484700708942E-4,
- 8.378741714505467E-5,
- 2.2516613948061863E-5,
- 4.500727576177569E-6,
- 6.144243207535919E-7,
+ 0.18974076473276455,
+ 0.15035830377424855,
+ 0.11450746102005707,
+ 0.08372212205395724,
+ 0.05905693494677333,
+ 0.03979043310304015,
+ 0.026081869846344616,
+ 0.016390117896193383,
+ 0.009939769051733804,
+ 0.005732292608201421,
+ 0.003091115228735578,
+ 0.0015239775147447624,
+ 6.709168675782273E-4,
+ 2.574847006859803E-4,
+ 8.378741714286619E-5,
+ 2.251661394813441E-5,
+ 4.500727576177568E-6,
+ 6.144243207535918E-7,
4.524870395276403E-8,
4.3303919732436456E-10
]
@@ -69,22 +69,22 @@
0.7929925155296614
],
"ys": [
- 0.057983400206970126,
- 0.04190422736247452,
- 0.029366243206519947,
- 0.019925269776090763,
- 0.013059136945793099,
- 0.008356470042035317,
- 0.005219092927938535,
- 0.003208797581193821,
- 0.0019199405263871355,
- 0.0010855264302525767,
- 5.619278902374833E-4,
- 2.56327084563797E-4,
+ 0.05798340021258257,
+ 0.041904227365681966,
+ 0.02936624320782965,
+ 0.01992526977609041,
+ 0.013059136945119225,
+ 0.008356470041248175,
+ 0.005219092927360337,
+ 0.0032087975808839644,
+ 0.0019199405262616408,
+ 0.0010855264302155057,
+ 5.619278902307797E-4,
+ 2.5632708456344976E-4,
9.795826467321657E-5,
3.093950684856507E-5,
7.164683336505891E-6,
- 9.927613969917701E-7,
+ 9.927613969917703E-7,
3.041624502650113E-8,
2.0591305604095127E-11,
0.0,
@@ -115,24 +115,24 @@
1.6428726885203377
],
"ys": [
- 0.24771893073100731,
- 0.2152367583197853,
- 0.18161823545206088,
- 0.14780579912486952,
- 0.11545178046324323,
- 0.08622984829356381,
- 0.061430834065581905,
- 0.04147832026856402,
- 0.026613647854233174,
- 0.016122062113439015,
- 0.009167459238465148,
- 0.004722903809421655,
- 0.002214599541925819,
- 8.96285507746999E-4,
- 3.0679993472347236E-4,
- 8.267322515716906E-5,
- 1.5932119722315774E-5,
- 1.7946631531444621E-6,
+ 0.247718930784228,
+ 0.21523675836712636,
+ 0.18161823548824618,
+ 0.1478057991464071,
+ 0.11545178047071233,
+ 0.08622984829115032,
+ 0.06143083405840739,
+ 0.0414783202603966,
+ 0.026613647847004047,
+ 0.016122062107857667,
+ 0.009167459234650009,
+ 0.004722903807205595,
+ 0.002214599540841417,
+ 8.96285507325836E-4,
+ 3.067999345972684E-4,
+ 8.267322513113308E-5,
+ 1.5932119719803484E-5,
+ 1.7946631532952554E-6,
1.06895828117477E-7,
6.68125464781831E-10
]
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.2721574775049231,
- 0.2428174777036493,
- 0.2111408438434728,
- 0.17854755388890456,
- 0.14527845924323876,
- 0.11415150096067696,
- 0.08587864028445243,
- 0.061548461435985566,
- 0.04205905133610497,
- 0.02729969817831103,
- 0.0167806308316971,
- 0.009668716593145837,
- 0.005145168068999917,
- 0.0024840101799313958,
- 0.0010642217291543985,
- 3.910335845273332E-4,
- 1.1883832643066001E-4,
- 2.807665802756398E-5,
- 4.5611372877161576E-6,
+ 0.27215747755947084,
+ 0.24281747775616977,
+ 0.2111408438896052,
+ 0.17854755392401112,
+ 0.14527845926431035,
+ 0.11415150096883397,
+ 0.08587864028339966,
+ 0.06154846143016319,
+ 0.04205905132892356,
+ 0.02729969817162939,
+ 0.01678063082631571,
+ 0.009668716589318763,
+ 0.005145168066638075,
+ 0.002484010178699564,
+ 0.0010642217286274949,
+ 3.910335843512345E-4,
+ 1.18838326388187E-4,
+ 2.8076658021732084E-5,
+ 4.561137287903132E-6,
4.7281340794708457E-7
]
}