From 0c44e419c201f7ce72db12cffdfa019f96ac5056 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Sun, 5 Mar 2023 13:34:24 -0700
Subject: [PATCH 1/7] increment ak nshm
---
nshms.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nshms.yml b/nshms.yml
index 09e19f18..7edcd102 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -5,7 +5,7 @@ nshms:
# Alaska 2023 NSHM
-
repo: nshm-alaska
- tag: 3.a.2
+ tag: 3.a.3
year: 2023
deployments:
development:
--
GitLab
From 4471406e33e94b00af29328dc32ca43862e5b146 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Sun, 5 Mar 2023 13:34:48 -0700
Subject: [PATCH 2/7] nshm sites updates
---
etc/nshm/map-ceus.geojson | 2 +-
etc/nshm/map-conus.geojson | 2 +-
etc/nshm/map-wus.geojson | 2 +-
etc/nshm/sites-alaska.csv | 1 +
etc/nshm/sites-alaska.geojson | 11 +++++++++++
etc/nshm/sites-nshmp.csv | 1 +
etc/nshm/sites-nshmp.geojson | 11 +++++++++++
.../gov/usgs/earthquake/nshmp/site/NshmpSite.java | 1 +
8 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/etc/nshm/map-ceus.geojson b/etc/nshm/map-ceus.geojson
index 7f557a55..063660b4 100644
--- a/etc/nshm/map-ceus.geojson
+++ b/etc/nshm/map-ceus.geojson
@@ -108,7 +108,7 @@
]
},
"properties": {
- "spacing": 0.1,
+ "spacing": 0.05,
"title": "NSHMP Central & Eastern US"
}
}
diff --git a/etc/nshm/map-conus.geojson b/etc/nshm/map-conus.geojson
index c8cd6668..9bc79c33 100644
--- a/etc/nshm/map-conus.geojson
+++ b/etc/nshm/map-conus.geojson
@@ -108,7 +108,7 @@
]
},
"properties": {
- "spacing": 0.1,
+ "spacing": 0.05,
"title": "NSHMP Conterminous US"
}
}
diff --git a/etc/nshm/map-wus.geojson b/etc/nshm/map-wus.geojson
index a5d4598b..a457955b 100644
--- a/etc/nshm/map-wus.geojson
+++ b/etc/nshm/map-wus.geojson
@@ -108,7 +108,7 @@
]
},
"properties": {
- "spacing": 0.1,
+ "spacing": 0.05,
"title": "NSHMP Western US"
}
}
diff --git a/etc/nshm/sites-alaska.csv b/etc/nshm/sites-alaska.csv
index 06799e81..27672797 100644
--- a/etc/nshm/sites-alaska.csv
+++ b/etc/nshm/sites-alaska.csv
@@ -27,6 +27,7 @@ McGrath AK, -155.60, 63.00
Nome AK, -165.40, 64.50
Paxson AK, -145.50, 63.10
Prudhoe Bay AK, -148.40, 70.30
+Seward AK, -149.40, 60.10
Sitka AK, -135.40, 57.10
Sleetmute AK, -157.20, 61.70
Tok AK, -143.00, 63.30
diff --git a/etc/nshm/sites-alaska.geojson b/etc/nshm/sites-alaska.geojson
index 821aa051..464fa212 100644
--- a/etc/nshm/sites-alaska.geojson
+++ b/etc/nshm/sites-alaska.geojson
@@ -309,6 +309,17 @@
"title": "Prudhoe Bay AK"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-149.4, 60.1]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Seward AK"
+ }
+ },
{
"type": "Feature",
"geometry": {
diff --git a/etc/nshm/sites-nshmp.csv b/etc/nshm/sites-nshmp.csv
index 78fba33e..fea16448 100644
--- a/etc/nshm/sites-nshmp.csv
+++ b/etc/nshm/sites-nshmp.csv
@@ -27,6 +27,7 @@ McGrath AK, -155.60, 63.00
Nome AK, -165.40, 64.50
Paxson AK, -145.50, 63.10
Prudhoe Bay AK, -148.40, 70.30
+Seward AK, -149.40, 60.10
Sitka AK, -135.40, 57.10
Sleetmute AK, -157.20, 61.70
Tok AK, -143.00, 63.30
diff --git a/etc/nshm/sites-nshmp.geojson b/etc/nshm/sites-nshmp.geojson
index 6dee58a9..5cb42081 100644
--- a/etc/nshm/sites-nshmp.geojson
+++ b/etc/nshm/sites-nshmp.geojson
@@ -309,6 +309,17 @@
"title": "Prudhoe Bay AK"
}
},
+ {
+ "type": "Feature",
+ "geometry": {
+ "type": "Point",
+ "coordinates": [-149.4, 60.1]
+ },
+ "properties": {
+ "marker-size": "small",
+ "title": "Seward AK"
+ }
+ },
{
"type": "Feature",
"geometry": {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
index 21ef1cd4..a12fd881 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSite.java
@@ -226,6 +226,7 @@ public enum NshmpSite implements NamedLocation {
NOME_AK(-165.4, 64.5),
PAXSON_AK(-145.5, 63.1),
PRUDHOE_BAY_AK(-148.4, 70.3),
+ SEWARD_AK(-149.4, 60.1),
SITKA_AK(-135.4, 57.1),
SLEETMUTE_AK(-157.2, 61.7),
TOK_AK(-143.0, 63.3),
--
GitLab
From da8c511af82408b2a0cf623983cdb7975547acf4 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Sun, 5 Mar 2023 13:45:23 -0700
Subject: [PATCH 3/7] updated tests for new ak model
---
.../nshm-alaska-2023-2023-ANCHORAGE_AK.json | 156 +++++++++---------
.../nshm-alaska-2023-2023-FAIRBANKS_AK.json | 156 +++++++++---------
.../nshm-alaska-2023-2023-JUNEAU_AK.json | 156 +++++++++---------
.../nshm-alaska-2023-2023-KODIAK_AK.json | 156 +++++++++---------
.../nshm-alaska-2023-2023-VALDEZ_AK.json | 156 +++++++++---------
5 files changed, 390 insertions(+), 390 deletions(-)
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
index e06a0af2..7d8af678 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.1492381474251436,
- 0.860431497977819,
- 0.6226411872986266,
- 0.4339399774075828,
- 0.29236974934848337,
- 0.1880960140165419,
- 0.1177370680030112,
- 0.07032843449164865,
- 0.04030393289363885,
- 0.021868423386721476,
- 0.011139900997978925,
- 0.00528697252330429,
- 0.0023274603439309557,
- 9.486057313219511E-4,
- 3.568087040994083E-4,
- 1.229532164673634E-4,
- 3.64712268834144E-5,
- 9.023826105548502E-6,
- 1.6165851397667318E-6,
- 3.900555624274174E-8
+ 1.2996202478882313,
+ 0.9725018888121729,
+ 0.7061101382493036,
+ 0.49761000093345825,
+ 0.3430693194982159,
+ 0.22964504647669196,
+ 0.15209434676476463,
+ 0.0979533300995709,
+ 0.06159907875341369,
+ 0.03741634584652395,
+ 0.021799886815018765,
+ 0.012031635219146736,
+ 0.006159376162184262,
+ 0.002842018163941182,
+ 0.001143697125450014,
+ 3.8824774213089914E-4,
+ 1.0057889682714155E-4,
+ 1.835929703535304E-5,
+ 1.2328840697872436E-6,
+ 7.102888837863421E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.28618425487894666,
- 0.1989852749443714,
- 0.13303776197561623,
- 0.08501088515663598,
- 0.05139715593458863,
- 0.02945807121782052,
- 0.015824475296409617,
- 0.008052038587601663,
- 0.003915633895358978,
- 0.0018497174852252897,
- 8.77577407911863E-4,
- 4.1943499018529644E-4,
- 1.916386842628611E-4,
- 7.993237956471305E-5,
- 2.7127497176100676E-5,
- 7.1948280777929645E-6,
- 1.0955173066305445E-6,
- 1.1557908106466981E-8,
+ 0.38353597317838123,
+ 0.28234370766812356,
+ 0.2032378040033671,
+ 0.14263024239742927,
+ 0.097000925083273,
+ 0.06404432376232276,
+ 0.040562430178367206,
+ 0.024638265062692268,
+ 0.014265855625999123,
+ 0.007780737015339785,
+ 0.003946435939172839,
+ 0.0018069296760526254,
+ 7.144450385010248E-4,
+ 2.4100198759115837E-4,
+ 6.181583793464954E-5,
+ 1.0027244353732678E-5,
+ 5.30121229465608E-7,
+ 5.21284369100748E-12,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.5403776949754917,
- 1.213104639010862,
- 0.9300985834054234,
- 0.6902675744511094,
- 0.4944016823019988,
- 0.34096793626700844,
- 0.22595434003526135,
- 0.14275102534316525,
- 0.08625225797974491,
- 0.04965375703715634,
- 0.02727671378723898,
- 0.013908096071285217,
- 0.006665118621212825,
- 0.002875307747158469,
- 0.0011126940002184396,
- 3.7281965176629283E-4,
- 1.0529017164326357E-4,
- 2.366603837494213E-5,
- 3.91157373766831E-6,
- 4.22855872731712E-7
+ 1.6804413809365217,
+ 1.3155959318893202,
+ 1.0026950316567134,
+ 0.7407964632215732,
+ 0.5301782251550355,
+ 0.36783729293983153,
+ 0.2477033990317714,
+ 0.1612108293933553,
+ 0.10206627991471746,
+ 0.06291889441748978,
+ 0.037925319593087176,
+ 0.021746082598312868,
+ 0.011802078729512172,
+ 0.005729369773746734,
+ 0.002438423521064161,
+ 8.679622710898815E-4,
+ 2.4610177417029653E-4,
+ 4.8720524932222074E-5,
+ 5.749113286016429E-6,
+ 3.0206864383505644E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.9384227618601426,
- 1.5806727047652482,
- 1.2526254412769762,
- 0.9677328209586519,
- 0.7212941360527043,
- 0.5235256882496431,
- 0.3666865565204522,
- 0.24666742384098428,
- 0.15955909555148245,
- 0.09888545309113692,
- 0.05876033502777916,
- 0.03338078077200467,
- 0.018015725426199898,
- 0.00914244052328411,
- 0.004303080264259478,
- 0.001845294997797307,
- 7.154758119910541E-4,
- 2.478670895465427E-4,
- 7.459249153245084E-5,
- 1.9180378646377954E-5
+ 2.10976447751178,
+ 1.7128588359837533,
+ 1.350233035344546,
+ 1.0376800045033359,
+ 0.7702894343466304,
+ 0.558601281493485,
+ 0.3930643575558777,
+ 0.2678581174330397,
+ 0.1774664195036468,
+ 0.11419991130989657,
+ 0.0716061441504777,
+ 0.04370973285041736,
+ 0.025795082643067353,
+ 0.01449422780426808,
+ 0.0075933315773464545,
+ 0.003615795545145659,
+ 0.001537867952047417,
+ 5.685651545999083E-4,
+ 1.75986014282186E-4,
+ 4.351293081937339E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
index b26aa6be..bcc5af0a 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.48377964515157906,
- 0.36045326075340334,
- 0.25823011538728635,
- 0.17611958820362977,
- 0.11391274088509135,
- 0.06845154232598628,
- 0.03901155563262176,
- 0.02072554110061665,
- 0.010436079834220765,
- 0.004950497924778306,
- 0.0021941664065421402,
- 8.907942933651294E-4,
- 3.218198904518687E-4,
- 9.925963452023162E-5,
- 2.453205786725899E-5,
- 4.576669924808237E-6,
- 5.546233410528799E-7,
- 3.091753696787031E-8,
- 4.925818123098905E-10,
- 0.0
+ 0.6434776887491847,
+ 0.48461354491511255,
+ 0.3510881647725481,
+ 0.2427129484163405,
+ 0.1598354577322471,
+ 0.09842243680641934,
+ 0.0576611562545184,
+ 0.031404227451299824,
+ 0.01601969521656962,
+ 0.007569030525448274,
+ 0.0032955905581386357,
+ 0.0013105766385416492,
+ 4.6887281017631916E-4,
+ 1.4845247660234E-4,
+ 4.001914388212344E-5,
+ 8.709015226738513E-6,
+ 1.3432898196633193E-6,
+ 1.2403342954558017E-7,
+ 4.8832912315695995E-9,
+ 5.67781840686854E-12
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.15707279265102672,
- 0.10804505384824427,
- 0.07023171322762901,
- 0.04294024724848731,
- 0.02451464768228447,
- 0.01317298465052058,
- 0.006632647785067121,
- 0.003179709229838032,
- 0.0014413944088665206,
- 5.968993067875066E-4,
- 2.1772656438376746E-4,
- 6.633584397734821E-5,
- 1.540296332752602E-5,
- 2.3190918908410385E-6,
- 1.0753005468286456E-7,
- 6.9633529884388424E-9,
- 1.3067997430972305E-10,
- 0.0,
+ 0.24367737700250408,
+ 0.1751231665442064,
+ 0.12002800044690717,
+ 0.07788985777006069,
+ 0.04729165862637699,
+ 0.026813645457474646,
+ 0.013938279148004131,
+ 0.006630099710225536,
+ 0.0028417816801029642,
+ 0.0010713422331935544,
+ 3.513969445680387E-4,
+ 9.587671527287437E-5,
+ 2.1653676685502927E-5,
+ 3.914519688513897E-6,
+ 4.83669959380207E-7,
+ 4.717359749984972E-8,
+ 1.7916876650015264E-9,
+ 1.8537181269284467E-11,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.5999549095986747,
- 0.46099204851528613,
- 0.34349963291443636,
- 0.2464222021339232,
- 0.16947815959268175,
- 0.1114889130897114,
- 0.0701356981039457,
- 0.04189713096174978,
- 0.023798083297879465,
- 0.012704761509444204,
- 0.006341807055318555,
- 0.00285891024088726,
- 0.001177620790023971,
- 4.157004220914989E-4,
- 1.224787596099698E-4,
- 2.7545744111623133E-5,
- 4.094775703360882E-6,
- 2.7264885018181473E-7,
- 4.369414378472442E-9,
- 0.0
+ 0.7606071536482794,
+ 0.588242101160107,
+ 0.4414803789596026,
+ 0.3194040429949857,
+ 0.22186932097400058,
+ 0.14753402178639052,
+ 0.093722494129855,
+ 0.056343232500072074,
+ 0.03206581545163287,
+ 0.017118655576517997,
+ 0.008562335744442894,
+ 0.003890145739542235,
+ 0.0016248807209186939,
+ 5.84679007628631E-4,
+ 1.7651463761009508E-4,
+ 4.10802952499715E-5,
+ 6.521460194753413E-6,
+ 5.240989830824311E-7,
+ 1.4207194491405504E-8,
+ 3.351506238572734E-13
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.7424583278574219,
- 0.5900408979545374,
- 0.45361048882669774,
- 0.33842434057343745,
- 0.24196364090426783,
- 0.16753040780602735,
- 0.11130439531031236,
- 0.07072141553658651,
- 0.0430594042631741,
- 0.024922699106719043,
- 0.01362010194706936,
- 0.006954648056894348,
- 0.0032832813296962593,
- 0.0014117121189455332,
- 5.389553183746012E-4,
- 1.7529458272750397E-4,
- 4.635769384654834E-5,
- 9.078498576275985E-6,
- 1.0195733078425598E-6,
- 3.871252217142176E-8
+ 0.93023507184292,
+ 0.743502745399627,
+ 0.5754359781691307,
+ 0.43272110188995516,
+ 0.3124073119594771,
+ 0.2187027084602443,
+ 0.14695993123026216,
+ 0.09428766665935628,
+ 0.0577636965526377,
+ 0.033530519151321735,
+ 0.018359683706606608,
+ 0.009410412167199327,
+ 0.004476126943788887,
+ 0.0019474205649998113,
+ 7.543620950713759E-4,
+ 2.495052931328896E-4,
+ 6.743527114854275E-5,
+ 1.374939974973021E-5,
+ 1.7302700783578526E-6,
+ 9.824239626038127E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
index 876991fb..3692cba9 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.3463409788622023,
- 0.2629285212226204,
- 0.19100577225967771,
- 0.13076301139412344,
- 0.08337813349925169,
- 0.047962888446025864,
- 0.025141444609498194,
- 0.0116043925820243,
- 0.0047366703456522136,
- 0.0016776010659666225,
- 5.143567898744554E-4,
- 1.3535534063906113E-4,
- 3.130192314805608E-5,
- 6.728719206668238E-6,
- 1.4785825271163757E-6,
- 2.9262273663461874E-7,
- 3.546947292013255E-8,
- 1.958521257019237E-9,
- 3.072711071484722E-11,
- 0.0
+ 0.4521408019463661,
+ 0.3378649837554991,
+ 0.23923014289286137,
+ 0.1579658997222346,
+ 0.09625329825352538,
+ 0.05241542846796099,
+ 0.025880352446810286,
+ 0.011220814685563602,
+ 0.004327166295016238,
+ 0.0014750147438390051,
+ 4.5445398707220827E-4,
+ 1.2930281573852022E-4,
+ 3.564510450424815E-5,
+ 9.66308722922416E-6,
+ 2.496110475732598E-6,
+ 5.528704296645165E-7,
+ 8.506614750944166E-8,
+ 7.825206511661106E-9,
+ 3.050308848780185E-10,
+ 3.305406343798575E-13
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.15407537072892244,
- 0.10951241496797232,
- 0.07312513255434765,
- 0.045777827075695936,
- 0.026575575488568287,
- 0.01418904131245537,
- 0.006735410394215425,
- 0.0027960008745299765,
- 9.823112678142049E-4,
- 2.767028267668077E-4,
- 5.8409836659385066E-5,
- 7.697923634410533E-6,
- 6.305873696237638E-7,
- 5.910280089514317E-8,
- 6.269368183563811E-9,
- 4.4362799925639904E-10,
- 8.2282052546027E-12,
- 0.0,
+ 0.2117612212410495,
+ 0.14993339732135746,
+ 0.09907006129198055,
+ 0.06051332358806588,
+ 0.03357028448372161,
+ 0.016777660079165483,
+ 0.007328356488923365,
+ 0.002774700191414909,
+ 8.897481765801692E-4,
+ 2.3138531110442813E-4,
+ 4.7167971784797114E-5,
+ 7.810610553925468E-6,
+ 1.2120957727578958E-6,
+ 2.134559261756078E-7,
+ 3.1072109211074423E-8,
+ 3.016093263994769E-9,
+ 1.1327510629538606E-10,
+ 1.1713753423000747E-12,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.38588792735268296,
- 0.29169181634096886,
- 0.21024651625386007,
- 0.14303905241576215,
- 0.09058385480635861,
- 0.0525016609016191,
- 0.02744137330432235,
- 0.012631185767372747,
- 0.005103408310287765,
- 0.001829361649303553,
- 6.238262224418692E-4,
- 2.1268209893357393E-4,
- 7.846387171506557E-5,
- 2.7067879303579683E-5,
- 7.906371964364534E-6,
- 1.7607129704369102E-6,
- 2.596744936339496E-7,
- 1.7216536557179972E-8,
- 2.7454111357798576E-10,
- 0.0
+ 0.48485488292114526,
+ 0.3582975243906195,
+ 0.25005713007612745,
+ 0.1631700983244767,
+ 0.09845456424703024,
+ 0.0542444423694145,
+ 0.02709438593679109,
+ 0.012166014784550714,
+ 0.0050091795842220005,
+ 0.0019405902745986364,
+ 7.455499565203375E-4,
+ 2.8302771410084653E-4,
+ 1.083540206844377E-4,
+ 3.7637805874516714E-5,
+ 1.114635366789293E-5,
+ 2.552603791176247E-6,
+ 3.992080159958039E-7,
+ 3.157394772999823E-8,
+ 8.434768915898014E-10,
+ 1.518262424728918E-14
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.45867450452345887,
- 0.361467336535617,
- 0.2712703821783725,
- 0.19410701505251213,
- 0.12978490542071433,
- 0.0812511421345725,
- 0.04648700252298603,
- 0.023911014030141984,
- 0.011038079978765575,
- 0.004565418449280248,
- 0.0017402884091994482,
- 6.44617139269577E-4,
- 2.432224009747154E-4,
- 9.447322260266001E-5,
- 3.5056214752020526E-5,
- 1.1288189451674183E-5,
- 2.9569688446471335E-6,
- 5.731561890831766E-7,
- 6.392724576463867E-8,
- 2.440843310238544E-9
+ 0.5825513672090984,
+ 0.45204962331076504,
+ 0.33156399027128974,
+ 0.23013881640515024,
+ 0.1482458521705472,
+ 0.08925881683644273,
+ 0.04924084596634653,
+ 0.02466978692434284,
+ 0.011332153311778923,
+ 0.004825455806294248,
+ 0.0019683175328193015,
+ 7.967635491669708E-4,
+ 3.2374121170907595E-4,
+ 1.293382986753244E-4,
+ 4.819421588433317E-5,
+ 1.5622674096979026E-5,
+ 4.155937685659816E-6,
+ 8.324719689471659E-7,
+ 1.0224084912621535E-7,
+ 5.625629449124282E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
index c15a007c..b5817315 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.013363770697143,
- 0.7157263495102535,
- 0.49388607531763884,
- 0.33312112437031244,
- 0.22082387121435032,
- 0.1420083075063264,
- 0.09018213475559324,
- 0.055426247505065786,
- 0.033072604205579004,
- 0.018891844724655087,
- 0.010271016726300363,
- 0.0053179137698314855,
- 0.0026371845292627216,
- 0.0012509098509137881,
- 5.57437137795543E-4,
- 2.2712211354682785E-4,
- 7.807289110366278E-5,
- 2.1568977490089235E-5,
- 4.297636858607089E-6,
- 2.0536860114937204E-7
+ 1.2159258310661658,
+ 0.8575813800464271,
+ 0.5959078919916538,
+ 0.41126747491431787,
+ 0.28506116051094194,
+ 0.1964128086239923,
+ 0.1356913317685525,
+ 0.09148383216118214,
+ 0.059955433825219805,
+ 0.03784096185344168,
+ 0.023037477484063974,
+ 0.01350599720675444,
+ 0.0075175722792416065,
+ 0.0038615014110807396,
+ 0.001763966977498427,
+ 6.915823090389428E-4,
+ 2.1415758603597696E-4,
+ 5.0681348756018556E-5,
+ 6.167303581105255E-6,
+ 1.591852569355597E-8
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.2665241893378751,
- 0.18398253181635946,
- 0.12288622831278118,
- 0.07917105234045582,
- 0.04887166544555736,
- 0.029042776551652216,
- 0.01650308881075483,
- 0.009116040973178124,
- 0.004970148332366398,
- 0.0027043296000873085,
- 0.0014736665546919397,
- 7.819246798578659E-4,
- 3.8117416438598347E-4,
- 1.6365877970741933E-4,
- 5.677189941798098E-5,
- 1.5492589085135303E-5,
- 2.508597142326327E-6,
- 4.6794816200387055E-8,
+ 0.3600775112735588,
+ 0.26816419380242423,
+ 0.1984417701314697,
+ 0.1451947639338657,
+ 0.10374572967093908,
+ 0.07171601532030644,
+ 0.04703048659679875,
+ 0.02926000531660955,
+ 0.01733665054927165,
+ 0.009791850799705817,
+ 0.005236530162684398,
+ 0.0025739708152588093,
+ 0.0011097890181196116,
+ 4.083917250662495E-4,
+ 1.1652339333511117E-4,
+ 2.3435841251968675E-5,
+ 1.6487167098260288E-6,
+ 4.133196233828474E-12,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.3408345317846213,
- 0.969899648652021,
- 0.6815022215051317,
- 0.46524328325364817,
- 0.3101530470092898,
- 0.2030258644454533,
- 0.13114161490243953,
- 0.0834401180727227,
- 0.05262701206773796,
- 0.032627530733747044,
- 0.019644320131005266,
- 0.011076561294631897,
- 0.005902286614616158,
- 0.0028874304111664454,
- 0.0012997016678065582,
- 5.221788098917305E-4,
- 1.8208195153742915E-4,
- 5.256921644361611E-5,
- 1.1831027933405245E-5,
- 1.7443720122117333E-6
+ 1.5359273668145488,
+ 1.1109958282128591,
+ 0.7836771839352107,
+ 0.5414864500834288,
+ 0.3694654277308717,
+ 0.2503859682824899,
+ 0.16907093236956933,
+ 0.11353726314987093,
+ 0.07649495197411692,
+ 0.051632246990799865,
+ 0.03468677087885077,
+ 0.02246296904456716,
+ 0.01390149077370863,
+ 0.007840875080080462,
+ 0.003935358697623874,
+ 0.0016841860872128603,
+ 5.943873525338244E-4,
+ 1.616864468960317E-4,
+ 3.0657214421952316E-5,
+ 2.4335803459419693E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.8672361871120091,
- 1.4190482838281584,
- 1.0391078344778282,
- 0.7395198683086204,
- 0.5080993239683914,
- 0.34374237360406884,
- 0.22806090638156648,
- 0.14859422601942798,
- 0.09570461068770232,
- 0.06082527313629742,
- 0.038026930643226105,
- 0.02308611594695648,
- 0.013392666580648067,
- 0.007340237305517689,
- 0.003788292187797305,
- 0.0018355124789115119,
- 8.363489278524868E-4,
- 3.5544840173417096E-4,
- 1.3627984255064113E-4,
- 4.5729067746378144E-5
+ 2.0994032993067653,
+ 1.5913012523689938,
+ 1.1612211898485372,
+ 0.8257954168805259,
+ 0.5708320544732013,
+ 0.3923990276307998,
+ 0.26758242177737995,
+ 0.1812725264706303,
+ 0.12275173810934054,
+ 0.08311421116083757,
+ 0.05629317972374059,
+ 0.03779398431687564,
+ 0.02477571460864562,
+ 0.015599397434413444,
+ 0.009280759776537247,
+ 0.005116827353903279,
+ 0.002574500462608576,
+ 0.001158040053317887,
+ 4.4819093059299974E-4,
+ 1.4607092065662027E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
index 906d3eef..7baee8cc 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.7629889045557231,
- 0.5721241530015008,
- 0.4163837838736407,
- 0.2912203846997569,
- 0.19537948637734961,
- 0.12396769532121754,
- 0.0761616148802313,
- 0.044802441441200776,
- 0.025632607275670936,
- 0.014182490228387473,
- 0.007553310345164416,
- 0.003850543156791848,
- 0.0018741699485498983,
- 8.69542085468047E-4,
- 3.8105133622572216E-4,
- 1.550112402819662E-4,
- 5.481289058323633E-5,
- 1.6098652742273404E-5,
- 3.6301729250574216E-6,
- 3.0408995435738497E-7
+ 0.9640082172283245,
+ 0.7266845261739096,
+ 0.5315341708269404,
+ 0.3744816823884738,
+ 0.2546847236876489,
+ 0.16596746782690328,
+ 0.10671946960437804,
+ 0.0674862513504341,
+ 0.04280097852102572,
+ 0.02722274563388079,
+ 0.017312871779285234,
+ 0.010850888984807945,
+ 0.006514963931052017,
+ 0.0036174798647396708,
+ 0.0017902162830235044,
+ 7.645725648609873E-4,
+ 2.6320629149584974E-4,
+ 7.052652680811485E-5,
+ 1.2681040567881226E-5,
+ 3.247918036212079E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.2575681078683554,
- 0.18228477251286343,
- 0.12286236172382821,
- 0.07862860365973191,
- 0.047441433442063405,
- 0.027128089778643893,
- 0.014604457306753103,
- 0.007525798272088874,
- 0.00377322426666045,
- 0.0018798151245613358,
- 9.546277458247886E-4,
- 4.898796499184478E-4,
- 2.4094287427296827E-4,
- 1.076971009833143E-4,
- 3.960806331677194E-5,
- 1.1686498687445723E-5,
- 2.332392972990725E-6,
- 7.542593136976315E-8,
+ 0.3734401100252404,
+ 0.2754130565276823,
+ 0.19558902996139052,
+ 0.13400764737913048,
+ 0.08848953528432797,
+ 0.056835991285428246,
+ 0.03549822657753323,
+ 0.021906327742640692,
+ 0.013428103807746835,
+ 0.008090626080542535,
+ 0.0046838761583584835,
+ 0.0025041316362595183,
+ 0.0011749083769780869,
+ 4.711526977045352E-4,
+ 1.4892624546524445E-4,
+ 3.571104635738625E-5,
+ 3.9313682790525796E-6,
+ 2.4417348541893015E-8,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.8971269314597337,
- 0.678938397812923,
- 0.5008941313096592,
- 0.3577250842872677,
- 0.24713308234516454,
- 0.16561137626161326,
- 0.10808657738956243,
- 0.0685454162972931,
- 0.042556336633459556,
- 0.02580275530700313,
- 0.015245594657295343,
- 0.008506777542978112,
- 0.004500902177338201,
- 0.0021729902421629196,
- 9.589972822737611E-4,
- 3.7802294879788167E-4,
- 1.3140834527926805E-4,
- 3.914681073388893E-5,
- 9.609971456839646E-6,
- 1.7208604438350094E-6
+ 1.075047463948679,
+ 0.8160126309383388,
+ 0.601516680630447,
+ 0.42812926719194444,
+ 0.29500401844892166,
+ 0.19839120582833947,
+ 0.13165901185194073,
+ 0.0867515256691255,
+ 0.05765064709288777,
+ 0.03887735421627216,
+ 0.026660023823584064,
+ 0.018059719596521098,
+ 0.011891576420038753,
+ 0.007220284151377285,
+ 0.003932411706436407,
+ 0.0018451420085392,
+ 7.2528012678824E-4,
+ 2.2770893036390573E-4,
+ 5.33507880004623E-5,
+ 7.540116844803375E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.1735054342097104,
- 0.9139674436311953,
- 0.6922252706374098,
- 0.5118543190379689,
- 0.36571237190168554,
- 0.25605373063484804,
- 0.17456652376021248,
- 0.11575158414203722,
- 0.07500806336976393,
- 0.04746662888567671,
- 0.029383813204709845,
- 0.01769931699211108,
- 0.010259455264138087,
- 0.0056414230100924586,
- 0.00290538313881707,
- 0.0013877547971993549,
- 6.167947433201406E-4,
- 2.5562375219072953E-4,
- 9.740097954236462E-5,
- 3.324155685868453E-5
+ 1.3775051427805944,
+ 1.0763795929467679,
+ 0.8155307182840461,
+ 0.6014437915324622,
+ 0.4278483055495324,
+ 0.298665901391765,
+ 0.2042055092818208,
+ 0.13741401507263937,
+ 0.09201782863520601,
+ 0.06168661803013043,
+ 0.041734305089989085,
+ 0.0284880503212683,
+ 0.01939309754459398,
+ 0.012892381976422809,
+ 0.008178175972766356,
+ 0.004840011936636076,
+ 0.002633514332066905,
+ 0.001294039919296989,
+ 5.55989505421147E-4,
+ 2.032220097653346E-4
]
}
}
\ No newline at end of file
--
GitLab
From 5f0b6e4cb71d955fabcb100c9723bb7e145e22d2 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 6 Mar 2023 08:13:04 -0700
Subject: [PATCH 4/7] updated ak model version and tests
---
nshms.yml | 2 +-
.../earthquake/nshmp/model/NshmTests.java | 6 +
.../nshm-alaska-2023-2023-ANCHORAGE_AK.json | 154 ++++++++---------
.../nshm-alaska-2023-2023-FAIRBANKS_AK.json | 140 ++++++++--------
.../nshm-alaska-2023-2023-JUNEAU_AK.json | 118 ++++++-------
.../nshm-alaska-2023-2023-KODIAK_AK.json | 154 ++++++++---------
.../nshm-alaska-2023-2023-VALDEZ_AK.json | 156 +++++++++---------
7 files changed, 368 insertions(+), 362 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index 7edcd102..56cadd4f 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -5,7 +5,7 @@ nshms:
# Alaska 2023 NSHM
-
repo: nshm-alaska
- tag: 3.a.3
+ tag: 3.a.4
year: 2023
deployments:
development:
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 6553ac55..ba2e51d8 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -86,6 +86,12 @@ class NshmTests {
* Run "./gradlew nshms" to first download all NSHMs
*/
public static void main(String[] args) throws IOException {
+ // run single model
+ // NshmModel nshmModel =
+ // NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
+ // NshmTestUtils.writeExpecteds(nshmModel);
+ // nshmModel.exec.shutdown();
+
for (Nshm nshm : NSHMS.values()) {
/* Initialize and shut down executor to generate results. */
NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
index 7d8af678..c1641974 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.2996202478882313,
- 0.9725018888121729,
- 0.7061101382493036,
- 0.49761000093345825,
- 0.3430693194982159,
- 0.22964504647669196,
- 0.15209434676476463,
- 0.0979533300995709,
- 0.06159907875341369,
- 0.03741634584652395,
- 0.021799886815018765,
- 0.012031635219146736,
- 0.006159376162184262,
- 0.002842018163941182,
- 0.001143697125450014,
- 3.8824774213089914E-4,
- 1.0057889682714155E-4,
- 1.835929703535304E-5,
- 1.2328840697872436E-6,
- 7.102888837863421E-9
+ 1.2591612835916228,
+ 0.935819294969047,
+ 0.6736077656760051,
+ 0.4692831993201172,
+ 0.31862287812188794,
+ 0.2088922276242202,
+ 0.13478794273899347,
+ 0.08400785913682399,
+ 0.050778279117050795,
+ 0.029406277423291487,
+ 0.016198363456834088,
+ 0.008400411270878226,
+ 0.004035373865549225,
+ 0.0017534758398779088,
+ 6.690977031798066E-4,
+ 2.170514307550235E-4,
+ 5.4002607832878515E-5,
+ 9.504456760403096E-6,
+ 6.25321983824242E-7,
+ 3.552337066950384E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.38353597317838123,
- 0.28234370766812356,
- 0.2032378040033671,
- 0.14263024239742927,
- 0.097000925083273,
- 0.06404432376232276,
- 0.040562430178367206,
- 0.024638265062692268,
- 0.014265855625999123,
- 0.007780737015339785,
- 0.003946435939172839,
- 0.0018069296760526254,
- 7.144450385010248E-4,
- 2.4100198759115837E-4,
- 6.181583793464954E-5,
- 1.0027244353732678E-5,
- 5.30121229465608E-7,
+ 0.3447375155399586,
+ 0.24764120877949838,
+ 0.17300961398886805,
+ 0.11708099973543344,
+ 0.07618135660720561,
+ 0.047757844157680245,
+ 0.028506608454805262,
+ 0.016244522746219982,
+ 0.008806008300108362,
+ 0.0045047073528032,
+ 0.002161528498746679,
+ 9.49330077509064E-4,
+ 3.6511655271175236E-4,
+ 1.2140668652090491E-4,
+ 3.099259845510509E-5,
+ 5.02027430565196E-6,
+ 2.653132438930704E-7,
5.21284369100748E-12,
0.0,
0.0
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.6804413809365217,
- 1.3155959318893202,
- 1.0026950316567134,
- 0.7407964632215732,
- 0.5301782251550355,
- 0.36783729293983153,
- 0.2477033990317714,
- 0.1612108293933553,
- 0.10206627991471746,
- 0.06291889441748978,
- 0.037925319593087176,
- 0.021746082598312868,
- 0.011802078729512172,
- 0.005729369773746734,
- 0.002438423521064161,
- 8.679622710898815E-4,
- 2.4610177417029653E-4,
- 4.8720524932222074E-5,
- 5.749113286016429E-6,
- 3.0206864383505644E-7
+ 1.6485780074870402,
+ 1.2874739746810273,
+ 0.9778431953263175,
+ 0.7188143565366919,
+ 0.5108178556474132,
+ 0.3509786975126039,
+ 0.23327746337795385,
+ 0.14913791048208278,
+ 0.0921455157443739,
+ 0.05491040553678575,
+ 0.03164587313011928,
+ 0.01716918179125878,
+ 0.008800254786014377,
+ 0.00404665753274857,
+ 0.0016438653926836473,
+ 5.630315554745141E-4,
+ 1.550152215627658E-4,
+ 3.0273719787477508E-5,
+ 3.576094051928261E-6,
+ 1.883064219058283E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 2.10976447751178,
- 1.7128588359837533,
- 1.350233035344546,
- 1.0376800045033359,
- 0.7702894343466304,
- 0.558601281493485,
- 0.3930643575558777,
- 0.2678581174330397,
- 0.1774664195036468,
- 0.11419991130989657,
- 0.0716061441504777,
- 0.04370973285041736,
- 0.025795082643067353,
- 0.01449422780426808,
- 0.0075933315773464545,
- 0.003615795545145659,
- 0.001537867952047417,
- 5.685651545999083E-4,
- 1.75986014282186E-4,
- 4.351293081937339E-5
+ 2.0750656993494196,
+ 1.6818063013794864,
+ 1.3227025184518288,
+ 1.013298807102805,
+ 0.748762675807018,
+ 0.539620931703391,
+ 0.3765005021851865,
+ 0.2536404037348987,
+ 0.1654845938621177,
+ 0.10430418794078485,
+ 0.0636051034594437,
+ 0.03744038607957191,
+ 0.02114038733793569,
+ 0.011312720656821382,
+ 0.005639629294823775,
+ 0.0025591790114867854,
+ 0.001039868924001161,
+ 3.683333614514881E-4,
+ 1.0911595435204257E-4,
+ 2.563959455882349E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
index bcc5af0a..b62304c9 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
@@ -23,25 +23,25 @@
1.7119945007591924
],
"ys": [
- 0.6434776887491847,
- 0.48461354491511255,
- 0.3510881647725481,
- 0.2427129484163405,
- 0.1598354577322471,
- 0.09842243680641934,
- 0.0576611562545184,
- 0.031404227451299824,
- 0.01601969521656962,
- 0.007569030525448274,
- 0.0032955905581386357,
- 0.0013105766385416492,
- 4.6887281017631916E-4,
- 1.4845247660234E-4,
- 4.001914388212344E-5,
- 8.709015226738513E-6,
+ 0.6192033632207883,
+ 0.46436030025374686,
+ 0.33482845978383774,
+ 0.23015060589670255,
+ 0.15047675547088715,
+ 0.09181638010636435,
+ 0.05325474700128653,
+ 0.028734185364177288,
+ 0.01457083186879576,
+ 0.006883387956900593,
+ 0.0030183007451843468,
+ 0.0012171146847273784,
+ 4.439956264597187E-4,
+ 1.432894350463878E-4,
+ 3.929940942056676E-5,
+ 8.690709337172216E-6,
1.3432898196633193E-6,
- 1.2403342954558017E-7,
- 4.8832912315695995E-9,
+ 1.240334295455802E-7,
+ 4.8832912315696E-9,
5.67781840686854E-12
]
},
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.24367737700250408,
- 0.1751231665442064,
- 0.12002800044690717,
- 0.07788985777006069,
- 0.04729165862637699,
- 0.026813645457474646,
- 0.013938279148004131,
- 0.006630099710225536,
- 0.0028417816801029642,
- 0.0010713422331935544,
- 3.513969445680387E-4,
- 9.587671527287437E-5,
- 2.1653676685502927E-5,
- 3.914519688513897E-6,
- 4.83669959380207E-7,
+ 0.21844912299024266,
+ 0.1537274754196999,
+ 0.1028692785953629,
+ 0.06504732968486689,
+ 0.038457123033315006,
+ 0.021267722732369113,
+ 0.010824369574200498,
+ 0.005078017656077424,
+ 0.002168935695661389,
+ 8.245848755232108E-4,
+ 2.7600745683064015E-4,
+ 7.841691360047029E-5,
+ 1.8536143347739047E-5,
+ 3.562523863257526E-6,
+ 4.808484996195222E-7,
4.717359749984972E-8,
- 1.7916876650015264E-9,
+ 1.7916876650015266E-9,
1.8537181269284467E-11,
0.0,
0.0
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.7606071536482794,
- 0.588242101160107,
- 0.4414803789596026,
- 0.3194040429949857,
- 0.22186932097400058,
- 0.14753402178639052,
- 0.093722494129855,
- 0.056343232500072074,
- 0.03206581545163287,
- 0.017118655576517997,
- 0.008562335744442894,
- 0.003890145739542235,
- 0.0016248807209186939,
- 5.84679007628631E-4,
- 1.7651463761009508E-4,
+ 0.7467405260122777,
+ 0.57742911339509,
+ 0.4330468432194656,
+ 0.31291582188185285,
+ 0.21708898337790244,
+ 0.1442770449423911,
+ 0.0917183747132528,
+ 0.055255246929130426,
+ 0.031546539712832236,
+ 0.01690459075671878,
+ 0.008488158959654664,
+ 0.0038692588064091404,
+ 0.0016199489814227867,
+ 5.841073988800807E-4,
+ 1.765060371567558E-4,
4.10802952499715E-5,
6.521460194753413E-6,
5.240989830824311E-7,
- 1.4207194491405504E-8,
+ 1.4207194491405506E-8,
3.351506238572734E-13
]
},
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.93023507184292,
- 0.743502745399627,
- 0.5754359781691307,
- 0.43272110188995516,
- 0.3124073119594771,
- 0.2187027084602443,
- 0.14695993123026216,
- 0.09428766665935628,
- 0.0577636965526377,
- 0.033530519151321735,
- 0.018359683706606608,
- 0.009410412167199327,
- 0.004476126943788887,
- 0.0019474205649998113,
- 7.543620950713759E-4,
- 2.495052931328896E-4,
- 6.743527114854275E-5,
- 1.374939974973021E-5,
- 1.7302700783578526E-6,
- 9.824239626038127E-8
+ 0.9137724147907341,
+ 0.7303951737032314,
+ 0.5651330297904095,
+ 0.4246637764202623,
+ 0.30624907769637355,
+ 0.2141598928049235,
+ 0.14383671291308556,
+ 0.09233736530684182,
+ 0.05667317313271356,
+ 0.032991816288169086,
+ 0.01812682854802419,
+ 0.009324218189206677,
+ 0.004449211810046104,
+ 0.0019401819565851288,
+ 7.529459933240954E-4,
+ 2.4938680892852024E-4,
+ 6.74352461245532E-5,
+ 1.3749399749730212E-5,
+ 1.7302700783578529E-6,
+ 9.824239626038126E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
index 3692cba9..316bc163 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
@@ -23,24 +23,24 @@
1.7119945007591924
],
"ys": [
- 0.4521408019463661,
- 0.3378649837554991,
- 0.23923014289286137,
- 0.1579658997222346,
- 0.09625329825352538,
- 0.05241542846796099,
- 0.025880352446810286,
- 0.011220814685563602,
- 0.004327166295016238,
- 0.0014750147438390051,
- 4.5445398707220827E-4,
- 1.2930281573852022E-4,
- 3.564510450424815E-5,
+ 0.4312797943379837,
+ 0.32159091420206787,
+ 0.22752867705708518,
+ 0.15030060996758515,
+ 0.09170492160722957,
+ 0.05004796235003485,
+ 0.024787437595009457,
+ 0.010792049454352817,
+ 0.004186422533282396,
+ 0.0014386530763870072,
+ 4.4731485043692166E-4,
+ 1.2867517797619972E-4,
+ 3.562825603470808E-5,
9.66308722922416E-6,
2.496110475732598E-6,
- 5.528704296645165E-7,
- 8.506614750944166E-8,
- 7.825206511661106E-9,
+ 5.528704296645164E-7,
+ 8.506614750944167E-8,
+ 7.825206511661108E-9,
3.050308848780185E-10,
3.305406343798575E-13
]
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.2117612212410495,
- 0.14993339732135746,
- 0.09907006129198055,
- 0.06051332358806588,
- 0.03357028448372161,
- 0.016777660079165483,
- 0.007328356488923365,
- 0.002774700191414909,
- 8.897481765801692E-4,
- 2.3138531110442813E-4,
- 4.7167971784797114E-5,
- 7.810610553925468E-6,
+ 0.18944215560467,
+ 0.13213306473774455,
+ 0.08593988440033597,
+ 0.05174104864019564,
+ 0.02840697153101842,
+ 0.014140596017254575,
+ 0.006201602603859234,
+ 0.0023791384707143627,
+ 7.804038568643974E-4,
+ 2.100831657752662E-4,
+ 4.497174315412665E-5,
+ 7.73349634996854E-6,
1.2120957727578958E-6,
2.134559261756078E-7,
- 3.1072109211074423E-8,
+ 3.107210921107443E-8,
3.016093263994769E-9,
- 1.1327510629538606E-10,
+ 1.1327510629538604E-10,
1.1713753423000747E-12,
0.0,
0.0
@@ -115,24 +115,24 @@
1.6428726885203377
],
"ys": [
- 0.48485488292114526,
- 0.3582975243906195,
- 0.25005713007612745,
- 0.1631700983244767,
- 0.09845456424703024,
- 0.0542444423694145,
- 0.02709438593679109,
- 0.012166014784550714,
- 0.0050091795842220005,
- 0.0019405902745986364,
- 7.455499565203375E-4,
+ 0.4756077415647114,
+ 0.3525328248271473,
+ 0.24684549916863346,
+ 0.1616059123683965,
+ 0.09780062996242006,
+ 0.05401543010750376,
+ 0.027029595884770698,
+ 0.012152241092958354,
+ 0.005007202156567655,
+ 0.0019403924029761988,
+ 7.455457300444542E-4,
2.8302771410084653E-4,
1.083540206844377E-4,
3.7637805874516714E-5,
1.114635366789293E-5,
- 2.552603791176247E-6,
+ 2.5526037911762466E-6,
3.992080159958039E-7,
- 3.157394772999823E-8,
+ 3.1573947729998235E-8,
8.434768915898014E-10,
1.518262424728918E-14
]
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.5825513672090984,
- 0.45204962331076504,
- 0.33156399027128974,
- 0.23013881640515024,
- 0.1482458521705472,
- 0.08925881683644273,
- 0.04924084596634653,
- 0.02466978692434284,
- 0.011332153311778923,
- 0.004825455806294248,
- 0.0019683175328193015,
- 7.967635491669708E-4,
+ 0.5703674834569316,
+ 0.44358517381964635,
+ 0.32622951888180823,
+ 0.22711193382517839,
+ 0.14675406110122302,
+ 0.08861399799714889,
+ 0.04900653856108056,
+ 0.02459974330326487,
+ 0.01131617993582473,
+ 0.004822919994455275,
+ 0.0019680105545239563,
+ 7.96754213845643E-4,
3.2374121170907595E-4,
1.293382986753244E-4,
- 4.819421588433317E-5,
+ 4.819421588433316E-5,
1.5622674096979026E-5,
- 4.155937685659816E-6,
- 8.324719689471659E-7,
+ 4.155937685659817E-6,
+ 8.324719689471658E-7,
1.0224084912621535E-7,
- 5.625629449124282E-9
+ 5.625629449124281E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
index b5817315..fb7ebe77 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.2159258310661658,
- 0.8575813800464271,
- 0.5959078919916538,
- 0.41126747491431787,
- 0.28506116051094194,
- 0.1964128086239923,
- 0.1356913317685525,
- 0.09148383216118214,
- 0.059955433825219805,
- 0.03784096185344168,
- 0.023037477484063974,
- 0.01350599720675444,
- 0.0075175722792416065,
- 0.0038615014110807396,
- 0.001763966977498427,
- 6.915823090389428E-4,
- 2.1415758603597696E-4,
- 5.0681348756018556E-5,
- 6.167303581105255E-6,
- 1.591852569355597E-8
+ 1.1718318578395919,
+ 0.8163166981270564,
+ 0.5573561303666414,
+ 0.37555628791992113,
+ 0.2526381876984934,
+ 0.16816022747869908,
+ 0.11228321510500883,
+ 0.07325329638403714,
+ 0.0464119857084717,
+ 0.02808361620692229,
+ 0.016149292822150368,
+ 0.00881686107458224,
+ 0.004550078676905397,
+ 0.002183424060137583,
+ 9.460938494604122E-4,
+ 3.581810741165417E-4,
+ 1.0851013228833472E-4,
+ 2.540128189017458E-5,
+ 3.084713207460328E-6,
+ 7.959868754931204E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.3600775112735588,
- 0.26816419380242423,
- 0.1984417701314697,
- 0.1451947639338657,
- 0.10374572967093908,
- 0.07171601532030644,
- 0.04703048659679875,
- 0.02926000531660955,
- 0.01733665054927165,
- 0.009791850799705817,
- 0.005236530162684398,
- 0.0025739708152588093,
- 0.0011097890181196116,
- 4.083917250662495E-4,
- 1.1652339333511117E-4,
- 2.3435841251968675E-5,
- 1.6487167098260288E-6,
+ 0.3146699477109087,
+ 0.22664551336330394,
+ 0.161336074118712,
+ 0.11305706364945849,
+ 0.0770963119469564,
+ 0.05076799678988205,
+ 0.031636058191480444,
+ 0.018651707160619386,
+ 0.010438047865530126,
+ 0.005564951322513462,
+ 0.0028294493769777376,
+ 0.0013403369430325734,
+ 5.648485361979159E-4,
+ 2.053620262699437E-4,
+ 5.835381781996716E-5,
+ 1.172399461565542E-5,
+ 8.245582803719639E-7,
4.133196233828474E-12,
0.0,
0.0
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.5359273668145488,
- 1.1109958282128591,
- 0.7836771839352107,
- 0.5414864500834288,
- 0.3694654277308717,
- 0.2503859682824899,
- 0.16907093236956933,
- 0.11353726314987093,
- 0.07649495197411692,
- 0.051632246990799865,
- 0.03468677087885077,
- 0.02246296904456716,
- 0.01390149077370863,
- 0.007840875080080462,
- 0.003935358697623874,
- 0.0016841860872128603,
- 5.943873525338244E-4,
- 1.616864468960317E-4,
- 3.0657214421952316E-5,
- 2.4335803459419693E-6
+ 1.498558292445958,
+ 1.0751698716205067,
+ 0.7496388724927093,
+ 0.5099668544687044,
+ 0.34151588718206993,
+ 0.22693006829625417,
+ 0.15040015642744384,
+ 0.09917365711776449,
+ 0.06535193866497421,
+ 0.0426372886546409,
+ 0.027198229239570094,
+ 0.016395590604149867,
+ 0.009363736307620663,
+ 0.0048808949278301575,
+ 0.0022915770147814425,
+ 9.299313083417054E-4,
+ 3.1484930222756114E-4,
+ 8.305479385884388E-5,
+ 1.5455490346830045E-5,
+ 1.2198514299655761E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 2.0994032993067653,
- 1.5913012523689938,
- 1.1612211898485372,
- 0.8257954168805259,
- 0.5708320544732013,
- 0.3923990276307998,
- 0.26758242177737995,
- 0.1812725264706303,
- 0.12275173810934054,
- 0.08311421116083757,
- 0.05629317972374059,
- 0.03779398431687564,
- 0.02477571460864562,
- 0.015599397434413444,
- 0.009280759776537247,
- 0.005116827353903279,
- 0.002574500462608576,
- 0.001158040053317887,
- 4.4819093059299974E-4,
- 1.4607092065662027E-4
+ 2.0608003512754616,
+ 1.55435620010703,
+ 1.1259113286998912,
+ 0.7924323231374716,
+ 0.5401668129939782,
+ 0.36526108247696903,
+ 0.2446943495279798,
+ 0.16286432793529182,
+ 0.10835935230563769,
+ 0.07185102072207543,
+ 0.047234230566097934,
+ 0.030344852313191704,
+ 0.018738351070079595,
+ 0.010986304276291778,
+ 0.006067721989013439,
+ 0.003120785561123521,
+ 0.0014801778101777682,
+ 6.355051731490864E-4,
+ 2.3727692182995611E-4,
+ 7.518732917369606E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
index 7baee8cc..de5b05ba 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.9640082172283245,
- 0.7266845261739096,
- 0.5315341708269404,
- 0.3744816823884738,
- 0.2546847236876489,
- 0.16596746782690328,
- 0.10671946960437804,
- 0.0674862513504341,
- 0.04280097852102572,
- 0.02722274563388079,
- 0.017312871779285234,
- 0.010850888984807945,
- 0.006514963931052017,
- 0.0036174798647396708,
- 0.0017902162830235044,
- 7.645725648609873E-4,
- 2.6320629149584974E-4,
- 7.052652680811485E-5,
- 1.2681040567881226E-5,
- 3.247918036212079E-7
+ 0.9241150171596147,
+ 0.6894805648071802,
+ 0.4975816116925831,
+ 0.3444672471074588,
+ 0.2291653665546729,
+ 0.14528178784662196,
+ 0.09049089650406522,
+ 0.05508823631235109,
+ 0.0333644104008108,
+ 0.020018000226823936,
+ 0.011848318421347889,
+ 0.0068593233347689865,
+ 0.003820037466490135,
+ 0.001994484442083503,
+ 9.44043002594921E-4,
+ 3.9188429275620904E-4,
+ 1.3270868096868809E-4,
+ 3.530774130841558E-5,
+ 6.341584813040933E-6,
+ 1.6239707289596624E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.3734401100252404,
- 0.2754130565276823,
- 0.19558902996139052,
- 0.13400764737913048,
- 0.08848953528432797,
- 0.056835991285428246,
- 0.03549822657753323,
- 0.021906327742640692,
- 0.013428103807746835,
- 0.008090626080542535,
- 0.0046838761583584835,
- 0.0025041316362595183,
- 0.0011749083769780869,
- 4.711526977045352E-4,
- 1.4892624546524445E-4,
- 3.571104635738625E-5,
- 3.9313682790525796E-6,
- 2.4417348541893015E-8,
+ 0.33341681472925533,
+ 0.23979956308504694,
+ 0.16515032252659934,
+ 0.10906573879921368,
+ 0.06893178795486755,
+ 0.0420685387690673,
+ 0.02474479792701736,
+ 0.014267070974622369,
+ 0.008136655440433623,
+ 0.004579717417562423,
+ 0.00251212160780864,
+ 0.0012958865870568441,
+ 5.957432479510453E-4,
+ 2.3655123608436621E-4,
+ 7.455071630818507E-5,
+ 1.786413006174534E-5,
+ 1.9660127601383514E-6,
+ 1.2212066658447131E-8,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.075047463948679,
- 0.8160126309383388,
- 0.601516680630447,
- 0.42812926719194444,
- 0.29500401844892166,
- 0.19839120582833947,
- 0.13165901185194073,
- 0.0867515256691255,
- 0.05765064709288777,
- 0.03887735421627216,
- 0.026660023823584064,
- 0.018059719596521098,
- 0.011891576420038753,
- 0.007220284151377285,
- 0.003932411706436407,
- 0.0018451420085392,
- 7.2528012678824E-4,
- 2.2770893036390573E-4,
- 5.33507880004623E-5,
- 7.540116844803375E-6
+ 1.0418327331985027,
+ 0.7852430916620532,
+ 0.5736722279105961,
+ 0.40380180985560116,
+ 0.2745903970209713,
+ 0.1818856018906268,
+ 0.11863393997339917,
+ 0.07651348555396194,
+ 0.0493602946573138,
+ 0.03184735199288833,
+ 0.020529016825084595,
+ 0.012857688933185103,
+ 0.00779613066017011,
+ 0.004377331141906192,
+ 0.0022341722119048973,
+ 9.964915607910054E-4,
+ 3.77375640231403E-4,
+ 1.1561991198348781E-4,
+ 2.6760383132144156E-5,
+ 3.7711003714336774E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.3775051427805944,
- 1.0763795929467679,
- 0.8155307182840461,
- 0.6014437915324622,
- 0.4278483055495324,
- 0.298665901391765,
- 0.2042055092818208,
- 0.13741401507263937,
- 0.09201782863520601,
- 0.06168661803013043,
- 0.041734305089989085,
- 0.0284880503212683,
- 0.01939309754459398,
- 0.012892381976422809,
- 0.008178175972766356,
- 0.004840011936636076,
- 0.002633514332066905,
- 0.001294039919296989,
- 5.55989505421147E-4,
- 2.032220097653346E-4
+ 1.3428581144394656,
+ 1.0438847620834202,
+ 0.7854590310653587,
+ 0.5742212919734676,
+ 0.40406366702549956,
+ 0.2786032600344873,
+ 0.18786759967130257,
+ 0.12442854368898455,
+ 0.08170669885961399,
+ 0.05330827988626577,
+ 0.03467421955551327,
+ 0.022411168729153916,
+ 0.014253555553422169,
+ 0.00879118877000131,
+ 0.0051777971500815995,
+ 0.0028651491965027464,
+ 0.0014742796541815763,
+ 6.939964545919095E-4,
+ 2.892020968712435E-4,
+ 1.0351909861573627E-4
]
}
}
\ No newline at end of file
--
GitLab
From f4b42a4a740291ab51d2bd0fbcb42aaa42e2b9a7 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 20 Mar 2023 15:14:01 -0600
Subject: [PATCH 5/7] updated gmms
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 90f78f7a..50359552 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.2.13
+nshmpLibVersion = 1.2.14
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
--
GitLab
From 1703cb170173656fc297b4c0d46664648fe9e780 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 20 Mar 2023 15:42:11 -0600
Subject: [PATCH 6/7] updated tests; only precision changes
---
.../earthquake/nshmp/model/NshmTests.java | 18 +--
.../nshm-conus-2023-2023-BOSTON_MA.json | 100 ++++++-------
.../nshm-conus-2023-2023-CHICAGO_IL.json | 138 +++++++++---------
.../nshm-conus-2023-2023-NEW_MADRID_MO.json | 116 +++++++--------
.../nshm-conus-2023-2023-NEW_YORK_NY.json | 120 +++++++--------
.../nshm-conus-2023-2023-RENO_NV.json | 12 +-
...shm-conus-2023-2023-SALT_LAKE_CITY_UT.json | 2 +-
...nshm-conus-2023-2023-SAN_FRANCISCO_CA.json | 2 +-
.../nshm-conus-2023-2023-SEATTLE_WA.json | 46 +++---
9 files changed, 277 insertions(+), 277 deletions(-)
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index ba2e51d8..60295b23 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -87,17 +87,17 @@ class NshmTests {
*/
public static void main(String[] args) throws IOException {
// run single model
- // NshmModel nshmModel =
- // NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
+ NshmModel nshmModel =
+ NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
+ NshmTestUtils.writeExpecteds(nshmModel);
+ nshmModel.exec.shutdown();
+
+ // for (Nshm nshm : NSHMS.values()) {
+ // /* Initialize and shut down executor to generate results. */
+ // NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
// NshmTestUtils.writeExpecteds(nshmModel);
// nshmModel.exec.shutdown();
-
- for (Nshm nshm : NSHMS.values()) {
- /* Initialize and shut down executor to generate results. */
- NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
- NshmTestUtils.writeExpecteds(nshmModel);
- nshmModel.exec.shutdown();
- }
+ // }
}
/**
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
index 9b047f70..bd295c03 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
@@ -24,25 +24,25 @@
],
"ys": [
0.03140199836610397,
- 0.021117409797304226,
- 0.01379295178931493,
- 0.00869656700708949,
+ 0.021117409797304223,
+ 0.013792951789314932,
+ 0.008696567007089488,
0.005290805654625041,
- 0.003036490917270708,
+ 0.0030364909172707075,
0.0016751011556612925,
8.677373903714001E-4,
- 4.289188926721494E-4,
+ 4.289188926721495E-4,
2.0235316825357782E-4,
- 9.205602846076074E-5,
+ 9.205602846076073E-5,
4.063482489850078E-5,
- 1.7359710544267037E-5,
+ 1.7359710544267034E-5,
7.075729925264028E-6,
- 2.6818721948072718E-6,
- 9.250128128146017E-7,
- 2.7305393243278333E-7,
- 6.769575736079953E-8,
+ 2.681872194807273E-6,
+ 9.25012812814602E-7,
+ 2.730539324327833E-7,
+ 6.769575736079954E-8,
1.3129696503476157E-8,
- 1.7698286907721423E-9
+ 1.7698286907721421E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.005867292219110497,
- 0.003824832868466257,
- 0.0023929312222295933,
- 0.0014244814734809628,
- 7.967755787146476E-4,
+ 0.005867292219110499,
+ 0.0038248328684662566,
+ 0.002392931222229593,
+ 0.001424481473480963,
+ 7.967755787146474E-4,
4.198025397391885E-4,
- 2.0599827713582025E-4,
- 9.542841191828279E-5,
- 4.195397953754037E-5,
- 1.7519733455529052E-5,
- 7.015770739727138E-6,
- 2.6927344093994585E-6,
+ 2.059982771358202E-4,
+ 9.54284119182828E-5,
+ 4.195397953754035E-5,
+ 1.751973345552905E-5,
+ 7.015770739727137E-6,
+ 2.6927344093994568E-6,
9.68504940016099E-7,
- 3.290536380670676E-7,
+ 3.2905363806706766E-7,
9.720308639640623E-8,
- 2.499951673620781E-8,
- 5.155486497350212E-9,
+ 2.4999516736207815E-8,
+ 5.155486497350211E-9,
7.983811170654452E-10,
- 7.727267238902779E-11,
+ 7.727267238902777E-11,
3.0632279373181007E-12
]
},
@@ -115,23 +115,23 @@
1.6428726885203377
],
"ys": [
- 0.05768176631979705,
- 0.0430924372074033,
+ 0.057681766319797066,
+ 0.04309243720740332,
0.03158998092630394,
- 0.022537892785624517,
- 0.015579065356071974,
- 0.010411063715061494,
+ 0.022537892785624514,
+ 0.015579065356071977,
+ 0.010411063715061496,
0.006729305958030286,
- 0.004190647005685594,
+ 0.004190647005685595,
0.0025344410360458387,
- 0.001489394101283274,
+ 0.0014893941012832743,
8.561569042062332E-4,
- 4.728987737605025E-4,
+ 4.7289877376050247E-4,
2.5571611197859763E-4,
1.3131447973005453E-4,
6.397823652524017E-5,
- 2.8667301419849297E-5,
- 1.1501063261195743E-5,
+ 2.86673014198493E-5,
+ 1.150106326119574E-5,
3.961898044829674E-6,
1.1443125622382274E-6,
2.5335867375548424E-7
@@ -161,24 +161,24 @@
1.998773638612381
],
"ys": [
- 0.08723799512304442,
+ 0.08723799512304443,
0.06581562207023935,
0.04807392701104474,
0.03409402467179439,
0.023127784976379094,
- 0.01519225348628602,
- 0.009568028782612533,
- 0.005764951207487774,
- 0.0033438874658604564,
- 0.0018660267533230903,
- 0.0010059800226474966,
- 5.239362908329591E-4,
- 2.6305702100226733E-4,
+ 0.015192253486286018,
+ 0.009568028782612537,
+ 0.0057649512074877726,
+ 0.0033438874658604572,
+ 0.0018660267533230908,
+ 0.0010059800226474968,
+ 5.23936290832959E-4,
+ 2.630570210022674E-4,
1.2659826495025258E-4,
- 5.777116085974566E-5,
- 2.450126731406833E-5,
- 9.477521675844408E-6,
- 3.242723631229073E-6,
+ 5.7771160859745676E-5,
+ 2.4501267314068323E-5,
+ 9.477521675844412E-6,
+ 3.2427236312290734E-6,
9.362399575687823E-7,
2.1770787463930905E-7
]
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
index 341ec40b..bf0f8218 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.028716965168264,
- 0.01886487994515705,
+ 0.028716965168263994,
+ 0.018864879945157037,
0.012214410336495216,
0.007811378755969861,
- 0.004958072843068914,
- 0.0030430254157746547,
+ 0.004958072843068912,
+ 0.003043025415774655,
0.001801194832614685,
- 9.78138997366046E-4,
- 4.774219607796428E-4,
- 2.020054821950422E-4,
- 7.245783442942092E-5,
- 2.1673952969917548E-5,
- 5.473081124101165E-6,
- 1.3049230514184375E-6,
- 3.396231647344524E-7,
- 1.0683367558362431E-7,
- 2.9773479240922235E-8,
- 6.962943852677989E-9,
- 1.2649325781181002E-9,
- 1.5888452390126723E-10
+ 9.781389973660458E-4,
+ 4.7742196077964286E-4,
+ 2.0200548219504228E-4,
+ 7.245783442942089E-5,
+ 2.1673952969917555E-5,
+ 5.473081124101164E-6,
+ 1.3049230514184373E-6,
+ 3.3962316473445227E-7,
+ 1.068336755836243E-7,
+ 2.9773479240922238E-8,
+ 6.96294385267799E-9,
+ 1.2649325781181E-9,
+ 1.588845239012672E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.007107163927520146,
- 0.005044374961729104,
- 0.0036098092001682334,
- 0.002566612826496862,
+ 0.007107163927520147,
+ 0.005044374961729101,
+ 0.003609809200168233,
+ 0.0025666128264968625,
0.0017569962891242118,
0.0011261235004660468,
- 6.477313305370011E-4,
- 3.251738192982299E-4,
- 1.3834151213638156E-4,
- 4.821034174852281E-5,
- 1.3350914739802089E-5,
- 2.8151215514871247E-6,
+ 6.477313305370014E-4,
+ 3.2517381929822984E-4,
+ 1.3834151213638158E-4,
+ 4.8210341748522806E-5,
+ 1.3350914739802084E-5,
+ 2.815121551487124E-6,
4.3883529699940863E-7,
- 5.3884401669757356E-8,
- 9.528067482900411E-9,
- 2.381287271761181E-9,
- 5.049535398817942E-10,
+ 5.3884401669757375E-8,
+ 9.528067482900414E-9,
+ 2.3812872717611815E-9,
+ 5.049535398817941E-10,
8.505766114071679E-11,
- 9.735929496440572E-12,
- 5.151390743421167E-13
+ 9.73592949644057E-12,
+ 5.151390743421166E-13
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.0351216741448582,
+ 0.03512167414485821,
0.023211200244723885,
- 0.015217197102548959,
- 0.009865315238999507,
- 0.0062893816628032655,
- 0.0038894953821493623,
- 0.0022910218368709465,
- 0.0012601925559916993,
- 6.544817819640684E-4,
- 3.269742624513813E-4,
- 1.6306741803760654E-4,
- 8.137426381044411E-5,
- 4.161546426829107E-5,
- 2.080762388680752E-5,
- 1.001141506832018E-5,
- 4.44687071224383E-6,
- 1.7683274720331923E-6,
- 6.028249709072296E-7,
+ 0.015217197102548954,
+ 0.009865315238999509,
+ 0.006289381662803265,
+ 0.0038894953821493636,
+ 0.0022910218368709483,
+ 0.001260192555991699,
+ 6.54481781964068E-4,
+ 3.269742624513814E-4,
+ 1.630674180376065E-4,
+ 8.13742638104441E-5,
+ 4.1615464268291055E-5,
+ 2.0807623886807524E-5,
+ 1.0011415068320185E-5,
+ 4.446870712243829E-6,
+ 1.7683274720331918E-6,
+ 6.028249709072294E-7,
1.7201583835604052E-7,
- 3.7521157074011703E-8
+ 3.75211570740117E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.06640900091125866,
- 0.04481552596821446,
- 0.02929024731626321,
- 0.018772343014893264,
- 0.011679854583179558,
- 0.007173629474797435,
- 0.004252887054863991,
- 0.002382839867435222,
- 0.0012464263395316187,
- 6.014244596026235E-4,
- 2.7052055821085266E-4,
- 1.1629834415263532E-4,
+ 0.06640900091125869,
+ 0.044815525968214455,
+ 0.029290247316263212,
+ 0.018772343014893268,
+ 0.011679854583179553,
+ 0.007173629474797434,
+ 0.00425288705486399,
+ 0.0023828398674352216,
+ 0.0012464263395316189,
+ 6.01424459602623E-4,
+ 2.7052055821085276E-4,
+ 1.162983441526353E-4,
4.94038659917164E-5,
- 2.1122171127527715E-5,
- 8.964616707914122E-6,
+ 2.1122171127527722E-5,
+ 8.964616707914119E-6,
3.6358487148704516E-6,
- 1.360029335615549E-6,
- 4.51150734168798E-7,
- 1.258059605263143E-7,
- 2.7975224069953314E-8
+ 1.3600293356155483E-6,
+ 4.5115073416879813E-7,
+ 1.2580596052631427E-7,
+ 2.797522406995332E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
index 261bf9a7..7682dada 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
@@ -24,25 +24,25 @@
],
"ys": [
0.09850176713422258,
- 0.07312729909012126,
- 0.05308397184730751,
+ 0.07312729909012128,
+ 0.053083971847307516,
0.03768446624790958,
- 0.02630808344095556,
- 0.01790809043786765,
- 0.012160029178287754,
- 0.008222905743560025,
- 0.005692879397239757,
- 0.0041037978211855425,
- 0.0031069691710146207,
- 0.0024215583101441906,
- 0.001854411189102515,
- 0.0013192248814640891,
+ 0.026308083440955563,
+ 0.017908090437867646,
+ 0.012160029178287752,
+ 0.008222905743560023,
+ 0.005692879397239758,
+ 0.004103797821185542,
+ 0.00310696917101462,
+ 0.00242155831014419,
+ 0.0018544111891025147,
+ 0.0013192248814640894,
8.294421357236949E-4,
- 4.468168964229126E-4,
- 1.9751472450576995E-4,
+ 4.468168964229127E-4,
+ 1.9751472450576986E-4,
7.082379863370093E-5,
- 1.9544561496314157E-5,
- 3.88357952865561E-6
+ 1.954456149631417E-5,
+ 3.883579528655611E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.020226805685536923,
- 0.014456993690890865,
- 0.010311275339298464,
+ 0.020226805685536926,
+ 0.014456993690890863,
+ 0.010311275339298471,
0.007410282372372471,
- 0.005420242154345005,
- 0.004112202045405046,
+ 0.005420242154345008,
+ 0.004112202045405045,
0.0032598918457679518,
- 0.0027056013898286713,
+ 0.002705601389828671,
0.002295628152726618,
- 0.001909728430262791,
- 0.0014958430610445947,
- 0.0010702048038474616,
- 6.794014527943354E-4,
- 3.777448399802698E-4,
- 1.7431530417571855E-4,
- 6.676688108364843E-5,
- 2.010923480249365E-5,
+ 0.0019097284302627905,
+ 0.0014958430610445951,
+ 0.0010702048038474618,
+ 6.794014527943355E-4,
+ 3.7774483998026975E-4,
+ 1.7431530417571852E-4,
+ 6.676688108364841E-5,
+ 2.0109234802493648E-5,
4.489749073748097E-6,
- 6.69242122394876E-7,
- 4.398566361226216E-8
+ 6.692421223948756E-7,
+ 4.398566361226214E-8
]
},
"Peak Ground Acceleration": {
@@ -116,25 +116,25 @@
],
"ys": [
0.1886054256128138,
- 0.16275334197403102,
- 0.13755397463891877,
+ 0.16275334197403096,
+ 0.1375539746389188,
0.11317989772270942,
- 0.09047602199495315,
- 0.07032705935347142,
+ 0.09047602199495318,
+ 0.07032705935347143,
0.05330210287581899,
- 0.03936547661127353,
- 0.028495426301947097,
+ 0.03936547661127352,
+ 0.028495426301947083,
0.02022888255013566,
0.014163984801627954,
0.00972284422318302,
0.00669613851628052,
- 0.004611542864451253,
- 0.003196105674453867,
- 0.0021516250421904116,
+ 0.004611542864451254,
+ 0.0031961056744538668,
+ 0.0021516250421904108,
0.0013255803040000025,
6.922864839444246E-4,
- 2.910424437563198E-4,
- 9.122232638554797E-5
+ 2.910424437563199E-4,
+ 9.1222326385548E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.22470370542893037,
- 0.1939084405485559,
- 0.16314578939913849,
+ 0.2247037054289303,
+ 0.193908440548556,
+ 0.16314578939913846,
0.1334721570174714,
0.10507322983912896,
- 0.08032395568597926,
- 0.059464867655382836,
- 0.0427127849672139,
- 0.029944507690815473,
- 0.020496635602782646,
- 0.013767300330333573,
- 0.009150639601752168,
- 0.006113656085200025,
+ 0.08032395568597925,
+ 0.05946486765538283,
+ 0.04271278496721389,
+ 0.02994450769081548,
+ 0.02049663560278264,
+ 0.013767300330333571,
+ 0.009150639601752166,
+ 0.006113656085200024,
0.004178588006264202,
0.0029323165891444636,
- 0.002053070561467998,
- 0.0013503046278127767,
+ 0.0020530705614679986,
+ 0.0013503046278127765,
7.713251130950329E-4,
- 3.563473983853019E-4,
- 1.2741054530630147E-4
+ 3.56347398385302E-4,
+ 1.274105453063015E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
index c3f7ca4c..6e4be2b9 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.03173858014171648,
- 0.021339780972349124,
- 0.013891736155355614,
- 0.008702871323317573,
- 0.005257010814937974,
- 0.003005434084977267,
+ 0.03173858014171649,
+ 0.02133978097234913,
+ 0.013891736155355617,
+ 0.008702871323317575,
+ 0.005257010814937978,
+ 0.003005434084977266,
0.0016656813512850115,
8.787709846342374E-4,
- 4.4982230327846414E-4,
+ 4.498223032784642E-4,
2.233768838664674E-4,
- 1.0813164329058E-4,
+ 1.0813164329057997E-4,
5.087678520362409E-5,
- 2.3000914423316594E-5,
- 9.796473238506976E-6,
+ 2.300091442331659E-5,
+ 9.796473238506978E-6,
3.834226566465003E-6,
- 1.3526179722084802E-6,
- 4.0561593777847027E-7,
- 1.0159328170663664E-7,
- 1.983620005558785E-8,
- 2.6881101620063547E-9
+ 1.3526179722084804E-6,
+ 4.056159377784702E-7,
+ 1.0159328170663663E-7,
+ 1.9836200055587848E-8,
+ 2.6881101620063556E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.0061025079058511095,
- 0.003899067974125618,
+ 0.006102507905851109,
+ 0.0038990679741256196,
0.002382642687892061,
- 0.00138663763370032,
- 7.624471722655169E-4,
- 3.991905113937744E-4,
+ 0.0013866376337003201,
+ 7.624471722655167E-4,
+ 3.991905113937745E-4,
1.9772432210500465E-4,
9.426079143655626E-5,
4.351161422788669E-5,
- 1.9358718499170798E-5,
+ 1.9358718499170794E-5,
8.303052242177256E-6,
- 3.3925889700760563E-6,
- 1.2851573724623575E-6,
- 4.5199061406267797E-7,
+ 3.392588970076056E-6,
+ 1.2851573724623573E-6,
+ 4.5199061406267786E-7,
1.3712336694696286E-7,
3.595587559990004E-8,
7.519232998092494E-9,
- 1.1793297231150328E-9,
+ 1.1793297231150324E-9,
1.1536327397598236E-10,
- 4.625232359646364E-12
+ 4.625232359646363E-12
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.053422434955574166,
- 0.04020920495554081,
- 0.029855756453638558,
- 0.0217266204504069,
- 0.01545155301653882,
+ 0.05342243495557418,
+ 0.040209204955540825,
+ 0.029855756453638554,
+ 0.02172662045040689,
+ 0.015451553016538822,
0.010719211766649875,
- 0.0072464779449506024,
- 0.004745418573916583,
- 0.0030227167657870552,
- 0.001868387203005202,
+ 0.007246477944950602,
+ 0.004745418573916584,
+ 0.003022716765787055,
+ 0.0018683872030052023,
0.0011249844803513092,
- 6.479801770598047E-4,
- 3.627963118316445E-4,
- 1.9167743860676635E-4,
- 9.54296906591475E-5,
- 4.3456067606267236E-5,
- 1.764341472644732E-5,
+ 6.479801770598048E-4,
+ 3.6279631183164457E-4,
+ 1.9167743860676632E-4,
+ 9.542969065914748E-5,
+ 4.345606760626724E-5,
+ 1.7643414726447324E-5,
6.133767088181088E-6,
- 1.7849365683808554E-6,
- 3.978894235967971E-7
+ 1.7849365683808552E-6,
+ 3.978894235967972E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.08079525692428417,
- 0.060877287273066176,
- 0.044629057123178224,
- 0.031926302078010976,
- 0.021985425373050815,
- 0.014766339179658411,
+ 0.0807952569242842,
+ 0.06087728727306617,
+ 0.044629057123178204,
+ 0.03192630207801098,
+ 0.021985425373050812,
+ 0.014766339179658408,
0.009589023782390913,
- 0.00600763853559983,
- 0.0036471049278067936,
+ 0.006007638535599829,
+ 0.003647104927806794,
0.002138717977256336,
- 0.0012124137077166005,
- 6.626542322611687E-4,
- 3.4774996062009417E-4,
- 1.7398642420530911E-4,
- 8.203255085018509E-5,
+ 0.0012124137077166007,
+ 6.62654232261169E-4,
+ 3.477499606200942E-4,
+ 1.7398642420530906E-4,
+ 8.203255085018508E-5,
3.5712179306848327E-5,
- 1.4088660740274175E-5,
- 4.889784000529996E-6,
- 1.4261978938027703E-6,
- 3.339970262028064E-7
+ 1.408866074027418E-5,
+ 4.889784000529995E-6,
+ 1.4261978938027705E-6,
+ 3.339970262028063E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
index eacc54cb..36289ba6 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
@@ -29,10 +29,10 @@
0.13624546359391296,
0.08506227171193938,
0.050930598806163255,
- 0.030158159091716916,
+ 0.030158159091716923,
0.017456250416622635,
0.010023495239063,
- 0.005643347529223006,
+ 0.0056433475292230065,
0.003057066831819484,
0.001541731293160766,
6.949253604013826E-4,
@@ -69,9 +69,9 @@
0.7929925155296614
],
"ys": [
- 0.11454312605927197,
+ 0.11454312605927199,
0.07774977737128347,
- 0.05111873766856917,
+ 0.05111873766856916,
0.032564050475628284,
0.020001855395237383,
0.01190823141989159,
@@ -82,7 +82,7 @@
3.5518422155049847E-4,
1.2455086316643806E-4,
3.5566198683860574E-5,
- 8.159419258458496E-6,
+ 8.159419258458494E-6,
1.2251021309367327E-6,
1.0484430247693849E-7,
3.920291953879094E-9,
@@ -163,7 +163,7 @@
"ys": [
0.6216532405946646,
0.46272644211304453,
- 0.33436224894384825,
+ 0.3343622489438483,
0.23714631355626206,
0.16431040627752377,
0.11340616476478484,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
index 16ec0510..1518a288 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
@@ -120,7 +120,7 @@
0.0861981278754339,
0.06177240482401042,
0.04303374915551782,
- 0.02929063040852448,
+ 0.029290630408524483,
0.01953817139931182,
0.012778226345862159,
0.008368974319197935,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
index 397c69fe..14e50836 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
@@ -77,7 +77,7 @@
0.030155590303921745,
0.01904155553388089,
0.011808350337992548,
- 0.00718083336322479,
+ 0.007180833363224791,
0.0041853531191431105,
0.0022659598771207212,
0.0010946630897325576,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
index 263ffe8c..f90a8619 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
@@ -29,14 +29,14 @@
0.08910831230443658,
0.06333736560966338,
0.043093389988133696,
- 0.028580388460289777,
+ 0.028580388460289784,
0.01821735738362719,
- 0.01123227796892613,
+ 0.011232277968926126,
0.00660873652693667,
- 0.0036548832126260655,
+ 0.0036548832126260646,
0.001860604963475091,
- 8.510413673500248E-4,
- 3.3987935013381714E-4,
+ 8.510413673500249E-4,
+ 3.398793501338172E-4,
1.1435202682716995E-4,
3.114357779727954E-5,
6.088655157703063E-6,
@@ -69,22 +69,22 @@
0.7929925155296614
],
"ys": [
- 0.05804476459665961,
+ 0.0580447645966596,
0.041635106894742896,
0.02901816422632226,
0.019653876323849274,
- 0.012901472583868468,
- 0.008269880789363747,
+ 0.01290147258386847,
+ 0.008269880789363748,
0.005139400897507957,
0.0030906591428687662,
- 0.0017598187411684081,
- 9.163676483739542E-4,
- 4.241153350881833E-4,
- 1.692063074918274E-4,
+ 0.001759818741168408,
+ 9.163676483739544E-4,
+ 4.241153350881834E-4,
+ 1.6920630749182736E-4,
5.555488821491962E-5,
- 1.4850334291205167E-5,
- 2.8640101774040855E-6,
- 3.2858861718099857E-7,
+ 1.4850334291205169E-5,
+ 2.864010177404086E-6,
+ 3.285886171809985E-7,
6.7005888291790454E-9,
5.614225022270342E-12,
0.0,
@@ -131,8 +131,8 @@
0.0010395594741382048,
3.8214957132823714E-4,
1.1226052751016851E-4,
- 2.4609229150341752E-5,
- 3.5111346042809243E-6,
+ 2.4609229150341756E-5,
+ 3.511134604280924E-6,
2.8182370150762684E-7,
6.626616132457025E-9
]
@@ -167,17 +167,17 @@
0.18425987035877295,
0.1485658072494233,
0.11586814527240913,
- 0.08674776317270892,
+ 0.08674776317270891,
0.06207341639858485,
- 0.04249817002030045,
+ 0.042498170020300444,
0.027752312154425564,
- 0.017285454796169643,
+ 0.017285454796169646,
0.010223972209830248,
- 0.005694323318959238,
+ 0.005694323318959239,
0.0029419321920128197,
- 0.001376805535864566,
+ 0.0013768055358645659,
5.636744379753912E-4,
- 1.9616835926077882E-4,
+ 1.9616835926077877E-4,
5.592130460225895E-5,
1.22149525135547E-5,
1.9287484178736967E-6
--
GitLab
From edb8edae5de8e45a6563a02dd7dc3d5d1df062cf Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 22 Mar 2023 11:53:17 -0600
Subject: [PATCH 7/7] updated lib with gmm epi updates; updated tests
---
gradle.properties | 2 +-
.../earthquake/nshmp/model/NshmTests.java | 6 +-
.../nshm-alaska-2023-2023-ANCHORAGE_AK.json | 156 ++++++++---------
.../nshm-alaska-2023-2023-FAIRBANKS_AK.json | 150 ++++++++--------
.../nshm-alaska-2023-2023-JUNEAU_AK.json | 134 +++++++--------
.../nshm-alaska-2023-2023-KODIAK_AK.json | 156 ++++++++---------
.../nshm-alaska-2023-2023-VALDEZ_AK.json | 156 ++++++++---------
.../nshm-conus-2023-2023-BOSTON_MA.json | 160 +++++++++---------
.../nshm-conus-2023-2023-CHICAGO_IL.json | 160 +++++++++---------
.../nshm-conus-2023-2023-LOS_ANGELES_CA.json | 76 ++++-----
.../nshm-conus-2023-2023-NEW_MADRID_MO.json | 160 +++++++++---------
.../nshm-conus-2023-2023-NEW_YORK_NY.json | 160 +++++++++---------
.../nshm-conus-2023-2023-RENO_NV.json | 132 +++++++--------
...shm-conus-2023-2023-SALT_LAKE_CITY_UT.json | 152 ++++++++---------
...nshm-conus-2023-2023-SAN_FRANCISCO_CA.json | 148 ++++++++--------
.../nshm-conus-2023-2023-SEATTLE_WA.json | 152 ++++++++---------
16 files changed, 1031 insertions(+), 1029 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 50359552..35290609 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.2.14
+nshmpLibVersion = 1.2.16
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
index 60295b23..91f4704a 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -86,14 +86,16 @@ class NshmTests {
* Run "./gradlew nshms" to first download all NSHMs
*/
public static void main(String[] args) throws IOException {
+ /* Initialize and shut down executor to generate results. */
+
// run single model
NshmModel nshmModel =
- NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
+ NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
NshmTestUtils.writeExpecteds(nshmModel);
nshmModel.exec.shutdown();
+ // run all models
// for (Nshm nshm : NSHMS.values()) {
- // /* Initialize and shut down executor to generate results. */
// NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
// NshmTestUtils.writeExpecteds(nshmModel);
// nshmModel.exec.shutdown();
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
index c1641974..83d332da 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.2591612835916228,
- 0.935819294969047,
- 0.6736077656760051,
- 0.4692831993201172,
- 0.31862287812188794,
- 0.2088922276242202,
- 0.13478794273899347,
- 0.08400785913682399,
- 0.050778279117050795,
- 0.029406277423291487,
- 0.016198363456834088,
- 0.008400411270878226,
- 0.004035373865549225,
- 0.0017534758398779088,
- 6.690977031798066E-4,
- 2.170514307550235E-4,
- 5.4002607832878515E-5,
- 9.504456760403096E-6,
- 6.25321983824242E-7,
- 3.552337066950384E-9
+ 1.2615842429019486,
+ 0.9383592096170968,
+ 0.6760215795791461,
+ 0.4713810460860991,
+ 0.32029625569216547,
+ 0.21012351815199612,
+ 0.1356648346484374,
+ 0.08463230910191964,
+ 0.05123358104798512,
+ 0.029738786860500847,
+ 0.016432986750746212,
+ 0.00855770088369556,
+ 0.004134965402032497,
+ 0.0018118108199287226,
+ 6.996082951662977E-4,
+ 2.30827495214501E-4,
+ 5.9284859181381745E-5,
+ 1.0960825773825155E-5,
+ 9.217340883903793E-7,
+ 2.0907853755126197E-8
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.3447375155399586,
- 0.24764120877949838,
- 0.17300961398886805,
- 0.11708099973543344,
- 0.07618135660720561,
- 0.047757844157680245,
- 0.028506608454805262,
- 0.016244522746219982,
- 0.008806008300108362,
- 0.0045047073528032,
- 0.002161528498746679,
- 9.49330077509064E-4,
- 3.6511655271175236E-4,
- 1.2140668652090491E-4,
- 3.099259845510509E-5,
- 5.02027430565196E-6,
- 2.653132438930704E-7,
- 5.21284369100748E-12,
+ 0.3457661287381385,
+ 0.24838464468482954,
+ 0.17357128415555415,
+ 0.11753446246847218,
+ 0.07656075717806037,
+ 0.04807631693037619,
+ 0.028768353443308227,
+ 0.016449976609192774,
+ 0.00895472388473917,
+ 0.004602364525387139,
+ 0.002220218566012676,
+ 9.817297049010728E-4,
+ 3.8087716168010806E-4,
+ 1.283610730555308E-4,
+ 3.350888500477047E-5,
+ 5.787780763336049E-6,
+ 4.3931374975021854E-7,
+ 4.720584647601226E-9,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.6485780074870402,
- 1.2874739746810273,
- 0.9778431953263175,
- 0.7188143565366919,
- 0.5108178556474132,
- 0.3509786975126039,
- 0.23327746337795385,
- 0.14913791048208278,
- 0.0921455157443739,
- 0.05491040553678575,
- 0.03164587313011928,
- 0.01716918179125878,
- 0.008800254786014377,
- 0.00404665753274857,
- 0.0016438653926836473,
- 5.630315554745141E-4,
- 1.550152215627658E-4,
- 3.0273719787477508E-5,
- 3.576094051928261E-6,
- 1.883064219058283E-7
+ 1.650599038839652,
+ 1.2900103492257151,
+ 0.9804920327694434,
+ 0.7213834761755992,
+ 0.5132175300899672,
+ 0.3531304493874114,
+ 0.2350988908684388,
+ 0.1505718248265313,
+ 0.09320043612706938,
+ 0.05564412774747659,
+ 0.032138627849108196,
+ 0.017493261822567552,
+ 0.009017743585550138,
+ 0.004190365032808127,
+ 0.0017319095447165395,
+ 6.097185700601331E-4,
+ 1.7538540736905476E-4,
+ 3.7458047757017104E-5,
+ 5.402043972846191E-6,
+ 4.046750346474048E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 2.0750656993494196,
- 1.6818063013794864,
- 1.3227025184518288,
- 1.013298807102805,
- 0.748762675807018,
- 0.539620931703391,
- 0.3765005021851865,
- 0.2536404037348987,
- 0.1654845938621177,
- 0.10430418794078485,
- 0.0636051034594437,
- 0.03744038607957191,
- 0.02114038733793569,
- 0.011312720656821382,
- 0.005639629294823775,
- 0.0025591790114867854,
- 0.001039868924001161,
- 3.683333614514881E-4,
- 1.0911595435204257E-4,
- 2.563959455882349E-5
+ 2.0757077904678423,
+ 1.683608601555616,
+ 1.325101890193446,
+ 1.0158751346574915,
+ 0.7513022286688694,
+ 0.5420210010226033,
+ 0.3786754230405975,
+ 0.2555003549922808,
+ 0.16697002937691352,
+ 0.1054142373908318,
+ 0.0643925286741262,
+ 0.037978471426693874,
+ 0.021500347546327635,
+ 0.011552232178058655,
+ 0.005797947709065342,
+ 0.002660018000785944,
+ 0.0010991976981982116,
+ 3.997161046281381E-4,
+ 1.232267396667013E-4,
+ 3.088944438776804E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
index b62304c9..b756e7c5 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
@@ -23,25 +23,25 @@
1.7119945007591924
],
"ys": [
- 0.6192033632207883,
- 0.46436030025374686,
- 0.33482845978383774,
- 0.23015060589670255,
- 0.15047675547088715,
- 0.09181638010636435,
- 0.05325474700128653,
- 0.028734185364177288,
- 0.01457083186879576,
- 0.006883387956900593,
- 0.0030183007451843468,
- 0.0012171146847273784,
- 4.439956264597187E-4,
- 1.432894350463878E-4,
- 3.929940942056676E-5,
- 8.690709337172216E-6,
- 1.3432898196633193E-6,
- 1.240334295455802E-7,
- 4.8832912315696E-9,
+ 0.6196382558919875,
+ 0.4647273733911618,
+ 0.33515470132126635,
+ 0.2304612817844076,
+ 0.15077219292528188,
+ 0.0920769190251641,
+ 0.05346400910340463,
+ 0.02888564102141107,
+ 0.014670080309338631,
+ 0.006941288300558665,
+ 0.0030481349096795497,
+ 0.0012305343925437442,
+ 4.4920972567651335E-4,
+ 1.4492138711031473E-4,
+ 3.9719191614628566E-5,
+ 8.765784533359538E-6,
+ 1.3499135727595292E-6,
+ 1.245261066228383E-7,
+ 4.8832912315695995E-9,
5.67781840686854E-12
]
},
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.21844912299024266,
- 0.1537274754196999,
- 0.1028692785953629,
- 0.06504732968486689,
- 0.038457123033315006,
- 0.021267722732369113,
- 0.010824369574200498,
- 0.005078017656077424,
- 0.002168935695661389,
- 8.245848755232108E-4,
- 2.7600745683064015E-4,
- 7.841691360047029E-5,
- 1.8536143347739047E-5,
- 3.562523863257526E-6,
- 4.808484996195222E-7,
+ 0.21865212843262138,
+ 0.15392742092956463,
+ 0.1030818593209404,
+ 0.06526765298852284,
+ 0.038664381056685924,
+ 0.021439872686424558,
+ 0.010948734282680624,
+ 0.005155675978878741,
+ 0.002210942654296783,
+ 8.440425192567741E-4,
+ 2.8327390015893156E-4,
+ 8.085344394261335E-5,
+ 1.910076753278105E-5,
+ 3.6818176278703955E-6,
+ 4.924645901865877E-7,
4.717359749984972E-8,
- 1.7916876650015266E-9,
+ 1.7916876650015264E-9,
1.8537181269284467E-11,
0.0,
0.0
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.7467405260122777,
- 0.57742911339509,
- 0.4330468432194656,
- 0.31291582188185285,
- 0.21708898337790244,
- 0.1442770449423911,
- 0.0917183747132528,
- 0.055255246929130426,
- 0.031546539712832236,
- 0.01690459075671878,
- 0.008488158959654664,
- 0.0038692588064091404,
- 0.0016199489814227867,
- 5.841073988800807E-4,
- 1.765060371567558E-4,
- 4.10802952499715E-5,
- 6.521460194753413E-6,
- 5.240989830824311E-7,
- 1.4207194491405506E-8,
- 3.351506238572734E-13
+ 0.7475163946708244,
+ 0.5782201303821156,
+ 0.43374816981262504,
+ 0.3134921999370521,
+ 0.2175412851489576,
+ 0.14462016531771119,
+ 0.09196468350886472,
+ 0.0554187021796056,
+ 0.03164571373876152,
+ 0.016959846067666474,
+ 0.008517062102200185,
+ 0.0038828191180088952,
+ 0.0016258713931112958,
+ 5.865224565960323E-4,
+ 1.7732309553070204E-4,
+ 4.132285582455685E-5,
+ 6.583313169166081E-6,
+ 5.3604267495583E-7,
+ 1.5438820775479772E-8,
+ 9.113249524228849E-12
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.9137724147907341,
- 0.7303951737032314,
- 0.5651330297904095,
- 0.4246637764202623,
- 0.30624907769637355,
- 0.2141598928049235,
- 0.14383671291308556,
- 0.09233736530684182,
- 0.05667317313271356,
- 0.032991816288169086,
- 0.01812682854802419,
- 0.009324218189206677,
- 0.004449211810046104,
- 0.0019401819565851288,
- 7.529459933240954E-4,
- 2.4938680892852024E-4,
- 6.74352461245532E-5,
- 1.3749399749730212E-5,
- 1.7302700783578529E-6,
- 9.824239626038126E-8
+ 0.9142702136534497,
+ 0.7311196284697029,
+ 0.5659009002922903,
+ 0.4253626979589311,
+ 0.306832013896455,
+ 0.21462338104651174,
+ 0.1441916033417995,
+ 0.09259434067692504,
+ 0.05684713131776023,
+ 0.03310026306520289,
+ 0.018189464990300115,
+ 0.009358320484798847,
+ 0.004466570878578641,
+ 0.0019481881286521824,
+ 7.564448614729615E-4,
+ 2.507225068230701E-4,
+ 6.785187877335699E-5,
+ 1.3861464017224865E-5,
+ 1.7566834600877285E-6,
+ 1.0262479659205378E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
index 316bc163..2d0ef98d 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
@@ -23,24 +23,24 @@
1.7119945007591924
],
"ys": [
- 0.4312797943379837,
- 0.32159091420206787,
- 0.22752867705708518,
- 0.15030060996758515,
- 0.09170492160722957,
- 0.05004796235003485,
- 0.024787437595009457,
- 0.010792049454352817,
- 0.004186422533282396,
- 0.0014386530763870072,
- 4.4731485043692166E-4,
- 1.2867517797619972E-4,
- 3.562825603470808E-5,
+ 0.4313778377018505,
+ 0.32171408713962235,
+ 0.22766659474359094,
+ 0.1504372696994509,
+ 0.09182418615238931,
+ 0.05013792920968455,
+ 0.02484645499659234,
+ 0.010824576134177567,
+ 0.004201789685114441,
+ 0.001444617697075677,
+ 4.4906008048283056E-4,
+ 1.2915038687202012E-4,
+ 3.566071389848609E-5,
9.66308722922416E-6,
- 2.496110475732598E-6,
- 5.528704296645164E-7,
- 8.506614750944167E-8,
- 7.825206511661108E-9,
+ 2.4961104757325976E-6,
+ 5.528704296645165E-7,
+ 8.506614750944165E-8,
+ 7.825206511661106E-9,
3.050308848780185E-10,
3.305406343798575E-13
]
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.18944215560467,
- 0.13213306473774455,
- 0.08593988440033597,
- 0.05174104864019564,
- 0.02840697153101842,
- 0.014140596017254575,
- 0.006201602603859234,
- 0.0023791384707143627,
- 7.804038568643974E-4,
- 2.100831657752662E-4,
- 4.497174315412665E-5,
- 7.73349634996854E-6,
- 1.2120957727578958E-6,
+ 0.18962915881210457,
+ 0.13231371115570228,
+ 0.08610643118963475,
+ 0.051892338625982595,
+ 0.028537233663045707,
+ 0.014239684720859703,
+ 0.0062649462490160365,
+ 0.00241237714984334,
+ 7.944636007803003E-4,
+ 2.1454550111671568E-4,
+ 4.602990327356596E-5,
+ 7.83143791332141E-6,
+ 1.2137506120029192E-6,
2.134559261756078E-7,
- 3.107210921107443E-8,
+ 3.1072109211074423E-8,
3.016093263994769E-9,
- 1.1327510629538604E-10,
- 1.1713753423000747E-12,
+ 1.1327510629538606E-10,
+ 1.171375342300075E-12,
0.0,
0.0
]
@@ -115,25 +115,25 @@
1.6428726885203377
],
"ys": [
- 0.4756077415647114,
- 0.3525328248271473,
- 0.24684549916863346,
- 0.1616059123683965,
- 0.09780062996242006,
- 0.05401543010750376,
- 0.027029595884770698,
- 0.012152241092958354,
- 0.005007202156567655,
- 0.0019403924029761988,
- 7.455457300444542E-4,
- 2.8302771410084653E-4,
- 1.083540206844377E-4,
+ 0.4757531048462467,
+ 0.35266996176351034,
+ 0.2469593860668163,
+ 0.1616873493660174,
+ 0.09784988454723532,
+ 0.05404035789354679,
+ 0.02703998501732486,
+ 0.012155679100316914,
+ 0.005008017912703153,
+ 0.0019404994398230322,
+ 7.455595723911906E-4,
+ 2.8302771904016935E-4,
+ 1.0835402071906951E-4,
3.7637805874516714E-5,
1.114635366789293E-5,
- 2.5526037911762466E-6,
+ 2.552603791176247E-6,
3.992080159958039E-7,
- 3.1573947729998235E-8,
- 8.434768915898014E-10,
+ 3.157394772999823E-8,
+ 8.434768915898015E-10,
1.518262424728918E-14
]
},
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.5703674834569316,
- 0.44358517381964635,
- 0.32622951888180823,
- 0.22711193382517839,
- 0.14675406110122302,
- 0.08861399799714889,
- 0.04900653856108056,
- 0.02459974330326487,
- 0.01131617993582473,
- 0.004822919994455275,
- 0.0019680105545239563,
- 7.96754213845643E-4,
- 3.2374121170907595E-4,
- 1.293382986753244E-4,
- 4.819421588433316E-5,
+ 0.5704953859298876,
+ 0.4437213553851962,
+ 0.3263595023248932,
+ 0.22722168177533936,
+ 0.14683381044750907,
+ 0.08866350738890147,
+ 0.04903268835666581,
+ 0.0246107504174729,
+ 0.011320133323436204,
+ 0.004823889722871732,
+ 0.0019681509391436583,
+ 7.967751364689861E-4,
+ 3.237413285243801E-4,
+ 1.2933830719544261E-4,
+ 4.8194216128967275E-5,
1.5622674096979026E-5,
4.155937685659817E-6,
- 8.324719689471658E-7,
- 1.0224084912621535E-7,
- 5.625629449124281E-9
+ 8.324719689471659E-7,
+ 1.0224084912621536E-7,
+ 5.625629449124282E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
index fb7ebe77..c4a281be 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.1718318578395919,
- 0.8163166981270564,
- 0.5573561303666414,
- 0.37555628791992113,
- 0.2526381876984934,
- 0.16816022747869908,
- 0.11228321510500883,
- 0.07325329638403714,
- 0.0464119857084717,
- 0.02808361620692229,
- 0.016149292822150368,
- 0.00881686107458224,
- 0.004550078676905397,
- 0.002183424060137583,
- 9.460938494604122E-4,
- 3.581810741165417E-4,
- 1.0851013228833472E-4,
- 2.540128189017458E-5,
- 3.084713207460328E-6,
- 7.959868754931204E-9
+ 1.176908540550347,
+ 0.8208233581137089,
+ 0.5608508101739277,
+ 0.3780179685146586,
+ 0.2542598409165238,
+ 0.16917780348522699,
+ 0.11294295931467835,
+ 0.073722117804931,
+ 0.046777664497678076,
+ 0.028368372878628624,
+ 0.016355499151888928,
+ 0.008955293539927325,
+ 0.0046389365589518256,
+ 0.0022383012020234447,
+ 9.776344055948182E-4,
+ 3.746585024088629E-4,
+ 1.1591326337356405E-4,
+ 2.790214869235525E-5,
+ 3.8192695305906244E-6,
+ 1.0303190011247954E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.3146699477109087,
- 0.22664551336330394,
- 0.161336074118712,
- 0.11305706364945849,
- 0.0770963119469564,
- 0.05076799678988205,
- 0.031636058191480444,
- 0.018651707160619386,
- 0.010438047865530126,
- 0.005564951322513462,
- 0.0028294493769777376,
- 0.0013403369430325734,
- 5.648485361979159E-4,
- 2.053620262699437E-4,
- 5.835381781996716E-5,
- 1.172399461565542E-5,
- 8.245582803719639E-7,
- 4.133196233828474E-12,
+ 0.31585740279172414,
+ 0.22752216393943692,
+ 0.1619880184582906,
+ 0.11353524841440556,
+ 0.07744822882212148,
+ 0.05105020560668116,
+ 0.031884914628459785,
+ 0.01886568890594263,
+ 0.010600150425812393,
+ 0.005671712474112049,
+ 0.0028941080239190163,
+ 0.00137752788229627,
+ 5.841323250201333E-4,
+ 2.147457349350808E-4,
+ 6.215649233673115E-5,
+ 1.2905321585208716E-5,
+ 1.1378495909293443E-6,
+ 1.3766689358264892E-9,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.498558292445958,
- 1.0751698716205067,
- 0.7496388724927093,
- 0.5099668544687044,
- 0.34151588718206993,
- 0.22693006829625417,
- 0.15040015642744384,
- 0.09917365711776449,
- 0.06535193866497421,
- 0.0426372886546409,
- 0.027198229239570094,
- 0.016395590604149867,
- 0.009363736307620663,
- 0.0048808949278301575,
- 0.0022915770147814425,
- 9.299313083417054E-4,
- 3.1484930222756114E-4,
- 8.305479385884388E-5,
- 1.5455490346830045E-5,
- 1.2198514299655761E-6
+ 1.5034307466950545,
+ 1.0805171170029173,
+ 0.7544799774564752,
+ 0.5138142501636522,
+ 0.3443152625048115,
+ 0.22887645996181114,
+ 0.15174002843690823,
+ 0.10009206552445549,
+ 0.06597199794140735,
+ 0.043042722004507386,
+ 0.027461128914096924,
+ 0.016571451799852914,
+ 0.009494611300455823,
+ 0.004984690159164352,
+ 0.0023718010355281757,
+ 9.842895410203168E-4,
+ 3.449774349079049E-4,
+ 9.629999705677543E-5,
+ 2.001118550075276E-5,
+ 2.3770997488716338E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 2.0608003512754616,
- 1.55435620010703,
- 1.1259113286998912,
- 0.7924323231374716,
- 0.5401668129939782,
- 0.36526108247696903,
- 0.2446943495279798,
- 0.16286432793529182,
- 0.10835935230563769,
- 0.07185102072207543,
- 0.047234230566097934,
- 0.030344852313191704,
- 0.018738351070079595,
- 0.010986304276291778,
- 0.006067721989013439,
- 0.003120785561123521,
- 0.0014801778101777682,
- 6.355051731490864E-4,
- 2.3727692182995611E-4,
- 7.518732917369606E-5
+ 2.063423441388135,
+ 1.5589241847024704,
+ 1.1312002146300024,
+ 0.7973967348533983,
+ 0.5442070033657663,
+ 0.3682646414675749,
+ 0.24680614045371113,
+ 0.16431427664239498,
+ 0.10935187626815537,
+ 0.07252433742372369,
+ 0.047682743666931954,
+ 0.0306406864137029,
+ 0.01893825650229503,
+ 0.011128788688833834,
+ 0.006174774347195005,
+ 0.003201219312554629,
+ 0.0015381039040949045,
+ 6.735981150328402E-4,
+ 2.594293825980931E-4,
+ 8.590272784161787E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
index de5b05ba..020462d5 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.9241150171596147,
- 0.6894805648071802,
- 0.4975816116925831,
- 0.3444672471074588,
- 0.2291653665546729,
- 0.14528178784662196,
- 0.09049089650406522,
- 0.05508823631235109,
- 0.0333644104008108,
- 0.020018000226823936,
- 0.011848318421347889,
- 0.0068593233347689865,
- 0.003820037466490135,
- 0.001994484442083503,
- 9.44043002594921E-4,
- 3.9188429275620904E-4,
- 1.3270868096868809E-4,
- 3.530774130841558E-5,
- 6.341584813040933E-6,
- 1.6239707289596624E-7
+ 0.9259421700329372,
+ 0.6911902478500314,
+ 0.499021687508618,
+ 0.3455932345732604,
+ 0.23000664637486753,
+ 0.14589377205639995,
+ 0.09094276760302598,
+ 0.05542764660241408,
+ 0.03362197329682248,
+ 0.020207895425829576,
+ 0.011981056932043259,
+ 0.006947708719071577,
+ 0.0038786079198037966,
+ 0.0020336307445430056,
+ 9.689658090147044E-4,
+ 4.0646279656521956E-4,
+ 1.3997872413314347E-4,
+ 3.824125846524706E-5,
+ 7.220289593649039E-6,
+ 3.629072189207283E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.33341681472925533,
- 0.23979956308504694,
- 0.16515032252659934,
- 0.10906573879921368,
- 0.06893178795486755,
- 0.0420685387690673,
- 0.02474479792701736,
- 0.014267070974622369,
- 0.008136655440433623,
- 0.004579717417562423,
- 0.00251212160780864,
- 0.0012958865870568441,
- 5.957432479510453E-4,
- 2.3655123608436621E-4,
- 7.455071630818507E-5,
- 1.786413006174534E-5,
- 1.9660127601383514E-6,
- 1.2212066658447131E-8,
+ 0.3340451128495938,
+ 0.2402390996086935,
+ 0.1654731998507521,
+ 0.1093335080055822,
+ 0.06917970490014463,
+ 0.042303039810019,
+ 0.02495270793698638,
+ 0.014430661699758016,
+ 0.008249630250781311,
+ 0.004650503742844747,
+ 0.0025559636408638876,
+ 0.0013234563403727222,
+ 6.121932964071722E-4,
+ 2.457353273351528E-4,
+ 7.878615502455529E-5,
+ 1.9315414318946888E-5,
+ 2.4643445956028307E-6,
+ 6.191041311229892E-8,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.0418327331985027,
- 0.7852430916620532,
- 0.5736722279105961,
- 0.40380180985560116,
- 0.2745903970209713,
- 0.1818856018906268,
- 0.11863393997339917,
- 0.07651348555396194,
- 0.0493602946573138,
- 0.03184735199288833,
- 0.020529016825084595,
- 0.012857688933185103,
- 0.00779613066017011,
- 0.004377331141906192,
- 0.0022341722119048973,
- 9.964915607910054E-4,
- 3.77375640231403E-4,
- 1.1561991198348781E-4,
- 2.6760383132144156E-5,
- 3.7711003714336774E-6
+ 1.0438437531884004,
+ 0.7871737649475408,
+ 0.5753658427008509,
+ 0.4052257545466524,
+ 0.27576667119783166,
+ 0.18284334057232535,
+ 0.11939475676868819,
+ 0.07709072447612689,
+ 0.04977045213177592,
+ 0.03211912764867072,
+ 0.020703332746107465,
+ 0.012973631412375165,
+ 0.00788217518955861,
+ 0.004447462352455574,
+ 0.0022926936020270117,
+ 0.0010408584019984107,
+ 4.054154032726833E-4,
+ 1.2971943506718671E-4,
+ 3.24844146930463E-5,
+ 5.468079737390506E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.3428581144394656,
- 1.0438847620834202,
- 0.7854590310653587,
- 0.5742212919734676,
- 0.40406366702549956,
- 0.2786032600344873,
- 0.18786759967130257,
- 0.12442854368898455,
- 0.08170669885961399,
- 0.05330827988626577,
- 0.03467421955551327,
- 0.022411168729153916,
- 0.014253555553422169,
- 0.00879118877000131,
- 0.0051777971500815995,
- 0.0028651491965027464,
- 0.0014742796541815763,
- 6.939964545919095E-4,
- 2.892020968712435E-4,
- 1.0351909861573627E-4
+ 1.3443261255177081,
+ 1.0457899329600795,
+ 0.7873955061337173,
+ 0.5759790969543808,
+ 0.40556588286821943,
+ 0.27985575503832166,
+ 0.18889214642795488,
+ 0.12524337244075345,
+ 0.082329178597031,
+ 0.053757393975203696,
+ 0.03497981212601005,
+ 0.022611470166100458,
+ 0.014387242175845825,
+ 0.008886652570417517,
+ 0.005250410017100082,
+ 0.0029218727414770315,
+ 0.001518016796450839,
+ 7.257251922275029E-4,
+ 3.0997418564093066E-4,
+ 1.1525467849178263E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
index bd295c03..bd74d34d 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.03140199836610397,
- 0.021117409797304223,
- 0.013792951789314932,
- 0.008696567007089488,
- 0.005290805654625041,
- 0.0030364909172707075,
- 0.0016751011556612925,
- 8.677373903714001E-4,
- 4.289188926721495E-4,
- 2.0235316825357782E-4,
- 9.205602846076073E-5,
- 4.063482489850078E-5,
- 1.7359710544267034E-5,
- 7.075729925264028E-6,
- 2.681872194807273E-6,
- 9.25012812814602E-7,
- 2.730539324327833E-7,
- 6.769575736079954E-8,
- 1.3129696503476157E-8,
- 1.7698286907721421E-9
+ 0.03192831353403804,
+ 0.021459655062286268,
+ 0.014005371056365422,
+ 0.008819699572255939,
+ 0.0053556588603321945,
+ 0.0030652319121952107,
+ 0.0016850684659988836,
+ 8.693014961691924E-4,
+ 4.2780432620066614E-4,
+ 2.0096037243424154E-4,
+ 9.108118627709849E-5,
+ 4.007383570661042E-5,
+ 1.7071063480090237E-5,
+ 6.937504087238177E-6,
+ 2.6205250003091E-6,
+ 9.006519806337776E-7,
+ 2.650876396803114E-7,
+ 6.57002814318478E-8,
+ 1.2819762406032432E-8,
+ 1.7626553428400702E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.005867292219110499,
- 0.0038248328684662566,
- 0.002392931222229593,
- 0.001424481473480963,
- 7.967755787146474E-4,
- 4.198025397391885E-4,
- 2.059982771358202E-4,
- 9.54284119182828E-5,
- 4.195397953754035E-5,
- 1.751973345552905E-5,
- 7.015770739727137E-6,
- 2.6927344093994568E-6,
- 9.68504940016099E-7,
- 3.2905363806706766E-7,
- 9.720308639640623E-8,
- 2.4999516736207815E-8,
- 5.155486497350211E-9,
- 7.983811170654452E-10,
- 7.727267238902777E-11,
- 3.0632279373181007E-12
+ 0.006081739115584787,
+ 0.00396050347847094,
+ 0.0024755942404962933,
+ 0.0014723749613359714,
+ 8.22918689513891E-4,
+ 4.334302125160471E-4,
+ 2.1275492796189976E-4,
+ 9.863828197702021E-5,
+ 4.3408053324946125E-5,
+ 1.8129047250517205E-5,
+ 7.251234661090713E-6,
+ 2.777206039166988E-6,
+ 9.981649925135881E-7,
+ 3.393643215076473E-7,
+ 1.0063483814696977E-7,
+ 2.609927459187271E-8,
+ 5.46491145769009E-9,
+ 8.698200939449353E-10,
+ 8.938962334741625E-11,
+ 4.013623453492887E-12
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.057681766319797066,
- 0.04309243720740332,
- 0.03158998092630394,
- 0.022537892785624514,
- 0.015579065356071977,
- 0.010411063715061496,
- 0.006729305958030286,
- 0.004190647005685595,
- 0.0025344410360458387,
- 0.0014893941012832743,
- 8.561569042062332E-4,
- 4.7289877376050247E-4,
- 2.5571611197859763E-4,
- 1.3131447973005453E-4,
- 6.397823652524017E-5,
- 2.86673014198493E-5,
- 1.150106326119574E-5,
- 3.961898044829674E-6,
- 1.1443125622382274E-6,
- 2.5335867375548424E-7
+ 0.06077600927415111,
+ 0.04563273724520148,
+ 0.033640367781806284,
+ 0.02416008704845817,
+ 0.01682801671671721,
+ 0.01133824217562598,
+ 0.007388666604117344,
+ 0.00463662367083644,
+ 0.0028229603572851,
+ 0.0016683044635776747,
+ 9.635956927508837E-4,
+ 5.348171044051668E-4,
+ 2.9094196693473255E-4,
+ 1.5077313110889825E-4,
+ 7.44648624027892E-5,
+ 3.401905668749898E-5,
+ 1.4008303432672257E-5,
+ 4.993065975616864E-6,
+ 1.5067150836994797E-6,
+ 3.540135988126144E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.08723799512304443,
- 0.06581562207023935,
- 0.04807392701104474,
- 0.03409402467179439,
- 0.023127784976379094,
- 0.015192253486286018,
- 0.009568028782612537,
- 0.0057649512074877726,
- 0.0033438874658604572,
- 0.0018660267533230908,
- 0.0010059800226474968,
- 5.23936290832959E-4,
- 2.630570210022674E-4,
- 1.2659826495025258E-4,
- 5.7771160859745676E-5,
- 2.4501267314068323E-5,
- 9.477521675844412E-6,
- 3.2427236312290734E-6,
- 9.362399575687823E-7,
- 2.1770787463930905E-7
+ 0.08886831144395448,
+ 0.06722821428378925,
+ 0.04924969841761654,
+ 0.03503606424814535,
+ 0.023845100204003614,
+ 0.015713489353523413,
+ 0.009925726029681668,
+ 0.005995836777716232,
+ 0.003484458535572375,
+ 0.001946403812369028,
+ 0.001049267320600084,
+ 5.460673680624998E-4,
+ 2.739824233379324E-4,
+ 1.3190922772288193E-4,
+ 6.032717892477629E-5,
+ 2.5692152133233583E-5,
+ 9.997262783478716E-6,
+ 3.445647878080917E-6,
+ 1.003556584490607E-6,
+ 2.3588709999547763E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
index bf0f8218..2e77b00a 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.028716965168263994,
- 0.018864879945157037,
- 0.012214410336495216,
- 0.007811378755969861,
- 0.004958072843068912,
- 0.003043025415774655,
- 0.001801194832614685,
- 9.781389973660458E-4,
- 4.7742196077964286E-4,
- 2.0200548219504228E-4,
- 7.245783442942089E-5,
- 2.1673952969917555E-5,
- 5.473081124101164E-6,
- 1.3049230514184373E-6,
- 3.3962316473445227E-7,
- 1.068336755836243E-7,
- 2.9773479240922238E-8,
- 6.96294385267799E-9,
- 1.2649325781181E-9,
- 1.588845239012672E-10
+ 0.02930250686567334,
+ 0.019233822546771275,
+ 0.012437519569268952,
+ 0.007943053363374091,
+ 0.005036823775130411,
+ 0.003088545396341212,
+ 0.0018240339380993671,
+ 9.863364246527212E-4,
+ 4.788685724854565E-4,
+ 2.0147283907850737E-4,
+ 7.188471699970609E-5,
+ 2.1435379649798053E-5,
+ 5.402627069789143E-6,
+ 1.2894199241754067E-6,
+ 3.332495810319067E-7,
+ 1.0429326403589997E-7,
+ 2.8968351706207745E-8,
+ 6.775266679865261E-9,
+ 1.2391794440884722E-9,
+ 1.5889885276558282E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.007107163927520147,
- 0.005044374961729101,
- 0.003609809200168233,
- 0.0025666128264968625,
- 0.0017569962891242118,
- 0.0011261235004660468,
- 6.477313305370014E-4,
- 3.2517381929822984E-4,
- 1.3834151213638158E-4,
- 4.8210341748522806E-5,
- 1.3350914739802084E-5,
- 2.815121551487124E-6,
- 4.3883529699940863E-7,
- 5.3884401669757375E-8,
- 9.528067482900414E-9,
- 2.3812872717611815E-9,
- 5.049535398817941E-10,
- 8.505766114071679E-11,
- 9.73592949644057E-12,
- 5.151390743421166E-13
+ 0.007308594580784813,
+ 0.00517090719889214,
+ 0.003695518210813432,
+ 0.00263005159920733,
+ 0.0018041539623297133,
+ 0.0011586465140538862,
+ 6.680066517146175E-4,
+ 3.3647064458218446E-4,
+ 1.437359999819199E-4,
+ 5.038223968467132E-5,
+ 1.4087529520351189E-5,
+ 3.0050248312461092E-6,
+ 4.779551279211009E-7,
+ 6.096533579484997E-8,
+ 9.965366888357395E-9,
+ 2.4847888351285426E-9,
+ 5.327784243810883E-10,
+ 9.164098389605401E-11,
+ 1.0981561813431184E-11,
+ 6.736137313158131E-13
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.03512167414485821,
- 0.023211200244723885,
- 0.015217197102548954,
- 0.009865315238999509,
- 0.006289381662803265,
- 0.0038894953821493636,
- 0.0022910218368709483,
- 0.001260192555991699,
- 6.54481781964068E-4,
- 3.269742624513814E-4,
- 1.630674180376065E-4,
- 8.13742638104441E-5,
- 4.1615464268291055E-5,
- 2.0807623886807524E-5,
- 1.0011415068320185E-5,
- 4.446870712243829E-6,
- 1.7683274720331918E-6,
- 6.028249709072294E-7,
- 1.7201583835604052E-7,
- 3.75211570740117E-8
+ 0.037669977954815505,
+ 0.024989522466139197,
+ 0.01642708812183253,
+ 0.010677012244352933,
+ 0.006830694354346446,
+ 0.0042453213895686836,
+ 0.002517208704940195,
+ 0.0013962096375984728,
+ 7.321707904140069E-4,
+ 3.6928247818871017E-4,
+ 1.8537528817284785E-4,
+ 9.281196907430061E-5,
+ 4.762550645738324E-5,
+ 2.3992144007753574E-5,
+ 1.1701376299782872E-5,
+ 5.304651362316253E-6,
+ 2.16844446931519E-6,
+ 7.66416894919923E-7,
+ 2.2907404835730657E-7,
+ 5.3225820824990693E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.06640900091125869,
- 0.044815525968214455,
- 0.029290247316263212,
- 0.018772343014893268,
- 0.011679854583179553,
- 0.007173629474797434,
- 0.00425288705486399,
- 0.0023828398674352216,
- 0.0012464263395316189,
- 6.01424459602623E-4,
- 2.7052055821085276E-4,
- 1.162983441526353E-4,
- 4.94038659917164E-5,
- 2.1122171127527722E-5,
- 8.964616707914119E-6,
- 3.6358487148704516E-6,
- 1.3600293356155483E-6,
- 4.5115073416879813E-7,
- 1.2580596052631427E-7,
- 2.797522406995332E-8
+ 0.06784766275558174,
+ 0.04588320924552555,
+ 0.0300420131038493,
+ 0.019281427567997615,
+ 0.012009835075623202,
+ 0.007380030797458252,
+ 0.004372162980007942,
+ 0.002444840212905121,
+ 0.0012768516734261303,
+ 6.166800366652562E-4,
+ 2.78463138991392E-4,
+ 1.2035611875714347E-4,
+ 5.137395424589845E-5,
+ 2.2035927827284534E-5,
+ 9.386598016702359E-6,
+ 3.828407233221604E-6,
+ 1.4426801870481938E-6,
+ 4.826916311120221E-7,
+ 1.3597711699799012E-7,
+ 3.0617836538699836E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
index b3eb10f4..ebc83972 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
@@ -23,21 +23,21 @@
1.7119945007591924
],
"ys": [
- 0.8508823501873471,
- 0.6362479018786753,
- 0.46039596162962104,
- 0.3220795555417366,
- 0.21836720036635332,
- 0.14115897438850056,
- 0.08834840604348759,
- 0.05256618870852907,
- 0.03006532139482958,
- 0.016449238686732204,
+ 0.8508905931428049,
+ 0.6362549828841949,
+ 0.4604009488317478,
+ 0.3220823807025353,
+ 0.2183685157720076,
+ 0.14115946827976933,
+ 0.08834852782816782,
+ 0.05256620024135661,
+ 0.030065321394829585,
+ 0.016449238686732197,
0.008610533296298387,
- 0.004303026654814006,
+ 0.004303026654814005,
0.002036314331320236,
8.913086969719304E-4,
- 3.4850684837222815E-4,
+ 3.485068483722282E-4,
1.1735530531010676E-4,
3.115196177071226E-5,
5.9794899062739556E-6,
@@ -69,18 +69,18 @@
0.7929925155296614
],
"ys": [
- 0.24162600424950834,
- 0.17324782588583593,
- 0.12004039748855105,
- 0.08001276069415411,
- 0.05113015088619405,
- 0.031629091774935524,
- 0.018800189808474442,
- 0.010705264524774973,
- 0.005718451192547019,
- 0.0027819034952029395,
- 0.001213999647974942,
- 4.6900134842306555E-4,
+ 0.24162165111212702,
+ 0.1732481043219789,
+ 0.12004452144978776,
+ 0.08001992109350392,
+ 0.05113934255828703,
+ 0.03163824900176549,
+ 0.018807176214406744,
+ 0.01070933677666942,
+ 0.0057202659807477595,
+ 0.0027825214895799643,
+ 0.0012141296010955097,
+ 4.690106925068663E-4,
1.5703844113263544E-4,
4.659853713750058E-5,
1.143447812425923E-5,
@@ -115,13 +115,13 @@
1.6428726885203377
],
"ys": [
- 1.0464713689256497,
- 0.8245698443831144,
- 0.6351387648271697,
- 0.47781772004755063,
- 0.35077579577833734,
- 0.2501704129684613,
- 0.17207971830075336,
+ 1.0464783460591496,
+ 0.8245731091219373,
+ 0.6351400063864653,
+ 0.47781809109160045,
+ 0.3507758590537291,
+ 0.2501704156952671,
+ 0.1720797183007534,
0.11258566954086907,
0.069779926663667,
0.04058078433037053,
@@ -131,7 +131,7 @@
0.0023427795072542995,
9.329079510754943E-4,
3.138981142332354E-4,
- 8.292800980163755E-5,
+ 8.292800980163756E-5,
1.546222737757504E-5,
1.7562332760101382E-6,
6.578005869366081E-8
@@ -161,14 +161,14 @@
1.998773638612381
],
"ys": [
- 1.2376009989412806,
- 1.0065152943796163,
- 0.7961282134974924,
- 0.6165953425840623,
- 0.4643269330444907,
+ 1.2376055858492563,
+ 1.0065172718334012,
+ 0.7961288874909882,
+ 0.6165954943833719,
+ 0.4643269498044702,
0.3433448581508086,
0.24660682353242033,
- 0.17053653883549272,
+ 0.1705365388354927,
0.11296630892301329,
0.07092556642480097,
0.04198013851455218,
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
index 7682dada..436bc591 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.09850176713422258,
- 0.07312729909012128,
- 0.053083971847307516,
- 0.03768446624790958,
- 0.026308083440955563,
- 0.017908090437867646,
- 0.012160029178287752,
- 0.008222905743560023,
- 0.005692879397239758,
- 0.004103797821185542,
- 0.00310696917101462,
- 0.00242155831014419,
- 0.0018544111891025147,
- 0.0013192248814640894,
- 8.294421357236949E-4,
- 4.468168964229127E-4,
- 1.9751472450576986E-4,
- 7.082379863370093E-5,
- 1.954456149631417E-5,
- 3.883579528655611E-6
+ 0.09951119970155764,
+ 0.0738267491391378,
+ 0.05354013885817614,
+ 0.03796232337341571,
+ 0.026465251167513047,
+ 0.017986077710716235,
+ 0.01219126800530437,
+ 0.008228296560609439,
+ 0.005687308767636967,
+ 0.004096376932133681,
+ 0.0031024575887551903,
+ 0.002421316581197009,
+ 0.0018564267540191806,
+ 0.0013189022160272617,
+ 8.243237172624115E-4,
+ 4.3976120572199396E-4,
+ 1.9239077760538776E-4,
+ 6.846999206496323E-5,
+ 1.8800253715148272E-5,
+ 3.7908195425666665E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.020226805685536926,
- 0.014456993690890863,
- 0.010311275339298471,
- 0.007410282372372471,
- 0.005420242154345008,
- 0.004112202045405045,
- 0.0032598918457679518,
- 0.002705601389828671,
- 0.002295628152726618,
- 0.0019097284302627905,
- 0.0014958430610445951,
- 0.0010702048038474618,
- 6.794014527943355E-4,
- 3.7774483998026975E-4,
- 1.7431530417571852E-4,
- 6.676688108364841E-5,
- 2.0109234802493648E-5,
- 4.489749073748097E-6,
- 6.692421223948756E-7,
- 4.398566361226214E-8
+ 0.020864703825216543,
+ 0.014883320949954686,
+ 0.010588075445941555,
+ 0.00758472230838494,
+ 0.005526357357488927,
+ 0.004175126606083015,
+ 0.0032971732701671513,
+ 0.002730472944710007,
+ 0.002316912715712928,
+ 0.001930147781735094,
+ 0.0015123877399648824,
+ 0.0010801182219506915,
+ 6.840492757482224E-4,
+ 3.800488761752057E-4,
+ 1.7576708224456217E-4,
+ 6.775240749568076E-5,
+ 2.0676938769298375E-5,
+ 4.7310019159254084E-6,
+ 7.338888376337273E-7,
+ 5.801441169431762E-8
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.1886054256128138,
- 0.16275334197403096,
- 0.1375539746389188,
- 0.11317989772270942,
- 0.09047602199495318,
- 0.07032705935347143,
- 0.05330210287581899,
- 0.03936547661127352,
- 0.028495426301947083,
- 0.02022888255013566,
- 0.014163984801627954,
- 0.00972284422318302,
- 0.00669613851628052,
- 0.004611542864451254,
- 0.0031961056744538668,
- 0.0021516250421904108,
- 0.0013255803040000025,
- 6.922864839444246E-4,
- 2.910424437563199E-4,
- 9.1222326385548E-5
+ 0.19358450963383222,
+ 0.16783275289518165,
+ 0.14265152324165986,
+ 0.1181277009268382,
+ 0.09506146859653601,
+ 0.07436151335900087,
+ 0.056677190488681556,
+ 0.0420595432446245,
+ 0.03056904223445797,
+ 0.02177706159177475,
+ 0.01529218382151097,
+ 0.010516957894459986,
+ 0.007243973747434023,
+ 0.004982928470226585,
+ 0.0034565783085767077,
+ 0.002346063716447798,
+ 0.0014721030439228656,
+ 7.918745135333551E-4,
+ 3.472152435140596E-4,
+ 1.1533027792975817E-4
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.2247037054289303,
- 0.193908440548556,
- 0.16314578939913846,
- 0.1334721570174714,
- 0.10507322983912896,
- 0.08032395568597925,
- 0.05946486765538283,
- 0.04271278496721389,
- 0.02994450769081548,
- 0.02049663560278264,
- 0.013767300330333571,
- 0.009150639601752166,
- 0.006113656085200024,
- 0.004178588006264202,
- 0.0029323165891444636,
- 0.0020530705614679986,
- 0.0013503046278127765,
- 7.713251130950329E-4,
- 3.56347398385302E-4,
- 1.274105453063015E-4
+ 0.22699378997834666,
+ 0.19634320230290608,
+ 0.16567382771316988,
+ 0.13597830340714262,
+ 0.10740227227574736,
+ 0.08234327188984952,
+ 0.06109867435252183,
+ 0.043953898328798285,
+ 0.030839891751342517,
+ 0.0211129464108586,
+ 0.014174035605948657,
+ 0.00940904871287599,
+ 0.006272967131363689,
+ 0.004275475470040996,
+ 0.0029930025300042716,
+ 0.002096187791862245,
+ 0.0013859257466028686,
+ 7.996304271729448E-4,
+ 3.7456242996062347E-4,
+ 1.3637100099286078E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
index 6e4be2b9..dc1b8b50 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.03173858014171649,
- 0.02133978097234913,
- 0.013891736155355617,
- 0.008702871323317575,
- 0.005257010814937978,
- 0.003005434084977266,
- 0.0016656813512850115,
- 8.787709846342374E-4,
- 4.498223032784642E-4,
- 2.233768838664674E-4,
- 1.0813164329057997E-4,
- 5.087678520362409E-5,
- 2.300091442331659E-5,
- 9.796473238506978E-6,
- 3.834226566465003E-6,
- 1.3526179722084804E-6,
- 4.056159377784702E-7,
- 1.0159328170663663E-7,
- 1.9836200055587848E-8,
- 2.6881101620063556E-9
+ 0.03228216300274973,
+ 0.02169444446375871,
+ 0.014110347550223262,
+ 0.00882751767431957,
+ 0.00532185250002995,
+ 0.0030346406766263304,
+ 0.0016766924780268503,
+ 8.813500874308559E-4,
+ 4.4934599943276786E-4,
+ 2.2224753386676833E-4,
+ 1.071835789029853E-4,
+ 5.026551464839312E-5,
+ 2.2653907253397397E-5,
+ 9.615756613894237E-6,
+ 3.749110922441141E-6,
+ 1.31741788829062E-6,
+ 3.938264111067174E-7,
+ 9.859447596158405E-8,
+ 1.9365366997441546E-8,
+ 2.676618056578667E-9
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.006102507905851109,
- 0.0038990679741256196,
- 0.002382642687892061,
- 0.0013866376337003201,
- 7.624471722655167E-4,
- 3.991905113937745E-4,
- 1.9772432210500465E-4,
- 9.426079143655626E-5,
- 4.351161422788669E-5,
- 1.9358718499170794E-5,
- 8.303052242177256E-6,
- 3.392588970076056E-6,
- 1.2851573724623573E-6,
- 4.5199061406267786E-7,
- 1.3712336694696286E-7,
- 3.595587559990004E-8,
- 7.519232998092494E-9,
- 1.1793297231150324E-9,
- 1.1536327397598236E-10,
- 4.625232359646363E-12
+ 0.006331709201966166,
+ 0.004042393483337867,
+ 0.0024681766743942725,
+ 0.0014352569213601715,
+ 7.887370742522316E-4,
+ 4.1288588497422735E-4,
+ 2.045292912620555E-4,
+ 9.751567490376359E-5,
+ 4.499197918960451E-5,
+ 1.9991835462282634E-5,
+ 8.557655461943175E-6,
+ 3.491555631834133E-6,
+ 1.321702830304972E-6,
+ 4.6545168448217615E-7,
+ 1.4180079958516691E-7,
+ 3.7499704340625264E-8,
+ 7.964194537676365E-9,
+ 1.2834012297195207E-9,
+ 1.3325331266233647E-10,
+ 6.059360389852442E-12
]
},
"Peak Ground Acceleration": {
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.05342243495557418,
- 0.040209204955540825,
- 0.029855756453638554,
- 0.02172662045040689,
- 0.015451553016538822,
- 0.010719211766649875,
- 0.007246477944950602,
- 0.004745418573916584,
- 0.003022716765787055,
- 0.0018683872030052023,
- 0.0011249844803513092,
- 6.479801770598048E-4,
- 3.6279631183164457E-4,
- 1.9167743860676632E-4,
- 9.542969065914748E-5,
- 4.345606760626724E-5,
- 1.7643414726447324E-5,
- 6.133767088181088E-6,
- 1.7849365683808552E-6,
- 3.978894235967972E-7
+ 0.05616354801707976,
+ 0.042445776947525535,
+ 0.03166311848696229,
+ 0.02316907842540173,
+ 0.01658213856542544,
+ 0.011582646512345428,
+ 0.00788475664105065,
+ 0.005198513271843024,
+ 0.003332516377575164,
+ 0.0020723389886862648,
+ 0.0012551299641809816,
+ 7.27650026313368E-4,
+ 4.1064191652640116E-4,
+ 2.1934928871241493E-4,
+ 1.1086277728687971E-4,
+ 5.152265242506757E-5,
+ 2.1484363596877195E-5,
+ 7.731947342312263E-6,
+ 2.351696376212944E-6,
+ 5.565855356685591E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.0807952569242842,
- 0.06087728727306617,
- 0.044629057123178204,
- 0.03192630207801098,
- 0.021985425373050812,
- 0.014766339179658408,
- 0.009589023782390913,
- 0.006007638535599829,
- 0.003647104927806794,
- 0.002138717977256336,
- 0.0012124137077166007,
- 6.62654232261169E-4,
- 3.477499606200942E-4,
- 1.7398642420530906E-4,
- 8.203255085018508E-5,
- 3.5712179306848327E-5,
- 1.408866074027418E-5,
- 4.889784000529995E-6,
- 1.4261978938027705E-6,
- 3.339970262028063E-7
+ 0.08222117954518196,
+ 0.06210136972726536,
+ 0.04564661933026527,
+ 0.03274859845444325,
+ 0.022624120419484105,
+ 0.015244174613303345,
+ 0.009928953032564428,
+ 0.006236101995232572,
+ 0.0037924833440789083,
+ 0.0022261080656985842,
+ 0.0012622646580580288,
+ 6.898498913512979E-4,
+ 3.6211816534434225E-4,
+ 1.814107148057998E-4,
+ 8.577158021798385E-5,
+ 3.7503753939215593E-5,
+ 1.4882215882633175E-5,
+ 5.202394358533591E-6,
+ 1.5305685300539333E-6,
+ 3.6230729475266516E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
index 36289ba6..72701c63 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
@@ -23,22 +23,22 @@
1.7119945007591924
],
"ys": [
- 0.4475846033759181,
- 0.3134392311924985,
- 0.21100103478140925,
- 0.13624546359391296,
- 0.08506227171193938,
- 0.050930598806163255,
- 0.030158159091716923,
- 0.017456250416622635,
- 0.010023495239063,
- 0.0056433475292230065,
- 0.003057066831819484,
- 0.001541731293160766,
- 6.949253604013826E-4,
- 2.6863199316272E-4,
- 8.507502823172053E-5,
- 2.0835932202264287E-5,
+ 0.44758315628925305,
+ 0.31343397006840795,
+ 0.21099366942752606,
+ 0.1362394822338189,
+ 0.08506138005908029,
+ 0.05093656181863268,
+ 0.030169141954248434,
+ 0.01746847371498503,
+ 0.010033488801043709,
+ 0.0056497007233725464,
+ 0.003060265719278319,
+ 0.001542998519233507,
+ 6.952891396067852E-4,
+ 2.686945943971162E-4,
+ 8.507630913142845E-5,
+ 2.0835933865178485E-5,
3.3559684855157995E-6,
2.8064858610885874E-7,
4.451769096210394E-9,
@@ -69,20 +69,20 @@
0.7929925155296614
],
"ys": [
- 0.11454312605927199,
- 0.07774977737128347,
- 0.05111873766856916,
- 0.032564050475628284,
- 0.020001855395237383,
- 0.01190823141989159,
- 0.006785839006910068,
- 0.003689766411235815,
- 0.0018778709350906041,
- 8.678782554827404E-4,
- 3.5518422155049847E-4,
- 1.2455086316643806E-4,
- 3.5566198683860574E-5,
- 8.159419258458494E-6,
+ 0.11453583778594098,
+ 0.07773983596908107,
+ 0.05110841240871493,
+ 0.032556961738406706,
+ 0.020001207059032723,
+ 0.011915037055802187,
+ 0.006798024887215778,
+ 0.0037028166485368764,
+ 0.001887941818842478,
+ 8.737078701629814E-4,
+ 3.5773562954361584E-4,
+ 1.253794283893188E-4,
+ 3.5733754214912446E-5,
+ 8.173634163930564E-6,
1.2251021309367327E-6,
1.0484430247693849E-7,
3.920291953879094E-9,
@@ -115,23 +115,23 @@
1.6428726885203377
],
"ys": [
- 0.49236908617846603,
- 0.3541925608742514,
- 0.24922192065983623,
- 0.17194027435257983,
- 0.1170161518528752,
- 0.07880191470231797,
- 0.052392617713349486,
- 0.03395479216015905,
- 0.021343253364080148,
- 0.012870263274909758,
- 0.007419090030026814,
- 0.00394739831552725,
- 0.0019166475898031736,
- 7.886854748360648E-4,
- 2.663552666586273E-4,
- 6.913066068129533E-5,
- 1.2761441291611963E-5,
+ 0.4923643117865549,
+ 0.35418499070961595,
+ 0.24921804469579698,
+ 0.17194588093518115,
+ 0.11703232276176682,
+ 0.07882444520723621,
+ 0.05241512648114207,
+ 0.03397242253370193,
+ 0.02135445068983302,
+ 0.012876126411924657,
+ 0.007421614615162034,
+ 0.0039482427967283355,
+ 0.0019168628221126964,
+ 7.88723720144396E-4,
+ 2.6635581342608226E-4,
+ 6.913069658260931E-5,
+ 1.2761442701824537E-5,
1.4751175404686563E-6,
8.80425288533516E-8,
1.282664681878661E-10
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.6216532405946646,
- 0.46272644211304453,
- 0.3343622489438483,
- 0.23714631355626206,
- 0.16431040627752377,
- 0.11340616476478484,
- 0.07743363519310616,
- 0.05203557685595775,
- 0.034290455737858286,
- 0.02190858742027236,
- 0.013479714609487702,
- 0.00792349635428749,
- 0.004391048350590266,
- 0.002231861061172497,
- 9.995799121306317E-4,
- 3.7669134676994497E-4,
- 1.1508171621894027E-4,
- 2.68345941924452E-5,
- 4.287383926678435E-6,
+ 0.621651616280828,
+ 0.4627229246430731,
+ 0.3343603321575087,
+ 0.23715028646294195,
+ 0.16432264185151596,
+ 0.11342499548406948,
+ 0.07745480288939663,
+ 0.0520544966657712,
+ 0.0343043453455725,
+ 0.021917106890683047,
+ 0.013484088261146755,
+ 0.007925372358004296,
+ 0.004391699534407985,
+ 0.0022320343214388594,
+ 9.996141700776586E-4,
+ 3.766930924228117E-4,
+ 1.15081991463467E-4,
+ 2.6834613650338606E-5,
+ 4.287384891136646E-6,
3.8934883651109496E-7
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
index 1518a288..da60e9e4 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
@@ -23,25 +23,25 @@
1.7119945007591924
],
"ys": [
- 0.11130094220045068,
- 0.08076677570122351,
- 0.05722148473553047,
- 0.03963349320771064,
- 0.02698098163287568,
- 0.017850721458831903,
- 0.01174520773124128,
- 0.007678049229037662,
- 0.005126831047286601,
- 0.003501302162770975,
- 0.0023922966629531177,
- 0.0015609412173680857,
- 9.216413065891488E-4,
- 4.696083436199915E-4,
- 1.986253448291123E-4,
- 6.761927782939845E-5,
- 1.6932493024728407E-5,
- 2.7390147868540693E-6,
- 1.9938391276229874E-7,
+ 0.11219062806382002,
+ 0.08136116621299684,
+ 0.057588376494762256,
+ 0.03984083064004612,
+ 0.027086793991339113,
+ 0.017896089691595216,
+ 0.01176007590330992,
+ 0.007679547190547581,
+ 0.005124322088692943,
+ 0.0034987257678005504,
+ 0.002390722151677018,
+ 0.0015602301294830399,
+ 9.213966703206518E-4,
+ 4.695473803388451E-4,
+ 1.9861620390431518E-4,
+ 6.761889742944627E-5,
+ 1.6932594148528005E-5,
+ 2.739024975351579E-6,
+ 1.99384058074484E-7,
6.133478748372659E-10
]
},
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.032509119401939554,
- 0.02393090948313386,
- 0.017200050940302872,
- 0.012041991296390504,
- 0.008199167144515544,
- 0.005482561246852691,
- 0.003589819997276718,
- 0.002308264821614951,
- 0.0014349471872017092,
- 8.34035985621716E-4,
- 4.376768443464131E-4,
- 2.0012377124111334E-4,
- 7.68275935454949E-5,
- 2.4474978399149564E-5,
- 5.824078563907241E-6,
- 1.0104254474502878E-6,
- 9.323149237023285E-8,
+ 0.032846032732945354,
+ 0.0241311063778409,
+ 0.01731693110978408,
+ 0.012109528327628277,
+ 0.008237764670077845,
+ 0.005504440846782306,
+ 0.0036016864827614534,
+ 0.0023142363739126993,
+ 0.0014376474568956162,
+ 8.351068294160268E-4,
+ 4.3803665010517774E-4,
+ 2.0022481582228469E-4,
+ 7.685335839804295E-5,
+ 2.4480474659544813E-5,
+ 5.824972111228888E-6,
+ 1.0105290346523259E-6,
+ 9.323911400399542E-8,
1.8015679867281317E-9,
0.0,
0.0
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.1518690130188437,
- 0.11632439012311155,
- 0.0861981278754339,
- 0.06177240482401042,
- 0.04303374915551782,
- 0.029290630408524483,
- 0.01953817139931182,
- 0.012778226345862159,
- 0.008368974319197935,
- 0.005613375089418224,
- 0.003917455242324175,
- 0.0027475269741797453,
- 0.0018358792259366326,
- 0.0010585855083360335,
- 4.958532204181748E-4,
- 1.7765378688379245E-4,
- 4.631769142386964E-5,
- 7.776346852799237E-6,
- 7.321846059611325E-7,
- 2.3316840793449853E-8
+ 0.15616098874332257,
+ 0.12023459074048819,
+ 0.08951793883685896,
+ 0.0643736490969486,
+ 0.04490372238613757,
+ 0.03052183379433142,
+ 0.02028142893900737,
+ 0.013186856532992087,
+ 0.008574557941570738,
+ 0.005707483800944755,
+ 0.003956804062133904,
+ 0.002762061920398077,
+ 0.0018407776069366598,
+ 0.001060029646632489,
+ 4.96235492983749E-4,
+ 1.777411667722178E-4,
+ 4.633409420282317E-5,
+ 7.778631688248642E-6,
+ 7.323715360050092E-7,
+ 2.3321880112261687E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.20166702354774013,
- 0.16160084749247716,
- 0.1244192194969577,
- 0.09241815681362486,
- 0.06575425030346817,
- 0.04566994409796748,
- 0.030914416242860204,
- 0.020452242747243332,
- 0.013372050811850987,
- 0.00875704266836266,
- 0.005879873504406088,
- 0.004093401979108478,
- 0.0028976037674082866,
- 0.001971540082246526,
- 0.0011986374031853074,
- 6.095534573924074E-4,
- 2.4887756358368666E-4,
- 7.87040412473546E-5,
- 1.773819528482079E-5,
- 2.4514947455994724E-6
+ 0.203399413046392,
+ 0.16334667148122212,
+ 0.12605571464170895,
+ 0.0938299472697991,
+ 0.06685790942740351,
+ 0.046455165497458935,
+ 0.031418956099617645,
+ 0.02074339930979353,
+ 0.013522851366001096,
+ 0.008826201302719895,
+ 0.005907618928934665,
+ 0.004102933505185476,
+ 0.002900333450799796,
+ 0.0019721759361140665,
+ 0.0011987605604396085,
+ 6.09579063605728E-4,
+ 2.488851773963609E-4,
+ 7.87063080678014E-5,
+ 1.7738628229625174E-5,
+ 2.451528866751669E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
index 14e50836..c7cda2d7 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.7840745950193878,
- 0.5702718287716494,
- 0.3997971350379117,
- 0.2715542629587968,
- 0.18068031139646856,
- 0.11679081873486646,
- 0.07490310091605154,
- 0.046888511954231674,
- 0.028815662954150976,
- 0.017120190032723144,
- 0.009653111403164615,
- 0.005020801502225727,
- 0.002324152060070731,
- 9.193964272868024E-4,
- 2.965560898564296E-4,
- 7.425555422157574E-5,
- 1.1662469542011495E-5,
- 7.471407239630221E-7,
- 4.327900445257619E-9,
- 4.280870815036898E-11
+ 0.7840792958357126,
+ 0.570271477930002,
+ 0.3997920979273062,
+ 0.27154728805961204,
+ 0.18067619164879603,
+ 0.11679381963461244,
+ 0.07491329313542516,
+ 0.04690206163810373,
+ 0.028827665123179025,
+ 0.01712806090645836,
+ 0.009657094042862528,
+ 0.005022365285392485,
+ 0.0023245854964766776,
+ 9.194395889477443E-4,
+ 2.96556428302761E-4,
+ 7.425560831786152E-5,
+ 1.166247584779013E-5,
+ 7.471412163534519E-7,
+ 4.3279167431140406E-9,
+ 4.280873108034358E-11
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,20 +69,20 @@
0.7929925155296614
],
"ys": [
- 0.19738243542428757,
- 0.14168220877374643,
- 0.10008332912286685,
- 0.06914243671013488,
- 0.0462990135844667,
- 0.030155590303921745,
- 0.01904155553388089,
- 0.011808350337992548,
- 0.007180833363224791,
- 0.0041853531191431105,
- 0.0022659598771207212,
- 0.0010946630897325576,
- 4.501517230572789E-4,
- 1.5548159304975556E-4,
+ 0.19737725723060076,
+ 0.14167392814030727,
+ 0.1000735687028775,
+ 0.06913466477420804,
+ 0.04629703682008683,
+ 0.03016130988053569,
+ 0.01905339321032749,
+ 0.011821726132656044,
+ 0.007191497131363449,
+ 0.004191663259646285,
+ 0.0022687622094379853,
+ 0.0010955821194918594,
+ 4.503449911691632E-4,
+ 1.554941789994681E-4,
4.092510252141889E-5,
7.735880848280358E-6,
8.459968703624985E-7,
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.0099380776225448,
- 0.7870746947750729,
- 0.5917835457036492,
- 0.4286714548737322,
- 0.3005220866273447,
- 0.2053384578230158,
- 0.1376613122533619,
- 0.09034223112308178,
- 0.05814626712059648,
- 0.03628844636175918,
- 0.02164309463283226,
- 0.01172836158460607,
- 0.0056517850617297,
- 0.0022426443773611725,
- 7.045248541384342E-4,
- 1.6082909766016313E-4,
- 2.327505352594275E-5,
- 1.370176499870282E-6,
- 9.774880018276357E-9,
- 1.8250003057916266E-11
+ 1.009945713933737,
+ 0.7870730818310325,
+ 0.5917781051338804,
+ 0.4286714461728347,
+ 0.3005342187890384,
+ 0.20536165714564114,
+ 0.1376880846634855,
+ 0.09036470830717071,
+ 0.05816091650332607,
+ 0.03629607249772069,
+ 0.021646342026407937,
+ 0.011729393802703455,
+ 0.005652023737509684,
+ 0.002242674662706468,
+ 7.045277174480408E-4,
+ 1.6082975617291614E-4,
+ 2.3275180260526425E-5,
+ 1.370195731533504E-6,
+ 9.777032019450746E-9,
+ 1.8381786162556644E-11
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.1978787330044776,
- 0.9725493883514309,
- 0.760415627009683,
- 0.5747750268719304,
- 0.41694788196629506,
- 0.2952856296658587,
- 0.2038317231669151,
- 0.13758259431202174,
- 0.09137864375857647,
- 0.05948995920820008,
- 0.03771568209853715,
- 0.022851664183984956,
- 0.0128307329888723,
- 0.006423615826395934,
- 0.002754636969832231,
- 9.660023791878227E-4,
- 2.650171050331252E-4,
- 5.285265419070352E-5,
- 6.156763722409572E-6,
- 2.426143559370607E-7
+ 1.1978892623218658,
+ 0.972554067197059,
+ 0.7604158271422083,
+ 0.5747764249664208,
+ 0.41695680521855377,
+ 0.2953040755778424,
+ 0.20385617337747586,
+ 0.13760653261438704,
+ 0.09139699348778993,
+ 0.059501303229358385,
+ 0.03772148070722519,
+ 0.02285410525504485,
+ 0.012831548165020377,
+ 0.006423825025548404,
+ 0.0027546732866539254,
+ 9.660091565320799E-4,
+ 2.6501898299973196E-4,
+ 5.285310989370653E-5,
+ 6.156857250790722E-6,
+ 2.426297318609395E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
index f90a8619..5d2d415e 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.1997793016971402,
- 0.1585250728790603,
- 0.12116908078405636,
- 0.08910831230443658,
- 0.06333736560966338,
- 0.043093389988133696,
- 0.028580388460289784,
- 0.01821735738362719,
- 0.011232277968926126,
- 0.00660873652693667,
- 0.0036548832126260646,
- 0.001860604963475091,
- 8.510413673500249E-4,
- 3.398793501338172E-4,
- 1.1435202682716995E-4,
- 3.114357779727954E-5,
- 6.088655157703063E-6,
- 7.136500417299364E-7,
- 3.366155503095819E-8,
- 1.3844856748009016E-11
+ 0.1997389806427844,
+ 0.1585298074791236,
+ 0.1212138164683868,
+ 0.08918096544216074,
+ 0.06342313894179459,
+ 0.04317988217339534,
+ 0.028660183869052287,
+ 0.01828856000840496,
+ 0.011296977081124367,
+ 0.0066685161144636965,
+ 0.0037076653672831706,
+ 0.0019018949258998673,
+ 8.782822985656294E-4,
+ 3.5470340601554193E-4,
+ 1.2095047756161142E-4,
+ 3.3511667861091996E-5,
+ 6.698878116694425E-6,
+ 8.106115023642434E-7,
+ 3.682746418780954E-8,
+ 3.0939572882472664E-11
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,22 +69,22 @@
0.7929925155296614
],
"ys": [
- 0.0580447645966596,
- 0.041635106894742896,
- 0.02901816422632226,
- 0.019653876323849274,
- 0.01290147258386847,
- 0.008269880789363748,
- 0.005139400897507957,
- 0.0030906591428687662,
- 0.001759818741168408,
- 9.163676483739544E-4,
- 4.241153350881834E-4,
- 1.6920630749182736E-4,
- 5.555488821491962E-5,
- 1.4850334291205169E-5,
- 2.864010177404086E-6,
- 3.285886171809985E-7,
+ 0.05809098442508577,
+ 0.041678011249697784,
+ 0.029059195412463153,
+ 0.019692874566634464,
+ 0.012936902557568889,
+ 0.008300626204522455,
+ 0.005165893238189197,
+ 0.0031144664328682835,
+ 0.0017812755767382163,
+ 9.336063942979704E-4,
+ 4.353473197267363E-4,
+ 1.7486430123953454E-4,
+ 5.770915628602038E-5,
+ 1.5454000288929567E-5,
+ 2.9483467866587175E-6,
+ 3.2869706081783286E-7,
6.7005888291790454E-9,
5.614225022270342E-12,
0.0,
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.2587420597377019,
- 0.22244160588962886,
- 0.18549632936654387,
- 0.14915756586956203,
- 0.11524845788405014,
- 0.08535758478613292,
- 0.06048171651688572,
- 0.040719619314481384,
- 0.0261144666658724,
- 0.015891005679034485,
- 0.009175388129728776,
- 0.004885429051556261,
- 0.002409202891544041,
- 0.0010395594741382048,
- 3.8214957132823714E-4,
- 1.1226052751016851E-4,
- 2.4609229150341756E-5,
- 3.511134604280924E-6,
- 2.8182370150762684E-7,
- 6.626616132457025E-9
+ 0.2585600929853115,
+ 0.2223075038597108,
+ 0.185425836275836,
+ 0.1491593240239087,
+ 0.11532020565667628,
+ 0.08548442546024063,
+ 0.06064094410200331,
+ 0.04089032182432567,
+ 0.02628328549900423,
+ 0.016050522954441704,
+ 0.009318609418554282,
+ 0.00500344585856705,
+ 0.0024964503032175326,
+ 0.0010955928865533596,
+ 4.1310563766310687E-4,
+ 1.2661609605029955E-4,
+ 3.0110146180915596E-5,
+ 5.161321737666594E-6,
+ 6.465330475608697E-7,
+ 5.098639476673915E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.2878516982954659,
- 0.2550623135197736,
- 0.21991007739787044,
- 0.18425987035877295,
- 0.1485658072494233,
- 0.11586814527240913,
- 0.08674776317270891,
- 0.06207341639858485,
- 0.042498170020300444,
- 0.027752312154425564,
- 0.017285454796169646,
- 0.010223972209830248,
- 0.005694323318959239,
- 0.0029419321920128197,
- 0.0013768055358645659,
- 5.636744379753912E-4,
- 1.9616835926077877E-4,
- 5.592130460225895E-5,
- 1.22149525135547E-5,
- 1.9287484178736967E-6
+ 0.2876557367643624,
+ 0.25488482798282985,
+ 0.21977248862895135,
+ 0.1841780344785407,
+ 0.148550697415345,
+ 0.11591865538690857,
+ 0.08685351483528556,
+ 0.0622164424446501,
+ 0.04265932018869413,
+ 0.02791727535952855,
+ 0.017444425839310756,
+ 0.010368459174137269,
+ 0.005816009053636898,
+ 0.0030350483472471224,
+ 0.0014406299542842446,
+ 6.023025443187689E-4,
+ 2.1664543637988162E-4,
+ 6.530104970955531E-5,
+ 1.5824434960581173E-5,
+ 3.065758874820914E-6
]
}
}
\ No newline at end of file
--
GitLab