Skip to content
Snippets Groups Projects
Commit 5f0b6e4c authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

updated ak model version and tests

parent 3adcd619
No related branches found
No related tags found
2 merge requests!709Production Release | nshmp-haz,!707Ak update
Hide whitespace changes
Inline Side-by-side
Showing
with 368 additions and 362 deletions
nshms.yml
+ 1
− 1
View file @ 5f0b6e4c
...@@ -5,7 +5,7 @@ nshms: ...@@ -5,7 +5,7 @@ nshms:
# Alaska 2023 NSHM # Alaska 2023 NSHM
- -
repo: nshm-alaska repo: nshm-alaska
tag: 3.a.3 tag: 3.a.4
year: 2023 year: 2023
deployments: deployments:
development: development:
......
src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+ 6
− 0
View file @ 5f0b6e4c
...@@ -86,6 +86,12 @@ class NshmTests { ...@@ -86,6 +86,12 @@ class NshmTests {
* Run "./gradlew nshms" to first download all NSHMs * Run "./gradlew nshms" to first download all NSHMs
*/ */
public static void main(String[] args) throws IOException { 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()) { for (Nshm nshm : NSHMS.values()) {
/* Initialize and shut down executor to generate results. */ /* Initialize and shut down executor to generate results. */
NshmModel nshmModel = NshmTestUtils.loadModel(nshm); NshmModel nshmModel = NshmTestUtils.loadModel(nshm);
......
src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
+ 77
− 77
View file @ 5f0b6e4c
...@@ -23,26 +23,26 @@ ...@@ -23,26 +23,26 @@
1.7119945007591924 1.7119945007591924
], ],
"ys": [ "ys": [
1.2996202478882313, 1.2591612835916228,
0.9725018888121729, 0.935819294969047,
0.7061101382493036, 0.6736077656760051,
0.49761000093345825, 0.4692831993201172,
0.3430693194982159, 0.31862287812188794,
0.22964504647669196, 0.2088922276242202,
0.15209434676476463, 0.13478794273899347,
0.0979533300995709, 0.08400785913682399,
0.06159907875341369, 0.050778279117050795,
0.03741634584652395, 0.029406277423291487,
0.021799886815018765, 0.016198363456834088,
0.012031635219146736, 0.008400411270878226,
0.006159376162184262, 0.004035373865549225,
0.002842018163941182, 0.0017534758398779088,
0.001143697125450014, 6.690977031798066E-4,
3.8824774213089914E-4, 2.170514307550235E-4,
1.0057889682714155E-4, 5.4002607832878515E-5,
1.835929703535304E-5, 9.504456760403096E-6,
1.2328840697872436E-6, 6.25321983824242E-7,
7.102888837863421E-9 3.552337066950384E-9
] ]
}, },
"5.00 Second Spectral Acceleration": { "5.00 Second Spectral Acceleration": {
...@@ -69,23 +69,23 @@ ...@@ -69,23 +69,23 @@
0.7929925155296614 0.7929925155296614
], ],
"ys": [ "ys": [
0.38353597317838123, 0.3447375155399586,
0.28234370766812356, 0.24764120877949838,
0.2032378040033671, 0.17300961398886805,
0.14263024239742927, 0.11708099973543344,
0.097000925083273, 0.07618135660720561,
0.06404432376232276, 0.047757844157680245,
0.040562430178367206, 0.028506608454805262,
0.024638265062692268, 0.016244522746219982,
0.014265855625999123, 0.008806008300108362,
0.007780737015339785, 0.0045047073528032,
0.003946435939172839, 0.002161528498746679,
0.0018069296760526254, 9.49330077509064E-4,
7.144450385010248E-4, 3.6511655271175236E-4,
2.4100198759115837E-4, 1.2140668652090491E-4,
6.181583793464954E-5, 3.099259845510509E-5,
1.0027244353732678E-5, 5.02027430565196E-6,
5.30121229465608E-7, 2.653132438930704E-7,
5.21284369100748E-12, 5.21284369100748E-12,
0.0, 0.0,
0.0 0.0
...@@ -115,26 +115,26 @@ ...@@ -115,26 +115,26 @@
1.6428726885203377 1.6428726885203377
], ],
"ys": [ "ys": [
1.6804413809365217, 1.6485780074870402,
1.3155959318893202, 1.2874739746810273,
1.0026950316567134, 0.9778431953263175,
0.7407964632215732, 0.7188143565366919,
0.5301782251550355, 0.5108178556474132,
0.36783729293983153, 0.3509786975126039,
0.2477033990317714, 0.23327746337795385,
0.1612108293933553, 0.14913791048208278,
0.10206627991471746, 0.0921455157443739,
0.06291889441748978, 0.05491040553678575,
0.037925319593087176, 0.03164587313011928,
0.021746082598312868, 0.01716918179125878,
0.011802078729512172, 0.008800254786014377,
0.005729369773746734, 0.00404665753274857,
0.002438423521064161, 0.0016438653926836473,
8.679622710898815E-4, 5.630315554745141E-4,
2.4610177417029653E-4, 1.550152215627658E-4,
4.8720524932222074E-5, 3.0273719787477508E-5,
5.749113286016429E-6, 3.576094051928261E-6,
3.0206864383505644E-7 1.883064219058283E-7
] ]
}, },
"0.20 Second Spectral Acceleration": { "0.20 Second Spectral Acceleration": {
...@@ -161,26 +161,26 @@ ...@@ -161,26 +161,26 @@
1.998773638612381 1.998773638612381
], ],
"ys": [ "ys": [
2.10976447751178, 2.0750656993494196,
1.7128588359837533, 1.6818063013794864,
1.350233035344546, 1.3227025184518288,
1.0376800045033359, 1.013298807102805,
0.7702894343466304, 0.748762675807018,
0.558601281493485, 0.539620931703391,
0.3930643575558777, 0.3765005021851865,
0.2678581174330397, 0.2536404037348987,
0.1774664195036468, 0.1654845938621177,
0.11419991130989657, 0.10430418794078485,
0.0716061441504777, 0.0636051034594437,
0.04370973285041736, 0.03744038607957191,
0.025795082643067353, 0.02114038733793569,
0.01449422780426808, 0.011312720656821382,
0.0075933315773464545, 0.005639629294823775,
0.003615795545145659, 0.0025591790114867854,
0.001537867952047417, 0.001039868924001161,
5.685651545999083E-4, 3.683333614514881E-4,
1.75986014282186E-4, 1.0911595435204257E-4,
4.351293081937339E-5 2.563959455882349E-5
] ]
} }
} }
\ No newline at end of file
src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
+ 70
− 70
View file @ 5f0b6e4c
...@@ -23,25 +23,25 @@ ...@@ -23,25 +23,25 @@
1.7119945007591924 1.7119945007591924
], ],
"ys": [ "ys": [
0.6434776887491847, 0.6192033632207883,
0.48461354491511255, 0.46436030025374686,
0.3510881647725481, 0.33482845978383774,
0.2427129484163405, 0.23015060589670255,
0.1598354577322471, 0.15047675547088715,
0.09842243680641934, 0.09181638010636435,
0.0576611562545184, 0.05325474700128653,
0.031404227451299824, 0.028734185364177288,
0.01601969521656962, 0.01457083186879576,
0.007569030525448274, 0.006883387956900593,
0.0032955905581386357, 0.0030183007451843468,
0.0013105766385416492, 0.0012171146847273784,
4.6887281017631916E-4, 4.439956264597187E-4,
1.4845247660234E-4, 1.432894350463878E-4,
4.001914388212344E-5, 3.929940942056676E-5,
8.709015226738513E-6, 8.690709337172216E-6,
1.3432898196633193E-6, 1.3432898196633193E-6,
1.2403342954558017E-7, 1.240334295455802E-7,
4.8832912315695995E-9, 4.8832912315696E-9,
5.67781840686854E-12 5.67781840686854E-12
] ]
}, },
...@@ -69,23 +69,23 @@ ...@@ -69,23 +69,23 @@
0.7929925155296614 0.7929925155296614
], ],
"ys": [ "ys": [
0.24367737700250408, 0.21844912299024266,
0.1751231665442064, 0.1537274754196999,
0.12002800044690717, 0.1028692785953629,
0.07788985777006069, 0.06504732968486689,
0.04729165862637699, 0.038457123033315006,
0.026813645457474646, 0.021267722732369113,
0.013938279148004131, 0.010824369574200498,
0.006630099710225536, 0.005078017656077424,
0.0028417816801029642, 0.002168935695661389,
0.0010713422331935544, 8.245848755232108E-4,
3.513969445680387E-4, 2.7600745683064015E-4,
9.587671527287437E-5, 7.841691360047029E-5,
2.1653676685502927E-5, 1.8536143347739047E-5,
3.914519688513897E-6, 3.562523863257526E-6,
4.83669959380207E-7, 4.808484996195222E-7,
4.717359749984972E-8, 4.717359749984972E-8,
1.7916876650015264E-9, 1.7916876650015266E-9,
1.8537181269284467E-11, 1.8537181269284467E-11,
0.0, 0.0,
0.0 0.0
...@@ -115,25 +115,25 @@ ...@@ -115,25 +115,25 @@
1.6428726885203377 1.6428726885203377
], ],
"ys": [ "ys": [
0.7606071536482794, 0.7467405260122777,
0.588242101160107, 0.57742911339509,
0.4414803789596026, 0.4330468432194656,
0.3194040429949857, 0.31291582188185285,
0.22186932097400058, 0.21708898337790244,
0.14753402178639052, 0.1442770449423911,
0.093722494129855, 0.0917183747132528,
0.056343232500072074, 0.055255246929130426,
0.03206581545163287, 0.031546539712832236,
0.017118655576517997, 0.01690459075671878,
0.008562335744442894, 0.008488158959654664,
0.003890145739542235, 0.0038692588064091404,
0.0016248807209186939, 0.0016199489814227867,
5.84679007628631E-4, 5.841073988800807E-4,
1.7651463761009508E-4, 1.765060371567558E-4,
4.10802952499715E-5, 4.10802952499715E-5,
6.521460194753413E-6, 6.521460194753413E-6,
5.240989830824311E-7, 5.240989830824311E-7,
1.4207194491405504E-8, 1.4207194491405506E-8,
3.351506238572734E-13 3.351506238572734E-13
] ]
}, },
...@@ -161,26 +161,26 @@ ...@@ -161,26 +161,26 @@
1.998773638612381 1.998773638612381
], ],
"ys": [ "ys": [
0.93023507184292, 0.9137724147907341,
0.743502745399627, 0.7303951737032314,
0.5754359781691307, 0.5651330297904095,
0.43272110188995516, 0.4246637764202623,
0.3124073119594771, 0.30624907769637355,
0.2187027084602443, 0.2141598928049235,
0.14695993123026216, 0.14383671291308556,
0.09428766665935628, 0.09233736530684182,
0.0577636965526377, 0.05667317313271356,
0.033530519151321735, 0.032991816288169086,
0.018359683706606608, 0.01812682854802419,
0.009410412167199327, 0.009324218189206677,
0.004476126943788887, 0.004449211810046104,
0.0019474205649998113, 0.0019401819565851288,
7.543620950713759E-4, 7.529459933240954E-4,
2.495052931328896E-4, 2.4938680892852024E-4,
6.743527114854275E-5, 6.74352461245532E-5,
1.374939974973021E-5, 1.3749399749730212E-5,
1.7302700783578526E-6, 1.7302700783578529E-6,
9.824239626038127E-8 9.824239626038126E-8
] ]
} }
} }
\ No newline at end of file
src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
+ 59
− 59
View file @ 5f0b6e4c
...@@ -23,24 +23,24 @@ ...@@ -23,24 +23,24 @@
1.7119945007591924 1.7119945007591924
], ],
"ys": [ "ys": [
0.4521408019463661, 0.4312797943379837,
0.3378649837554991, 0.32159091420206787,
0.23923014289286137, 0.22752867705708518,
0.1579658997222346, 0.15030060996758515,
0.09625329825352538, 0.09170492160722957,
0.05241542846796099, 0.05004796235003485,
0.025880352446810286, 0.024787437595009457,
0.011220814685563602, 0.010792049454352817,
0.004327166295016238, 0.004186422533282396,
0.0014750147438390051, 0.0014386530763870072,
4.5445398707220827E-4, 4.4731485043692166E-4,
1.2930281573852022E-4, 1.2867517797619972E-4,
3.564510450424815E-5, 3.562825603470808E-5,
9.66308722922416E-6, 9.66308722922416E-6,
2.496110475732598E-6, 2.496110475732598E-6,
5.528704296645165E-7, 5.528704296645164E-7,
8.506614750944166E-8, 8.506614750944167E-8,
7.825206511661106E-9, 7.825206511661108E-9,
3.050308848780185E-10, 3.050308848780185E-10,
3.305406343798575E-13 3.305406343798575E-13
] ]
...@@ -69,23 +69,23 @@ ...@@ -69,23 +69,23 @@
0.7929925155296614 0.7929925155296614
], ],
"ys": [ "ys": [
0.2117612212410495, 0.18944215560467,
0.14993339732135746, 0.13213306473774455,
0.09907006129198055, 0.08593988440033597,
0.06051332358806588, 0.05174104864019564,
0.03357028448372161, 0.02840697153101842,
0.016777660079165483, 0.014140596017254575,
0.007328356488923365, 0.006201602603859234,
0.002774700191414909, 0.0023791384707143627,
8.897481765801692E-4, 7.804038568643974E-4,
2.3138531110442813E-4, 2.100831657752662E-4,
4.7167971784797114E-5, 4.497174315412665E-5,
7.810610553925468E-6, 7.73349634996854E-6,
1.2120957727578958E-6, 1.2120957727578958E-6,
2.134559261756078E-7, 2.134559261756078E-7,
3.1072109211074423E-8, 3.107210921107443E-8,
3.016093263994769E-9, 3.016093263994769E-9,
1.1327510629538606E-10, 1.1327510629538604E-10,
1.1713753423000747E-12, 1.1713753423000747E-12,
0.0, 0.0,
0.0 0.0
...@@ -115,24 +115,24 @@ ...@@ -115,24 +115,24 @@
1.6428726885203377 1.6428726885203377
], ],
"ys": [ "ys": [
0.48485488292114526, 0.4756077415647114,
0.3582975243906195, 0.3525328248271473,
0.25005713007612745, 0.24684549916863346,
0.1631700983244767, 0.1616059123683965,
0.09845456424703024, 0.09780062996242006,
0.0542444423694145, 0.05401543010750376,
0.02709438593679109, 0.027029595884770698,
0.012166014784550714, 0.012152241092958354,
0.0050091795842220005, 0.005007202156567655,
0.0019405902745986364, 0.0019403924029761988,
7.455499565203375E-4, 7.455457300444542E-4,
2.8302771410084653E-4, 2.8302771410084653E-4,
1.083540206844377E-4, 1.083540206844377E-4,
3.7637805874516714E-5, 3.7637805874516714E-5,
1.114635366789293E-5, 1.114635366789293E-5,
2.552603791176247E-6, 2.5526037911762466E-6,
3.992080159958039E-7, 3.992080159958039E-7,
3.157394772999823E-8, 3.1573947729998235E-8,
8.434768915898014E-10, 8.434768915898014E-10,
1.518262424728918E-14 1.518262424728918E-14
] ]
...@@ -161,26 +161,26 @@ ...@@ -161,26 +161,26 @@
1.998773638612381 1.998773638612381
], ],
"ys": [ "ys": [
0.5825513672090984, 0.5703674834569316,
0.45204962331076504, 0.44358517381964635,
0.33156399027128974, 0.32622951888180823,
0.23013881640515024, 0.22711193382517839,
0.1482458521705472, 0.14675406110122302,
0.08925881683644273, 0.08861399799714889,
0.04924084596634653, 0.04900653856108056,
0.02466978692434284, 0.02459974330326487,
0.011332153311778923, 0.01131617993582473,
0.004825455806294248, 0.004822919994455275,
0.0019683175328193015, 0.0019680105545239563,
7.967635491669708E-4, 7.96754213845643E-4,
3.2374121170907595E-4, 3.2374121170907595E-4,
1.293382986753244E-4, 1.293382986753244E-4,
4.819421588433317E-5, 4.819421588433316E-5,
1.5622674096979026E-5, 1.5622674096979026E-5,
4.155937685659816E-6, 4.155937685659817E-6,
8.324719689471659E-7, 8.324719689471658E-7,
1.0224084912621535E-7, 1.0224084912621535E-7,
5.625629449124282E-9 5.625629449124281E-9
] ]
} }
} }
\ No newline at end of file
src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
+ 77
− 77
View file @ 5f0b6e4c
...@@ -23,26 +23,26 @@ ...@@ -23,26 +23,26 @@
1.7119945007591924 1.7119945007591924
], ],
"ys": [ "ys": [
1.2159258310661658, 1.1718318578395919,
0.8575813800464271, 0.8163166981270564,
0.5959078919916538, 0.5573561303666414,
0.41126747491431787, 0.37555628791992113,
0.28506116051094194, 0.2526381876984934,
0.1964128086239923, 0.16816022747869908,
0.1356913317685525, 0.11228321510500883,
0.09148383216118214, 0.07325329638403714,
0.059955433825219805, 0.0464119857084717,
0.03784096185344168, 0.02808361620692229,
0.023037477484063974, 0.016149292822150368,
0.01350599720675444, 0.00881686107458224,
0.0075175722792416065, 0.004550078676905397,
0.0038615014110807396, 0.002183424060137583,
0.001763966977498427, 9.460938494604122E-4,
6.915823090389428E-4, 3.581810741165417E-4,
2.1415758603597696E-4, 1.0851013228833472E-4,
5.0681348756018556E-5, 2.540128189017458E-5,
6.167303581105255E-6, 3.084713207460328E-6,
1.591852569355597E-8 7.959868754931204E-9
] ]
}, },
"5.00 Second Spectral Acceleration": { "5.00 Second Spectral Acceleration": {
...@@ -69,23 +69,23 @@ ...@@ -69,23 +69,23 @@
0.7929925155296614 0.7929925155296614
], ],
"ys": [ "ys": [
0.3600775112735588, 0.3146699477109087,
0.26816419380242423, 0.22664551336330394,
0.1984417701314697, 0.161336074118712,
0.1451947639338657, 0.11305706364945849,
0.10374572967093908, 0.0770963119469564,
0.07171601532030644, 0.05076799678988205,
0.04703048659679875, 0.031636058191480444,
0.02926000531660955, 0.018651707160619386,
0.01733665054927165, 0.010438047865530126,
0.009791850799705817, 0.005564951322513462,
0.005236530162684398, 0.0028294493769777376,
0.0025739708152588093, 0.0013403369430325734,
0.0011097890181196116, 5.648485361979159E-4,
4.083917250662495E-4, 2.053620262699437E-4,
1.1652339333511117E-4, 5.835381781996716E-5,
2.3435841251968675E-5, 1.172399461565542E-5,
1.6487167098260288E-6, 8.245582803719639E-7,
4.133196233828474E-12, 4.133196233828474E-12,
0.0, 0.0,
0.0 0.0
...@@ -115,26 +115,26 @@ ...@@ -115,26 +115,26 @@
1.6428726885203377 1.6428726885203377
], ],
"ys": [ "ys": [
1.5359273668145488, 1.498558292445958,
1.1109958282128591, 1.0751698716205067,
0.7836771839352107, 0.7496388724927093,
0.5414864500834288, 0.5099668544687044,
0.3694654277308717, 0.34151588718206993,
0.2503859682824899, 0.22693006829625417,
0.16907093236956933, 0.15040015642744384,
0.11353726314987093, 0.09917365711776449,
0.07649495197411692, 0.06535193866497421,
0.051632246990799865, 0.0426372886546409,
0.03468677087885077, 0.027198229239570094,
0.02246296904456716, 0.016395590604149867,
0.01390149077370863, 0.009363736307620663,
0.007840875080080462, 0.0048808949278301575,
0.003935358697623874, 0.0022915770147814425,
0.0016841860872128603, 9.299313083417054E-4,
5.943873525338244E-4, 3.1484930222756114E-4,
1.616864468960317E-4, 8.305479385884388E-5,
3.0657214421952316E-5, 1.5455490346830045E-5,
2.4335803459419693E-6 1.2198514299655761E-6
] ]
}, },
"0.20 Second Spectral Acceleration": { "0.20 Second Spectral Acceleration": {
...@@ -161,26 +161,26 @@ ...@@ -161,26 +161,26 @@
1.998773638612381 1.998773638612381
], ],
"ys": [ "ys": [
2.0994032993067653, 2.0608003512754616,
1.5913012523689938, 1.55435620010703,
1.1612211898485372, 1.1259113286998912,
0.8257954168805259, 0.7924323231374716,
0.5708320544732013, 0.5401668129939782,
0.3923990276307998, 0.36526108247696903,
0.26758242177737995, 0.2446943495279798,
0.1812725264706303, 0.16286432793529182,
0.12275173810934054, 0.10835935230563769,
0.08311421116083757, 0.07185102072207543,
0.05629317972374059, 0.047234230566097934,
0.03779398431687564, 0.030344852313191704,
0.02477571460864562, 0.018738351070079595,
0.015599397434413444, 0.010986304276291778,
0.009280759776537247, 0.006067721989013439,
0.005116827353903279, 0.003120785561123521,
0.002574500462608576, 0.0014801778101777682,
0.001158040053317887, 6.355051731490864E-4,
4.4819093059299974E-4, 2.3727692182995611E-4,
1.4607092065662027E-4 7.518732917369606E-5
] ]
} }
} }
\ No newline at end of file
src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
+ 78
− 78
View file @ 5f0b6e4c
...@@ -23,26 +23,26 @@ ...@@ -23,26 +23,26 @@
1.7119945007591924 1.7119945007591924
], ],
"ys": [ "ys": [
0.9640082172283245, 0.9241150171596147,
0.7266845261739096, 0.6894805648071802,
0.5315341708269404, 0.4975816116925831,
0.3744816823884738, 0.3444672471074588,
0.2546847236876489, 0.2291653665546729,
0.16596746782690328, 0.14528178784662196,
0.10671946960437804, 0.09049089650406522,
0.0674862513504341, 0.05508823631235109,
0.04280097852102572, 0.0333644104008108,
0.02722274563388079, 0.020018000226823936,
0.017312871779285234, 0.011848318421347889,
0.010850888984807945, 0.0068593233347689865,
0.006514963931052017, 0.003820037466490135,
0.0036174798647396708, 0.001994484442083503,
0.0017902162830235044, 9.44043002594921E-4,
7.645725648609873E-4, 3.9188429275620904E-4,
2.6320629149584974E-4, 1.3270868096868809E-4,
7.052652680811485E-5, 3.530774130841558E-5,
1.2681040567881226E-5, 6.341584813040933E-6,
3.247918036212079E-7 1.6239707289596624E-7
] ]
}, },
"5.00 Second Spectral Acceleration": { "5.00 Second Spectral Acceleration": {
...@@ -69,24 +69,24 @@ ...@@ -69,24 +69,24 @@
0.7929925155296614 0.7929925155296614
], ],
"ys": [ "ys": [
0.3734401100252404, 0.33341681472925533,
0.2754130565276823, 0.23979956308504694,
0.19558902996139052, 0.16515032252659934,
0.13400764737913048, 0.10906573879921368,
0.08848953528432797, 0.06893178795486755,
0.056835991285428246, 0.0420685387690673,
0.03549822657753323, 0.02474479792701736,
0.021906327742640692, 0.014267070974622369,
0.013428103807746835, 0.008136655440433623,
0.008090626080542535, 0.004579717417562423,
0.0046838761583584835, 0.00251212160780864,
0.0025041316362595183, 0.0012958865870568441,
0.0011749083769780869, 5.957432479510453E-4,
4.711526977045352E-4, 2.3655123608436621E-4,
1.4892624546524445E-4, 7.455071630818507E-5,
3.571104635738625E-5, 1.786413006174534E-5,
3.9313682790525796E-6, 1.9660127601383514E-6,
2.4417348541893015E-8, 1.2212066658447131E-8,
0.0, 0.0,
0.0 0.0
] ]
...@@ -115,26 +115,26 @@ ...@@ -115,26 +115,26 @@
1.6428726885203377 1.6428726885203377
], ],
"ys": [ "ys": [
1.075047463948679, 1.0418327331985027,
0.8160126309383388, 0.7852430916620532,
0.601516680630447, 0.5736722279105961,
0.42812926719194444, 0.40380180985560116,
0.29500401844892166, 0.2745903970209713,
0.19839120582833947, 0.1818856018906268,
0.13165901185194073, 0.11863393997339917,
0.0867515256691255, 0.07651348555396194,
0.05765064709288777, 0.0493602946573138,
0.03887735421627216, 0.03184735199288833,
0.026660023823584064, 0.020529016825084595,
0.018059719596521098, 0.012857688933185103,
0.011891576420038753, 0.00779613066017011,
0.007220284151377285, 0.004377331141906192,
0.003932411706436407, 0.0022341722119048973,
0.0018451420085392, 9.964915607910054E-4,
7.2528012678824E-4, 3.77375640231403E-4,
2.2770893036390573E-4, 1.1561991198348781E-4,
5.33507880004623E-5, 2.6760383132144156E-5,
7.540116844803375E-6 3.7711003714336774E-6
] ]
}, },
"0.20 Second Spectral Acceleration": { "0.20 Second Spectral Acceleration": {
...@@ -161,26 +161,26 @@ ...@@ -161,26 +161,26 @@
1.998773638612381 1.998773638612381
], ],
"ys": [ "ys": [
1.3775051427805944, 1.3428581144394656,
1.0763795929467679, 1.0438847620834202,
0.8155307182840461, 0.7854590310653587,
0.6014437915324622, 0.5742212919734676,
0.4278483055495324, 0.40406366702549956,
0.298665901391765, 0.2786032600344873,
0.2042055092818208, 0.18786759967130257,
0.13741401507263937, 0.12442854368898455,
0.09201782863520601, 0.08170669885961399,
0.06168661803013043, 0.05330827988626577,
0.041734305089989085, 0.03467421955551327,
0.0284880503212683, 0.022411168729153916,
0.01939309754459398, 0.014253555553422169,
0.012892381976422809, 0.00879118877000131,
0.008178175972766356, 0.0051777971500815995,
0.004840011936636076, 0.0028651491965027464,
0.002633514332066905, 0.0014742796541815763,
0.001294039919296989, 6.939964545919095E-4,
5.55989505421147E-4, 2.892020968712435E-4,
2.032220097653346E-4 1.0351909861573627E-4
] ]
} }
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment