diff --git a/nshms.yml b/nshms.yml
index fed1158ac87f580b3b623db0ef1ea29d9e6a780d..6c41fc6fd4c8959d4761514272a6fda5e8ddecf2 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -27,7 +27,7 @@ nshms:
# Alaska 2023 NSHM
-
repo: nshm-alaska
- tag: 3.b.4
+ tag: 3.b.5
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 31f267a914c4c6f168fb4d25ed0661c70fb3757a..1a886f348fae575930f3455464a8cd27728a0018 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-alaska-2007"));
+ 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 46f675d581a7af077cd604159e5e0e0b9b855c76..cff2744cdea9b9a6d203570484adf90d3d80489b 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.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
+ 1.3440825666549816,
+ 1.0008917245981888,
+ 0.7234956108557626,
+ 0.5070493999867541,
+ 0.3466180656169478,
+ 0.2289811506514314,
+ 0.14911678593107597,
+ 0.09419653258967511,
+ 0.058029430161019954,
+ 0.03441930876293443,
+ 0.01944671124146933,
+ 0.010315968670698075,
+ 0.005042038159861396,
+ 0.002218062335798769,
+ 8.564170566485347E-4,
+ 2.846735609201381E-4,
+ 7.580780687820939E-5,
+ 1.5419463515827804E-5,
+ 2.408463475627259E-6,
+ 2.58453629274014E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 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,
+ 0.3541632399506991,
+ 0.2540102629952098,
+ 0.17693248761362718,
+ 0.11923191423928986,
+ 0.07711812051200516,
+ 0.04791373356420227,
+ 0.02823535014881556,
+ 0.01582096941128958,
+ 0.008361423517018572,
+ 0.004083355172905179,
+ 0.0018063464013144423,
+ 7.02129195194355E-4,
+ 2.2943257023579056E-4,
+ 6.158928686617357E-5,
+ 1.1580710849147123E-5,
+ 1.4494393611303762E-6,
+ 7.015046305148646E-8,
9.264887170951166E-10,
0.0,
0.0
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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
+ 1.8198507765511371,
+ 1.4240159538019967,
+ 1.0854917868037464,
+ 0.8020991615970595,
+ 0.5737259987561051,
+ 0.3971687987057286,
+ 0.26624147023989636,
+ 0.17205672662335889,
+ 0.10790211584626709,
+ 0.06562860556950098,
+ 0.03880197997715304,
+ 0.021724552146225623,
+ 0.011571739758989518,
+ 0.005596747679072055,
+ 0.002422305733116905,
+ 8.972483590860408E-4,
+ 2.7381738215088986E-4,
+ 6.413797993611816E-5,
+ 1.0587131063587416E-5,
+ 1.0151747424887275E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 2.2802715358131564,
+ 1.8464219465382472,
+ 1.4525759151716588,
+ 1.1142216802100038,
+ 0.8251928200873969,
+ 0.5965474412251824,
+ 0.4178685520349377,
+ 0.28289074419272137,
+ 0.18570395178313934,
+ 0.11799972404200305,
+ 0.07271671448696379,
+ 0.043342904792801215,
+ 0.024806548644607344,
+ 0.0134537530643345,
+ 0.0067839840628682625,
+ 0.003097534745473696,
+ 0.0012534281761769049,
+ 4.368107172685528E-4,
+ 1.2472256997346013E-4,
+ 2.73684673298438E-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 a041bbe5157fb8c03f2ae94a69b2e51751c46c72..18202b1ef8a534b5ba9662f989268ed7aa3b1675 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
@@ -23,21 +23,21 @@
1.7119945007591924
],
"ys": [
- 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,
+ 0.6320987168540431,
+ 0.4728142049462827,
+ 0.34038669675255295,
+ 0.23369410989904157,
+ 0.1524639716449646,
+ 0.09252414732126395,
+ 0.05309537255028408,
+ 0.028144983363657235,
+ 0.013918752965654408,
+ 0.006365528010646979,
+ 0.0026884024769663548,
+ 0.001042633437111823,
+ 3.681390524975387E-4,
+ 1.1607547551148266E-4,
+ 3.1681523175536426E-5,
7.187303388646201E-6,
1.1631875283163874E-6,
1.1765817840913328E-7,
@@ -69,21 +69,21 @@
0.7929925155296614
],
"ys": [
- 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,
+ 0.20370178964554833,
+ 0.14078381603283013,
+ 0.09178465184691696,
+ 0.05618865110886457,
+ 0.03202984864074418,
+ 0.017052519408886014,
+ 0.008339876880769818,
+ 0.0037513807872335625,
+ 0.0015325666474055202,
+ 5.5485370220385E-4,
+ 1.75775844011697E-4,
+ 4.769122999838819E-5,
+ 1.0794530213682979E-5,
+ 2.1046942297499186E-6,
+ 3.072700404207737E-7,
3.1490930601639096E-8,
1.169405640423289E-9,
7.721291928710127E-12,
@@ -115,22 +115,22 @@
1.6428726885203377
],
"ys": [
- 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,
+ 0.7786610941974275,
+ 0.6013694729024008,
+ 0.45099302976343014,
+ 0.32598118201249077,
+ 0.2259573697659527,
+ 0.1495787080237101,
+ 0.09423830428521976,
+ 0.05589402864374316,
+ 0.031196166206883112,
+ 0.01623987310121237,
+ 0.00789225493463842,
+ 0.003475986953970465,
+ 0.0014128223860962557,
+ 4.991694696732663E-4,
+ 1.4946684211447392E-4,
+ 3.487682928612633E-5,
5.618425625572342E-6,
4.652584956414771E-7,
1.4007046969340297E-8,
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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,
+ 0.9565165269755307,
+ 0.7618860838582626,
+ 0.5882439582502267,
+ 0.44155514955307984,
+ 0.3181697428215982,
+ 0.22209508309172682,
+ 0.14852302501515702,
+ 0.09455300758960838,
+ 0.05726692659711586,
+ 0.03271916742273143,
+ 0.017554218604857733,
+ 0.008783397085746547,
+ 0.004069919167570895,
+ 0.001727224715912384,
+ 6.572001807643121E-4,
+ 2.1564758129703076E-4,
5.84279864046631E-5,
1.2115162199716308E-5,
1.5855276062703893E-6,
- 9.95402733221482E-8
+ 9.954027332214819E-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 31516d0c5a2219a6089ca853c5aebd1ac438ec2b..def57d97baa3888eef2853d7078018e4d5480f5f 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
@@ -23,20 +23,20 @@
1.7119945007591924
],
"ys": [
- 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,
+ 0.38246471730057385,
+ 0.28199187469681103,
+ 0.1989026470577615,
+ 0.13238210056170352,
+ 0.08236842021341398,
+ 0.04658813556284467,
+ 0.024431177628748964,
+ 0.01165772463480651,
+ 0.005206955950002294,
+ 0.002215797731790024,
+ 9.318394855783617E-4,
+ 3.939128396770014E-4,
+ 1.6605692192974634E-4,
+ 6.665332170681845E-5,
2.3975279838593456E-5,
7.2883174395195145E-6,
1.6741687230670377E-6,
@@ -69,18 +69,18 @@
0.7929925155296614
],
"ys": [
- 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,
+ 0.1417149680832279,
+ 0.09811070203620345,
+ 0.06381870984084959,
+ 0.0389137708187399,
+ 0.02209171204890135,
+ 0.011701072223304671,
+ 0.005679901509578575,
+ 0.0025419397242937053,
+ 0.0010499706096350945,
+ 4.0304019223092206E-4,
+ 1.4801592608722076E-4,
+ 5.2777316017355865E-5,
1.7812712913140534E-5,
5.487141860032047E-6,
1.3274375977149268E-6,
@@ -115,16 +115,16 @@
1.6428726885203377
],
"ys": [
- 0.4623102086201309,
- 0.34378986400584277,
- 0.24213620232671573,
- 0.160093873351361,
- 0.09863070418710099,
- 0.0563473368667735,
- 0.029951224269447515,
- 0.01485312174455433,
- 0.007059702748177026,
- 0.0033095546242618234,
+ 0.4518303961571106,
+ 0.3361539932291947,
+ 0.23723033626519874,
+ 0.1573838551217368,
+ 0.09736755300581498,
+ 0.05586032804739387,
+ 0.029802909989344258,
+ 0.014822326364778914,
+ 0.007056273475934936,
+ 0.003309551884507301,
0.0015871291748257694,
7.606026413560767E-4,
3.6086275728194634E-4,
@@ -161,18 +161,18 @@
1.998773638612381
],
"ys": [
- 0.5566973066695364,
- 0.43443389127059645,
- 0.3212632051145754,
- 0.22548632928002435,
- 0.14757626545332184,
- 0.0909504622881876,
- 0.05206174872607177,
- 0.02767637274513037,
- 0.013933988989591958,
- 0.006788320815442306,
- 0.0033146875073243754,
- 0.001654211392070674,
+ 0.5457955591787409,
+ 0.42604881492727287,
+ 0.315434495156935,
+ 0.22186975916477397,
+ 0.14564190402190041,
+ 0.090051774549913,
+ 0.051712949423127416,
+ 0.027567673391940318,
+ 0.01390936234185338,
+ 0.006785506419042187,
+ 0.0033146832543299127,
+ 0.0016542113920706742,
8.335685589110845E-4,
4.0908385807999353E-4,
1.859489930936979E-4,
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 ce919928527527f5887e74739a3fa14d8653b75d..f7bd10f536ace05112cf8395483fb8dfb969864d 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.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
+ 1.2182803420114294,
+ 0.8574496042485652,
+ 0.5918755981269213,
+ 0.40287292598290003,
+ 0.2732267801666251,
+ 0.1830929120118432,
+ 0.12317269000183237,
+ 0.08130904336963711,
+ 0.052387527620741954,
+ 0.03228912142889926,
+ 0.018800008474553206,
+ 0.010232973419413094,
+ 0.005145268416794178,
+ 0.002346438811971296,
+ 9.486351159237272E-4,
+ 3.334608872430234E-4,
+ 9.55180635917751E-5,
+ 2.109162486981852E-5,
+ 3.357311879473734E-6,
+ 4.1435797220327204E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 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,
+ 0.3190327821074316,
+ 0.2294756453908756,
+ 0.16291194531026654,
+ 0.11359423817751832,
+ 0.0767192012903854,
+ 0.04969670776105992,
+ 0.030224222241275852,
+ 0.017233556918615077,
+ 0.009170396956581504,
+ 0.004487288942061665,
+ 0.001985265099980338,
+ 7.719649708357043E-4,
+ 2.50955623906374E-4,
+ 6.620387912201338E-5,
+ 1.1556235986963051E-5,
+ 1.1842585716001614E-6,
+ 2.4878739657534253E-8,
1.6551032765075596E-12,
0.0,
0.0
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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
+ 1.648507390512279,
+ 1.1973403595134637,
+ 0.844676180902315,
+ 0.5805289475757849,
+ 0.39203262657564036,
+ 0.262353970354856,
+ 0.17505277936226696,
+ 0.11615455212107985,
+ 0.07685501566080266,
+ 0.05017168250069021,
+ 0.031948717442017445,
+ 0.019245524006120313,
+ 0.011039916164388909,
+ 0.005828495533992994,
+ 0.0028032447654885834,
+ 0.0011815602303600428,
+ 4.2155603443956444E-4,
+ 1.2093439610009243E-4,
+ 2.629167398008241E-5,
+ 3.6931051834247554E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 2.1915591092792415,
+ 1.668991154999679,
+ 1.2227746221500144,
+ 0.8702974814335537,
+ 0.5990513071609558,
+ 0.40787709359258634,
+ 0.2743701752359705,
+ 0.18291405264602803,
+ 0.12156615580647456,
+ 0.08020073847447144,
+ 0.052163222088929394,
+ 0.032938951169295363,
+ 0.01985586653927121,
+ 0.011276227136003045,
+ 0.005967942393614055,
+ 0.002892556634910174,
+ 0.0012644479687819999,
+ 4.872483917130571E-4,
+ 1.5881100554422444E-4,
+ 4.201511585193732E-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 b7b2270b38b460547e7699a2a246be4d63becb83..f513336e484995d3f1f5a716004bb09534a60212 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": [
- 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
+ 0.923829626229814,
+ 0.687596517447317,
+ 0.4949988799202821,
+ 0.3422366964171211,
+ 0.228163742042017,
+ 0.14584415986403315,
+ 0.09229261849289407,
+ 0.05753828789074205,
+ 0.03582486558391648,
+ 0.021999974117690307,
+ 0.013121756857755254,
+ 0.007462613245977511,
+ 0.003967215386972748,
+ 0.0019275668449653957,
+ 8.343616462855667E-4,
+ 3.158655632768111E-4,
+ 9.912872807137403E-5,
+ 2.515625363401366E-5,
+ 4.5152358926643234E-6,
+ 6.683569635502279E-7
]
},
"5.00 Second Spectral Acceleration": {
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 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.31277377907956727,
+ 0.22396368844793343,
+ 0.1539186700441765,
+ 0.10159387762746161,
+ 0.06414728960327955,
+ 0.03896132485221308,
+ 0.022598326984558617,
+ 0.012630945962042131,
+ 0.006788489665013073,
+ 0.0034507254457073625,
+ 0.001622210541145754,
+ 6.7974322321038E-4,
+ 2.410086019717049E-4,
+ 7.075125984645542E-5,
+ 1.4687928701006553E-5,
+ 1.820642920820435E-6,
+ 5.595987449991961E-8,
+ 2.6456223770550025E-12,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.6428726885203377
],
"ys": [
- 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
+ 1.0796725666078673,
+ 0.8147595562776813,
+ 0.5968832522827221,
+ 0.42255301684705826,
+ 0.29017342935385465,
+ 0.19483115376227125,
+ 0.1290662300537221,
+ 0.08451937273370701,
+ 0.055183894012526276,
+ 0.03584725460848318,
+ 0.023123089937364578,
+ 0.01440728887613703,
+ 0.008645775707586621,
+ 0.004788689997025725,
+ 0.0024160438776904274,
+ 0.0010724368539252367,
+ 4.0766460509190493E-4,
+ 1.2739388712435735E-4,
+ 3.1667843506288485E-5,
+ 5.29838278893573E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 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
+ 1.3713446251603143,
+ 1.0631848124359002,
+ 0.7986148931947824,
+ 0.5835782442218441,
+ 0.41121525975046264,
+ 0.28452991096491465,
+ 0.19288230887424165,
+ 0.12849834309547095,
+ 0.08473489422776943,
+ 0.05526959317178196,
+ 0.03568349823322594,
+ 0.02268402618861225,
+ 0.01404437369618748,
+ 0.008330099266232826,
+ 0.004641520449516875,
+ 0.002374599134535208,
+ 0.0010975891124798541,
+ 4.4940159951830267E-4,
+ 1.5808817413800832E-4,
+ 4.624105828472041E-5
]
}
}
\ No newline at end of file