From 42cab472a76a1f1c35852c5ff75fd9f59f431c0d Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 1 Dec 2023 13:08:09 -0700
Subject: [PATCH] updated lib and ak ref model and tests
---
gradle.properties | 2 +-
nshms.yml | 2 +-
.../earthquake/nshmp/model/NshmTests.java | 2 +-
.../e2e/nshm-alaska-2023/ANCHORAGE_AK.json | 156 +++++++++---------
.../e2e/nshm-alaska-2023/FAIRBANKS_AK.json | 156 +++++++++---------
.../e2e/nshm-alaska-2023/JUNEAU_AK.json | 156 +++++++++---------
.../e2e/nshm-alaska-2023/KODIAK_AK.json | 156 +++++++++---------
.../e2e/nshm-alaska-2023/VALDEZ_AK.json | 156 +++++++++---------
8 files changed, 393 insertions(+), 393 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 9f8f20f8..7d70e87f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,7 +12,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.4.5
+nshmpLibVersion = 1.4.8
nshmpUtilsJavaVersion = 0.4.0
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/nshms.yml b/nshms.yml
index 24a679f1..cafe575a 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -27,7 +27,7 @@ nshms:
# Alaska 2023 NSHM
-
repo: nshm-alaska
- tag: 3.b.2
+ tag: 3.b.4
year: 2023
deployment:
baseHref: /ws/nshmp/alaska-2023/dynamic
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 d9c9eb67..1a886f34 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -101,7 +101,7 @@ class NshmTests {
// run single model
NshmModel nshmModel =
- NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2023"));
+ NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2023"));
NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
nshmModel.exec.shutdown();
diff --git a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
index 4b35b25a..46f675d5 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.533063154944145,
- 1.1407161981023402,
- 0.8215822582633048,
- 0.5714610809176423,
- 0.3859010924760768,
- 0.25044358843662284,
- 0.15947512963710497,
- 0.09801803609658635,
- 0.058562947297100584,
- 0.03362972352186001,
- 0.018385589905721637,
- 0.009429014890112471,
- 0.004445722835655383,
- 0.0018782080133839675,
- 6.896800784674155E-4,
- 2.1340211762779895E-4,
- 5.05265902261328E-5,
- 8.209869677730849E-6,
- 7.704613945883778E-7,
- 2.7290947557416635E-8
+ 1.3720925487858602,
+ 1.0275163654754946,
+ 0.7480474906212712,
+ 0.5290900977455085,
+ 0.3662595987035492,
+ 0.24677283407769507,
+ 0.16585608549607725,
+ 0.1104005210033694,
+ 0.07373502194790822,
+ 0.04909991950742261,
+ 0.03217596703075485,
+ 0.020192267828950377,
+ 0.011698361125423554,
+ 0.006030842761873252,
+ 0.002685202696419267,
+ 0.0010164771122269153,
+ 3.077580141032423E-4,
+ 7.039491243359444E-5,
+ 1.1865909404678209E-5,
+ 1.4150520220348925E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.37170323895744295,
- 0.2620000612411526,
- 0.17884768663968825,
- 0.11786183378532414,
- 0.07448294328863589,
- 0.045305003759507544,
- 0.026242189820212897,
- 0.014502527525221853,
- 0.00754835725207039,
- 0.0036051671205996907,
- 0.001545082011865317,
- 5.769936531403613E-4,
- 1.7956916400703463E-4,
- 4.5887625702533984E-5,
- 8.333307355222622E-6,
- 1.055248596834087E-6,
- 6.316277991331568E-8,
- 8.9197976377949E-10,
+ 0.3801677941481919,
+ 0.2776656236715491,
+ 0.19796076498017073,
+ 0.1379721133950676,
+ 0.09425791483400264,
+ 0.0639892193782905,
+ 0.043154584443190674,
+ 0.028878521090941446,
+ 0.01865163132329073,
+ 0.0110871645673617,
+ 0.00580224316978564,
+ 0.00256594875184797,
+ 9.15766636580594E-4,
+ 2.5739518684651525E-4,
+ 4.621111176621998E-5,
+ 4.981788891609782E-6,
+ 7.07656918525165E-8,
+ 9.264887170951166E-10,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 2.2655440287103956,
- 1.7986659692706735,
- 1.3901805900739883,
- 1.0431033263108314,
- 0.759591239120557,
- 0.5363747507652474,
- 0.3665025315205776,
- 0.2402952841982099,
- 0.15149777169027343,
- 0.09164091542964117,
- 0.05346820497275271,
- 0.029503176955336368,
- 0.015609076535781568,
- 0.0076142181202109955,
- 0.003394105294912394,
- 0.0013302250050878247,
- 4.450595267230792E-4,
- 1.215738009424795E-4,
- 2.6218747566194934E-5,
- 4.114439165675712E-6
+ 1.8459558925686192,
+ 1.4478295228255968,
+ 1.1067685408609493,
+ 0.8210942965999163,
+ 0.5911060799718935,
+ 0.41368899576881685,
+ 0.28245933465154377,
+ 0.18821385847601935,
+ 0.1239093250312428,
+ 0.08104313841526053,
+ 0.05287237528295904,
+ 0.03349288663131033,
+ 0.02038067985715045,
+ 0.011280661827486558,
+ 0.005536746790674798,
+ 0.0023085244768863557,
+ 7.913081023238281E-4,
+ 2.0897661659735275E-4,
+ 3.8840299026690874E-5,
+ 4.212369207162397E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 2.79148188897884,
- 2.301720049127536,
- 1.8400765578315925,
- 1.4329865805588027,
- 1.0787216214270223,
- 0.7936474006563398,
- 0.5662755916056919,
- 0.3899815715005908,
- 0.2592565048337815,
- 0.16567481522369287,
- 0.10191341967075936,
- 0.06033704442927267,
- 0.03430119142426228,
- 0.01858672429079244,
- 0.009466826063871583,
- 0.004427254230755186,
- 0.0018638234976663096,
- 6.883732074492491E-4,
- 2.1426505667171495E-4,
- 5.381174371384032E-5
+ 2.3068452291398485,
+ 1.8711175624717413,
+ 1.4750320472263247,
+ 1.1344626302375571,
+ 0.843556527523754,
+ 0.61367367651894,
+ 0.4343438087259614,
+ 0.29910577685230844,
+ 0.20176709950602678,
+ 0.1336989697893163,
+ 0.087530526873838,
+ 0.05652207967237429,
+ 0.035586547054996816,
+ 0.02136471946411147,
+ 0.011879124169812922,
+ 0.005917664684081852,
+ 0.0025780723681162886,
+ 9.559386026477349E-4,
+ 2.8601418731728366E-4,
+ 6.529136422892309E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
index 3c464871..a041bbe5 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.8292892919188968,
- 0.6167682973286976,
- 0.44113124260476905,
- 0.30115269189159843,
- 0.1959524513575399,
- 0.11924721666679043,
- 0.06916501989741619,
- 0.03745240223087982,
- 0.01914649698212769,
- 0.009160489598271877,
- 0.004082728182721788,
- 0.001675237985413867,
- 6.210405790700311E-4,
- 2.0250922623244472E-4,
- 5.597806736866798E-5,
- 1.24864698029958E-5,
- 1.9355053380564243E-6,
- 1.8541607933551504E-7,
- 8.360038339691291E-9,
- 6.722763782313272E-11
+ 0.6500070450279913,
+ 0.4898286913782949,
+ 0.356806269399562,
+ 0.24942340141503816,
+ 0.16698622375601047,
+ 0.10497040208259767,
+ 0.06275156645601605,
+ 0.034685201571454854,
+ 0.017728048247769822,
+ 0.008232374418650018,
+ 0.0034442380384775264,
+ 0.0012865608682614816,
+ 4.2437081942267227E-4,
+ 1.2424459066139078E-4,
+ 3.181343173739514E-5,
+ 7.187303388646201E-6,
+ 1.1631875283163874E-6,
+ 1.1765817840913328E-7,
+ 5.585316637675751E-9,
+ 4.3802562082764046E-11
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.24445648251699703,
- 0.1680588311324935,
- 0.10965883556833136,
- 0.06759328549814493,
- 0.038995674182772146,
- 0.021102945978492545,
- 0.01055206859387528,
- 0.004894597894175565,
- 0.002085825538563805,
- 7.99081557862912E-4,
- 2.716124059288402E-4,
- 7.999159655265982E-5,
- 1.9557325437878532E-5,
- 3.938596174543948E-6,
- 5.660891483593101E-7,
- 5.368083053101887E-8,
- 1.908163397206317E-9,
- 1.76323887131773E-11,
+ 0.22218711756914336,
+ 0.15770021915166116,
+ 0.10750425152234319,
+ 0.07038754262039247,
+ 0.04387369752840037,
+ 0.025816822910554475,
+ 0.013873997996528182,
+ 0.006680452472467088,
+ 0.002807373659442616,
+ 9.955321475599516E-4,
+ 2.880967551722344E-4,
+ 6.626073105476886E-5,
+ 1.2632510352118791E-5,
+ 2.105102607547906E-6,
+ 3.0727004042077374E-7,
+ 3.1490930601639096E-8,
+ 1.169405640423289E-9,
+ 7.721291928710127E-12,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.0807665802667987,
- 0.8370085520255732,
- 0.6283032489468138,
- 0.45463814314198675,
- 0.3161559030720859,
- 0.21076836235454682,
- 0.13441792225546148,
- 0.08122747123833568,
- 0.04651308460219772,
- 0.025005039509492972,
- 0.012597587749422162,
- 0.005752855629242659,
- 0.002406233406542181,
- 8.651877985207779E-4,
- 2.6059124300433574E-4,
- 6.0762765196213574E-5,
- 9.84639499239778E-6,
- 8.796904587374058E-7,
- 3.889680893355353E-8,
- 6.861810842553833E-10
+ 0.7950429732848414,
+ 0.6174711648213265,
+ 0.46638876629534076,
+ 0.3399525479657921,
+ 0.23766966665879374,
+ 0.15841047100776207,
+ 0.10009253439676222,
+ 0.05921462399938382,
+ 0.03278661952425788,
+ 0.0168681768521933,
+ 0.008091379489689732,
+ 0.0035195310906473254,
+ 0.0014190084854957923,
+ 4.993094285482811E-4,
+ 1.4946684211447395E-4,
+ 3.487682928612634E-5,
+ 5.618425625572342E-6,
+ 4.652584956414771E-7,
+ 1.4007046969340297E-8,
+ 1.7289401638074338E-11
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.321406792618873,
- 1.0607245257070397,
- 0.8226225364994113,
- 0.6189641518074268,
- 0.4469797947255905,
- 0.3131905188295343,
- 0.2109122001911465,
- 0.13581350646186346,
- 0.08362692855113343,
- 0.048848511653937415,
- 0.026937202838255556,
- 0.013907523665226474,
- 0.006654232794188234,
- 0.0029034189290078473,
- 0.0011257951711251975,
- 3.72440771243018E-4,
- 1.0077666549854122E-4,
- 2.073646335166421E-5,
- 2.7287243336131094E-6,
- 1.8736618764986356E-7
+ 0.9728983766921269,
+ 0.7779488416160009,
+ 0.603686739423316,
+ 0.4558492924722438,
+ 0.33060777722664286,
+ 0.23211393314043352,
+ 0.15582310660112214,
+ 0.09925921495133737,
+ 0.05991157661801957,
+ 0.03398672454546838,
+ 0.01806198121849953,
+ 0.00894678144127732,
+ 0.004108737276698944,
+ 0.0017327852372807076,
+ 6.572236688260522E-4,
+ 2.1564758129703074E-4,
+ 5.84279864046631E-5,
+ 1.2115162199716308E-5,
+ 1.5855276062703893E-6,
+ 9.95402733221482E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
index ce6ba424..31516d0c 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 0.512120293069315,
- 0.37666505789756466,
- 0.2653280559013392,
- 0.1768443404587469,
- 0.11072970089993091,
- 0.0635606616146817,
- 0.03427141069753238,
- 0.01719625403268733,
- 0.008338679371368583,
- 0.0039960053643921896,
- 0.0019322581011734662,
- 9.316835724096548E-4,
- 4.3226125087393006E-4,
- 1.8373701850976553E-4,
- 6.801658489891432E-5,
- 2.100834889666948E-5,
- 4.89051914252019E-6,
- 7.578514900672313E-7,
- 5.8124450106089735E-8,
- 5.334809112313924E-10
+ 0.39816972675348344,
+ 0.29558834868131006,
+ 0.20997438310014951,
+ 0.14060993135171496,
+ 0.08784146507297075,
+ 0.04974562298913036,
+ 0.02602726207304713,
+ 0.012338134434890671,
+ 0.005448507965479397,
+ 0.002284606262153739,
+ 9.45506033954659E-4,
+ 3.9527593673179315E-4,
+ 1.6605740121831289E-4,
+ 6.665332170681847E-5,
+ 2.3975279838593456E-5,
+ 7.2883174395195145E-6,
+ 1.6741687230670377E-6,
+ 2.5681222077673E-7,
+ 1.9559629876239413E-8,
+ 1.791784999565244E-10
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.17725958789581547,
- 0.12363509220348205,
- 0.08114850092946894,
- 0.04994116052122807,
- 0.02866866807337843,
- 0.015490872963489577,
- 0.007845028277144943,
- 0.0038017321917609595,
- 0.0017824879465811296,
- 8.078876169281963E-4,
- 3.519052169317436E-4,
- 1.4305885506268152E-4,
- 5.164353783167469E-5,
- 1.6203945168186292E-5,
- 3.945916881737128E-6,
- 7.140403020919065E-7,
- 7.547992987862225E-8,
- 2.945347236237444E-9,
+ 0.15874333030693782,
+ 0.11290469578497385,
+ 0.07598141979542367,
+ 0.0479147521552976,
+ 0.027828337693004787,
+ 0.014776801940344971,
+ 0.00702115422656385,
+ 0.0030111241340798358,
+ 0.0011728000825834818,
+ 4.2406291421471604E-4,
+ 1.5016730618879411E-4,
+ 5.2778493523979254E-5,
+ 1.7812712913140534E-5,
+ 5.487141860032047E-6,
+ 1.3274375977149268E-6,
+ 2.391162247886854E-7,
+ 2.519341992451308E-8,
+ 9.81803873215754E-10,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 0.61851599496289,
- 0.46027701115972197,
- 0.3249979331330102,
- 0.2161363312310295,
- 0.1347864613484304,
- 0.0788073190777626,
- 0.04363342643391949,
- 0.02316636477635781,
- 0.012182449983062157,
- 0.006457462663724176,
- 0.003472147763825607,
- 0.0018142252173219086,
- 9.082024525831877E-4,
- 4.042395704672251E-4,
- 1.536177739346148E-4,
- 4.6263337327292985E-5,
- 1.025180393014928E-5,
- 1.4194347538755984E-6,
- 8.805028014459442E-8,
- 4.564945788216327E-11
+ 0.4623102086201309,
+ 0.34378986400584277,
+ 0.24213620232671573,
+ 0.160093873351361,
+ 0.09863070418710099,
+ 0.0563473368667735,
+ 0.029951224269447515,
+ 0.01485312174455433,
+ 0.007059702748177026,
+ 0.0033095546242618234,
+ 0.0015871291748257694,
+ 7.606026413560767E-4,
+ 3.6086275728194634E-4,
+ 1.5470729279674894E-4,
+ 5.7050549715708606E-5,
+ 1.6744146767839077E-5,
+ 3.6218645130838257E-6,
+ 4.893227215820594E-7,
+ 2.9804484056011287E-8,
+ 1.55110144581239E-11
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.7492375064517502,
- 0.5852647446990902,
- 0.43361857486743327,
- 0.30543200979038676,
- 0.20137020449200294,
- 0.12588763490132418,
- 0.0739959825821362,
- 0.04118252742715671,
- 0.022279934207652133,
- 0.011985680318084413,
- 0.006544527582561283,
- 0.003613647223305311,
- 0.0019664144840350196,
- 0.0010172979425685077,
- 4.8020983620873235E-4,
- 1.9706316307836622E-4,
- 6.741473420715479E-5,
- 1.8241602456723483E-5,
- 3.536506152860099E-6,
- 4.0242316113911945E-7
+ 0.5566973066695364,
+ 0.43443389127059645,
+ 0.3212632051145754,
+ 0.22548632928002435,
+ 0.14757626545332184,
+ 0.0909504622881876,
+ 0.05206174872607177,
+ 0.02767637274513037,
+ 0.013933988989591958,
+ 0.006788320815442306,
+ 0.0033146875073243754,
+ 0.001654211392070674,
+ 8.335685589110845E-4,
+ 4.0908385807999353E-4,
+ 1.859489930936979E-4,
+ 7.401153869817504E-5,
+ 2.4667152509986905E-5,
+ 6.516783088599301E-6,
+ 1.2322035323549118E-6,
+ 1.3715006456757767E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
index c15b5218..ce919928 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.3073225687969399,
- 0.9207118599239599,
- 0.6337829335225674,
- 0.42765934850468174,
- 0.28508681167607003,
- 0.18566423452688735,
- 0.1201561775732507,
- 0.07561485439371214,
- 0.04623090528176141,
- 0.02695249432803597,
- 0.014774937482104736,
- 0.007506175334328023,
- 0.003476889709879042,
- 0.0014359990484572303,
- 5.136880855823932E-4,
- 1.544015976927677E-4,
- 3.486118862547909E-5,
- 4.846446974844039E-6,
- 2.570664943015904E-7,
- 4.5285149188006825E-9
+ 1.247458738038185,
+ 0.8865140024713137,
+ 0.6206097642015014,
+ 0.43076936410880967,
+ 0.29936300738685784,
+ 0.20605939388039385,
+ 0.1416603890502249,
+ 0.09445668980621484,
+ 0.060488698711790786,
+ 0.03651380096362211,
+ 0.020646970579591452,
+ 0.01091888360981616,
+ 0.005379944047303775,
+ 0.0024378321736166285,
+ 9.972503174627216E-4,
+ 3.594653589290104E-4,
+ 1.0703737172464104E-4,
+ 2.5210066142660282E-5,
+ 4.303058273307967E-6,
+ 6.002996147314715E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.3226030598399519,
- 0.22850974081833267,
- 0.15855754655125956,
- 0.10720259569803775,
- 0.06981170131922863,
- 0.04362798321956349,
- 0.02574769713386205,
- 0.014361721478916012,
- 0.007505879072677979,
- 0.0035982847098193042,
- 0.001549461791739408,
- 5.810142337950335E-4,
- 1.805047486590613E-4,
- 4.494230542946291E-5,
- 7.513495317074033E-6,
- 7.636630272859888E-7,
- 1.6710926282203634E-8,
- 3.774117618952272E-12,
+ 0.3479557185370114,
+ 0.2576905439956535,
+ 0.18950204283039762,
+ 0.13715063497537952,
+ 0.09565742899570219,
+ 0.06309621256123439,
+ 0.038290709327267414,
+ 0.021322683985519047,
+ 0.010913120894194073,
+ 0.00511800311685902,
+ 0.0021923783525712413,
+ 8.453622415095884E-4,
+ 2.7954537648818077E-4,
+ 7.69243149912933E-5,
+ 1.4537540363729536E-5,
+ 1.6457577563950376E-6,
+ 3.939352650278633E-8,
+ 1.6551032765075596E-12,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.957814010826338,
- 1.4510116562419488,
- 1.0409322454064536,
- 0.7238267163649046,
- 0.49121882756650537,
- 0.3277201569559674,
- 0.2160909620342424,
- 0.1403502540336006,
- 0.09007025363459092,
- 0.05661548963360734,
- 0.03459142798759258,
- 0.01995381289546401,
- 0.010981200717162876,
- 0.005583183721144435,
- 0.0026087117535387666,
- 0.0010803180678143995,
- 3.8372169619724206E-4,
- 1.1093090859102292E-4,
- 2.5177469774201432E-5,
- 3.702096214323919E-6
+ 1.6774862937084098,
+ 1.2259113400623505,
+ 0.8723448168773066,
+ 0.6064937357403768,
+ 0.41527568635534984,
+ 0.2818953262760604,
+ 0.19025015107785093,
+ 0.12684952289940848,
+ 0.08353924771283065,
+ 0.05378541344727995,
+ 0.03361141260709279,
+ 0.01987143812064277,
+ 0.011247390122567383,
+ 0.005899307400515509,
+ 0.002841674307005856,
+ 0.0012071661096341615,
+ 4.364893580416113E-4,
+ 1.2767553702939136E-4,
+ 2.8652718937573658E-5,
+ 4.209774265461104E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 2.5583115850343288,
- 1.992233025926088,
- 1.49079666897406,
- 1.0803559246513028,
- 0.7538697586247151,
- 0.5170550610484879,
- 0.3479140251913233,
- 0.2302424562300654,
- 0.15072732054418891,
- 0.0972560009661915,
- 0.06157962041595509,
- 0.03782183256659841,
- 0.022235748217008695,
- 0.012372917725262084,
- 0.006453522334062419,
- 0.0031042211848715815,
- 0.001357407679384206,
- 5.276856665439088E-4,
- 1.7533814419731086E-4,
- 4.798985685733547E-5
+ 2.2205105189266248,
+ 1.6975619835090976,
+ 1.2505633020530227,
+ 0.8967017178756171,
+ 0.6232258543141881,
+ 0.4290086774045201,
+ 0.29174091221136944,
+ 0.19612258704709842,
+ 0.1307190607591014,
+ 0.08585806098485263,
+ 0.055222404320081804,
+ 0.0343588099102278,
+ 0.020416482231720927,
+ 0.01147075479770203,
+ 0.006039223117044241,
+ 0.002929002072436451,
+ 0.0012875495043511826,
+ 5.011058135334364E-4,
+ 1.6554704540451385E-4,
+ 4.4586317094252314E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
index 3171763b..b7b2270b 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
@@ -23,26 +23,26 @@
1.7119945007591924
],
"ys": [
- 1.0209181532865608,
- 0.7517258626908789,
- 0.5340030954111529,
- 0.36244464368364526,
- 0.23530657513312783,
- 0.1446932923306082,
- 0.0869894418629285,
- 0.050823770607208336,
- 0.02941423799947835,
- 0.01675047126980642,
- 0.009281268855155256,
- 0.004907629768558396,
- 0.002413077011379261,
- 0.001070324182588001,
- 4.1370574981955096E-4,
- 1.3484280479235454E-4,
- 3.3630612278286416E-5,
- 5.622876147319107E-6,
- 3.916433051796782E-7,
- 3.9792827222195564E-9
+ 0.9511803604042506,
+ 0.7131814841672122,
+ 0.5182730015672413,
+ 0.3630576937906768,
+ 0.24692987701557315,
+ 0.16323034374531817,
+ 0.1090186691181396,
+ 0.07401441881390816,
+ 0.05210070540558321,
+ 0.03772927762749233,
+ 0.027580565151382193,
+ 0.019699608640189444,
+ 0.013189682236828638,
+ 0.007937814724477526,
+ 0.004147475091057538,
+ 0.001847515459058957,
+ 6.721483034869367E-4,
+ 1.9539686355055067E-4,
+ 4.0104018168787676E-5,
+ 6.310073430817388E-6
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.33217215250043075,
- 0.23284181120412545,
- 0.15510459811230162,
- 0.09827960040242317,
- 0.059135322405738974,
- 0.034201186352958345,
- 0.019016394608674398,
- 0.010318793785296574,
- 0.005436902958621392,
- 0.0027086834398179055,
- 0.001236293379390497,
- 4.965112525359664E-4,
- 1.6642294411611604E-4,
- 4.5373091479458334E-5,
- 8.73852112539336E-6,
- 9.985631819213537E-7,
- 3.8035253360117944E-8,
- 6.034386292318592E-12,
+ 0.3381068982616648,
+ 0.24681857729197704,
+ 0.17424378107482888,
+ 0.11993158464032518,
+ 0.08126619240311893,
+ 0.05540313364394108,
+ 0.03834091264543798,
+ 0.02708262386381712,
+ 0.01900877228548184,
+ 0.012588880293892882,
+ 0.007463193428024628,
+ 0.0037791054916076487,
+ 0.0015624333736399272,
+ 5.220535642548391E-4,
+ 1.2273439586586854E-4,
+ 1.7088580673781973E-5,
+ 7.884992202588777E-7,
+ 2.645622377055003E-12,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 1.2703330278498468,
- 0.9468958882157659,
- 0.6841211965367154,
- 0.4774308682405098,
- 0.32321663470567796,
- 0.21387621393424558,
- 0.1393756470649216,
- 0.08935773867517177,
- 0.056709628720452196,
- 0.035516467389975215,
- 0.02196915362655866,
- 0.013106667169204136,
- 0.007571576029979501,
- 0.0040668343979987105,
- 0.00200835779285212,
- 8.806775829748759E-4,
- 3.3376502132829067E-4,
- 1.0480707314457948E-4,
- 2.6359452660345154E-5,
- 4.501571471187711E-6
+ 1.1042687574573624,
+ 0.8368764826173206,
+ 0.6166632073202873,
+ 0.44054249262691303,
+ 0.30709977238299263,
+ 0.21131666436918742,
+ 0.14548174251414278,
+ 0.10099792567896883,
+ 0.07167492693890277,
+ 0.052138676025237675,
+ 0.038804426292419855,
+ 0.02877631969221798,
+ 0.020864607897375237,
+ 0.014075327434990282,
+ 0.008566765372674387,
+ 0.004516693870239377,
+ 0.0020048893332924368,
+ 7.227569407870845E-4,
+ 2.0565171872081832E-4,
+ 3.9081167041209065E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.6348680130273041,
- 1.260235780434143,
- 0.9373356291891277,
- 0.6769171444207911,
- 0.4711420523262833,
- 0.3223152039260565,
- 0.21614852875481277,
- 0.14232785396851258,
- 0.0925009830472931,
- 0.059184278757264654,
- 0.0372946388959322,
- 0.023071467292429038,
- 0.013916239561053692,
- 0.008084678609549027,
- 0.00444780185647492,
- 0.002267047158328631,
- 0.0010532762171519166,
- 4.368629475169508E-4,
- 1.5695254904093096E-4,
- 4.723790920790174E-5
+ 1.396643592069571,
+ 1.0863529129109186,
+ 0.8195614167446342,
+ 0.6026043131722628,
+ 0.4288303321269088,
+ 0.30135844285965857,
+ 0.20939014334720685,
+ 0.14495151773795198,
+ 0.10119991977582948,
+ 0.07164419657591777,
+ 0.05169137739808294,
+ 0.03784107793500243,
+ 0.027664366786705613,
+ 0.01966471184774726,
+ 0.013160194453235456,
+ 0.008017562039300387,
+ 0.004339441734726058,
+ 0.002042401407707933,
+ 8.132717262813822E-4,
+ 2.6564325242204456E-4
]
}
}
\ No newline at end of file
--
GitLab