From d8c936b92d0f59cd4ae439603456e70a160863d2 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 1 Dec 2023 13:55:35 -0700
Subject: [PATCH] updated 2007 gmms and tests
---
nshms.yml | 2 +-
.../earthquake/nshmp/model/NshmTests.java | 2 +-
.../e2e/nshm-alaska-2007/ANCHORAGE_AK.json | 132 +++++++++---------
.../e2e/nshm-alaska-2007/FAIRBANKS_AK.json | 130 ++++++++---------
.../e2e/nshm-alaska-2007/JUNEAU_AK.json | 130 ++++++++---------
.../e2e/nshm-alaska-2007/KODIAK_AK.json | 130 ++++++++---------
.../e2e/nshm-alaska-2007/VALDEZ_AK.json | 130 ++++++++---------
7 files changed, 328 insertions(+), 328 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index cafe575a..fed1158a 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -5,7 +5,7 @@ nshms:
# Alaska 2007 NSHM
-
repo: nshm-alaska
- tag: 2.2.1
+ tag: 2.2.2
year: 2007
deployment:
baseHref: /ws/nshmp/alaska-2007/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 1a886f34..31f267a9 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-2023"));
+ NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2007"));
NshmTestUtils.writeExpecteds(nshmModel, Optional.empty());
nshmModel.exec.shutdown();
diff --git a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
index d327441d..886951be 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -3,45 +3,45 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 1.216784296389448,
- 1.001712499365357,
- 0.7796429247164196,
- 0.5719011068498189,
- 0.39834574699730324,
- 0.2617839994778919,
- 0.1660428466673632,
- 0.10003334171779812,
- 0.05737347098846019,
- 0.030619419719839034,
- 0.014904607266644073,
- 0.006565568384584037,
- 0.0026793854641647477,
- 0.0010416460147385327,
- 3.629137895691359E-4,
- 9.82623278317095E-5,
- 1.5879665844816693E-5,
- 6.648778909021348E-7,
- 1.7997491318464677E-12,
+ 1.2264112924120234,
+ 1.0130512209664995,
+ 0.7922530404574435,
+ 0.5845793026436414,
+ 0.40948452443114636,
+ 0.2701877564144387,
+ 0.17153207603363751,
+ 0.10302708940800644,
+ 0.05859440515291784,
+ 0.030795114630204887,
+ 0.014682892533395813,
+ 0.006335021583353106,
+ 0.002520765819334627,
+ 9.186393104929187E-4,
+ 2.783076458862005E-4,
+ 6.191426810623913E-5,
+ 7.185728855298651E-6,
+ 4.5801849257632056E-8,
+ 4.150306342389818E-11,
0.0
]
},
@@ -61,33 +61,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.65397819274769,
- 1.4774726044583617,
- 1.2707743009482835,
- 1.0374950532982243,
- 0.7909487640658448,
- 0.5566615888725722,
- 0.36270892517478526,
- 0.22040790487251347,
- 0.12651798364766775,
- 0.06757725919698641,
- 0.03300267773366276,
- 0.014271739151160378,
- 0.005693025514814956,
- 0.0019431717707338516,
- 4.873075258836614E-4,
- 7.326467022422193E-5,
- 5.361893639138177E-6,
- 2.0660199338622954E-7,
- 3.1708663587822375E-10,
+ 1.663608367586542,
+ 1.4918235062552783,
+ 1.2892180763534433,
+ 1.0576562872359996,
+ 0.8100894746478681,
+ 0.5730186406747791,
+ 0.37527506687894024,
+ 0.22882200314142115,
+ 0.1312627633465358,
+ 0.0698024275518075,
+ 0.03402805694012991,
+ 0.01481335546757066,
+ 0.0059007195959997275,
+ 0.001919495583119483,
+ 4.4943850925725456E-4,
+ 6.655685742920841E-5,
+ 5.246215651199832E-6,
+ 9.214022711634919E-8,
+ 0.0,
0.0
]
},
@@ -115,26 +115,26 @@
1.998773638612381
],
"ys": [
- 1.7220962968776978,
- 1.57398677222407,
- 1.394851420852358,
- 1.1868737782914325,
- 0.9486733636220279,
- 0.7100408174082282,
- 0.49472716125753763,
- 0.3226156937754519,
- 0.1994750268988446,
- 0.11681594901507047,
- 0.06395461351278024,
- 0.031884675080501315,
- 0.014271993188868272,
- 0.005793050581460287,
- 0.002121342475395979,
- 6.235952081095883E-4,
- 1.226785445725974E-4,
- 1.4246353621355985E-5,
- 9.352016591244695E-7,
- 4.253931015422376E-8
+ 1.7263302638405387,
+ 1.5812472193762726,
+ 1.405378522623212,
+ 1.1999934467722015,
+ 0.9632749306380156,
+ 0.724541678964747,
+ 0.5073471189618418,
+ 0.3321186663047989,
+ 0.20562015931522332,
+ 0.12010012450491961,
+ 0.06530009777719666,
+ 0.03233356244525118,
+ 0.014477560880507473,
+ 0.005880570454043185,
+ 0.0020779547093687932,
+ 5.642373024188739E-4,
+ 1.047021912681255E-4,
+ 1.2239251108110158E-5,
+ 8.209138694463464E-7,
+ 7.2501279465804674E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
index 8cfd6806..2aa60b55 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -3,45 +3,45 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.3464423908576828,
- 0.2746884250513254,
- 0.20330958648206368,
- 0.1403632886808619,
- 0.0915012349273498,
- 0.056022641564065334,
- 0.03311999914335675,
- 0.018571316457003897,
- 0.009917617739224244,
- 0.004934944876941708,
- 0.0022460954288533925,
- 9.151846593388019E-4,
- 3.26727481232607E-4,
- 9.811837073821066E-5,
- 2.4114425298279172E-5,
- 4.475413565666441E-6,
- 4.930242108836647E-7,
- 2.0581607286335368E-8,
- 3.9947818607662745E-11,
+ 0.3579707181853255,
+ 0.2876987126769738,
+ 0.2161973568686493,
+ 0.15154369220846364,
+ 0.1000432007569064,
+ 0.06178566373277879,
+ 0.03666603494724606,
+ 0.020552165118987144,
+ 0.010941529185374504,
+ 0.005426831311015517,
+ 0.0024683139938808936,
+ 0.0010104231156229232,
+ 3.6483773608183754E-4,
+ 1.1160888079220879E-4,
+ 2.7953221062312066E-5,
+ 5.271529944160336E-6,
+ 5.907387765772356E-7,
+ 2.8051670944348496E-8,
+ 3.2640527676385684E-10,
0.0
]
},
@@ -61,32 +61,32 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.42512155522078154,
- 0.3741248597866011,
- 0.31527269776137723,
- 0.2491485882595672,
- 0.1799327453137114,
- 0.11646001961850086,
- 0.06764399484522848,
- 0.035703098745247346,
- 0.017700600181056944,
- 0.00837961685899477,
- 0.0038272935587927537,
- 0.0016232798394108885,
- 6.340002373559136E-4,
- 2.0468430635468642E-4,
- 5.011845527471985E-5,
- 7.698786233975062E-6,
- 5.300404641363028E-7,
- 3.548535310227123E-9,
+ 0.43364868860192285,
+ 0.38708343386644917,
+ 0.3320221452340812,
+ 0.267180571249783,
+ 0.19619293543269656,
+ 0.1291106526273168,
+ 0.07633459275204346,
+ 0.04103197897720121,
+ 0.020709147520431553,
+ 0.00998570872173676,
+ 0.0046598348105031965,
+ 0.002036169603386233,
+ 8.301196235516703E-4,
+ 2.8574234346910593E-4,
+ 7.702356674794917E-5,
+ 1.3935311617175321E-5,
+ 1.3457200105156386E-6,
+ 3.476834967872206E-8,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.998773638612381
],
"ys": [
- 0.4639164930556865,
- 0.42128555188145733,
- 0.3691183172602479,
- 0.30700991917468584,
- 0.2352268775263029,
- 0.1653869037122999,
- 0.10623707402118183,
- 0.06272553775403064,
- 0.03469716969315349,
- 0.018259778334807297,
- 0.009222357093637543,
- 0.004424577781715228,
- 0.00198392813312124,
- 8.083322813290075E-4,
- 2.830172399074972E-4,
- 7.925255124903666E-5,
- 1.5951797142877935E-5,
- 1.963226654943825E-6,
- 1.0896404398015089E-7,
- 2.452338948529823E-10
+ 0.46810135338425757,
+ 0.4288241200033628,
+ 0.38053722423899383,
+ 0.32162231909674566,
+ 0.25122578458346967,
+ 0.18025793257189,
+ 0.11807500789128669,
+ 0.07101017096278309,
+ 0.039938922851086425,
+ 0.021315204842262746,
+ 0.010907774286565218,
+ 0.005324213972732372,
+ 0.0024505106104714637,
+ 0.0010373081996816061,
+ 3.838377653930644E-4,
+ 1.1610292856107396E-4,
+ 2.638121906168278E-5,
+ 4.012762250105297E-6,
+ 3.4044289504614473E-7,
+ 3.762744898891126E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
index a18ed264..4132d017 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -3,45 +3,45 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.15711896486246746,
- 0.12501262128440851,
- 0.09573172183056405,
- 0.07175972210060443,
- 0.053919993202308635,
- 0.040401182475899265,
- 0.02978383684132939,
- 0.020390931410482413,
- 0.01260966486160384,
- 0.006969616384468542,
- 0.003419961276845986,
- 0.001426755968984542,
- 4.763697061356834E-4,
- 1.1838379953962976E-4,
- 1.9467603264257974E-5,
- 2.1012839661451054E-6,
- 1.7178404489425482E-7,
- 2.9031224848126118E-9,
- 3.2000505378803756E-12,
+ 0.16511811331797466,
+ 0.13341073384176416,
+ 0.10385618456014634,
+ 0.07902188859550191,
+ 0.060018273294110976,
+ 0.04528787827937676,
+ 0.03363944818919821,
+ 0.023361198780357813,
+ 0.014729158649896958,
+ 0.008263769244431687,
+ 0.004070643006385593,
+ 0.0016897632184527708,
+ 5.577598349609066E-4,
+ 1.3686390458969688E-4,
+ 2.1816420596039634E-5,
+ 2.2352701196940556E-6,
+ 1.797907745395782E-7,
+ 3.505992629167848E-9,
+ 2.6574564716418673E-11,
0.0
]
},
@@ -61,32 +61,32 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.1778922496833284,
- 0.15506822814114957,
- 0.1308377467268995,
- 0.10486391161493126,
- 0.07816083816160604,
- 0.053552032042243444,
- 0.03362392034614441,
- 0.018925421114481263,
- 0.009320182850262714,
- 0.003883187508247969,
- 0.0013873837718383136,
- 4.3431463298702157E-4,
- 1.259789594876419E-4,
- 2.8891731713975013E-5,
- 4.9391883396298844E-6,
- 6.333607105458819E-7,
- 4.213447857938414E-8,
- 2.8098517790646575E-10,
+ 0.18519935561829448,
+ 0.1640612068929793,
+ 0.14116005300883055,
+ 0.11531869299339284,
+ 0.08734260595358226,
+ 0.060802863576865235,
+ 0.039046241347203706,
+ 0.022761727428527074,
+ 0.01170523162050006,
+ 0.005069428864729844,
+ 0.0018386185629951724,
+ 5.652528480838755E-4,
+ 1.6176648428202974E-4,
+ 3.916660715787298E-5,
+ 7.5009386403434744E-6,
+ 1.1443797131678923E-6,
+ 1.0842817904321163E-7,
+ 2.7928507217515535E-9,
0.0,
0.0
]
@@ -115,26 +115,26 @@
1.998773638612381
],
"ys": [
- 0.20198315974707726,
- 0.18021937291091744,
- 0.15619226394543845,
- 0.1297226266098986,
- 0.10052490844368282,
- 0.07290039731805786,
- 0.04959322834395091,
- 0.03132812189942363,
- 0.017987779421530157,
- 0.00937667316239904,
- 0.004463898770707188,
- 0.0018544280343519254,
- 6.50698309917748E-4,
- 1.9287667775979073E-4,
- 4.86255393650736E-5,
- 9.96081599232255E-6,
- 1.5784375508128453E-6,
- 1.6294075376712294E-7,
- 8.817948928079425E-9,
- 1.972572104269551E-11
+ 0.20716549480979196,
+ 0.1868267346296359,
+ 0.16437165037107387,
+ 0.13908151584232675,
+ 0.11013908267956038,
+ 0.0814696990445527,
+ 0.05622482422534604,
+ 0.03611274190278012,
+ 0.021415003895073458,
+ 0.011664442043973476,
+ 0.005773724279205021,
+ 0.002463533213059794,
+ 8.696958754763637E-4,
+ 2.53940081823601E-4,
+ 6.31098784754927E-5,
+ 1.356998418044528E-5,
+ 2.440954497010684E-6,
+ 3.305692763395587E-7,
+ 2.7618125380620528E-8,
+ 3.0346597226294626E-10
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
index f71dcfe8..51c37bc2 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -3,44 +3,44 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 1.0202890885330151,
- 0.8375083352263466,
- 0.6475662303710862,
- 0.4707918425427097,
- 0.32519272294896445,
- 0.2128312414135632,
- 0.13574097527098886,
- 0.08381717413931654,
- 0.05102722546305095,
- 0.030533684096192584,
- 0.017757505947837975,
- 0.009779208536822154,
- 0.00495739062237132,
- 0.00223748814778023,
- 8.360775271106734E-4,
- 2.3127145518716242E-4,
- 3.908766959259963E-5,
- 2.5626815539339554E-6,
+ 1.025532000785376,
+ 0.8431494646534106,
+ 0.6539381720622285,
+ 0.47760914477051053,
+ 0.33153535611135243,
+ 0.21782718962885356,
+ 0.13909411174965414,
+ 0.08566226732937617,
+ 0.051713628585688676,
+ 0.03041336789622197,
+ 0.017185615957543664,
+ 0.00909095804527792,
+ 0.0043637971586372995,
+ 0.0018093070914810944,
+ 5.897333191354899E-4,
+ 1.3387369180688693E-4,
+ 1.655933871082143E-5,
+ 4.295128471502182E-8,
0.0,
0.0
]
@@ -61,33 +61,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.3143840761818832,
- 1.1715241821556248,
- 1.0073110589775853,
- 0.8224391253457789,
- 0.625115708600688,
- 0.4357796832874383,
- 0.27952789844459086,
- 0.16752488019629042,
- 0.09692443479191427,
- 0.054873332137219115,
- 0.030272844286145184,
- 0.015399970754471156,
- 0.007108660320946838,
- 0.0027335226497319045,
- 7.558825338514728E-4,
- 1.1765771038459163E-4,
- 6.310901665123947E-6,
- 2.450787801717188E-7,
- 3.507351114684557E-10,
+ 1.3227810844868024,
+ 1.1827730498389686,
+ 1.0201540878406692,
+ 0.8345188132208646,
+ 0.6347065272560531,
+ 0.4427373245861399,
+ 0.2842314452825152,
+ 0.17031052275716954,
+ 0.09822203867991744,
+ 0.05511113274836976,
+ 0.029856345090811694,
+ 0.014770076430438872,
+ 0.006575575087681616,
+ 0.002343327839396672,
+ 5.80060815456677E-4,
+ 8.595930628842582E-5,
+ 5.172147218382029E-6,
+ 9.470987573932315E-8,
+ 0.0,
0.0
]
},
@@ -115,26 +115,26 @@
1.998773638612381
],
"ys": [
- 1.3878090480442422,
- 1.2678189199286058,
- 1.1244476634474232,
- 0.9577566116756505,
- 0.7648024244341657,
- 0.5696821914048495,
- 0.3936262320736718,
- 0.25445762904341573,
- 0.1571249991498746,
- 0.094043350911653,
- 0.055139868554608104,
- 0.03136425581007428,
- 0.016788523699286094,
- 0.008121696981340597,
- 0.003390880322593564,
- 0.0010922520629723035,
- 2.2741198895158385E-4,
- 2.4083912692036422E-5,
- 1.1325656884416224E-6,
- 5.171979288734243E-8
+ 1.391401770264848,
+ 1.273544813953684,
+ 1.1319759330338406,
+ 0.9660013739354516,
+ 0.7727077311001616,
+ 0.5765245779628024,
+ 0.3988399340075193,
+ 0.25783588967943655,
+ 0.1588991127796741,
+ 0.0946452702807324,
+ 0.054948710652557894,
+ 0.030690714467677876,
+ 0.015970304594108732,
+ 0.0074395106985195416,
+ 0.0029120622682370545,
+ 8.419003137081459E-4,
+ 1.5707816442448705E-4,
+ 1.4654542754725075E-5,
+ 7.927603848727249E-7,
+ 5.993776825224994E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
index b6e51348..250d6bc0 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -3,44 +3,44 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.8012677504331032,
- 0.6573423103469674,
- 0.5063567337421475,
- 0.36567614652874564,
- 0.24998725414520195,
- 0.16073387876630177,
- 0.09954072289402163,
- 0.05862243229234874,
- 0.03334265172051943,
- 0.018278944451505758,
- 0.009656941823402142,
- 0.004895423521973996,
- 0.002401904041828213,
- 0.0011587127756169883,
- 5.217832797347172E-4,
- 1.8943907736914238E-4,
- 4.520195530459815E-5,
- 5.9031694728150844E-6,
+ 0.8059935642199796,
+ 0.6628025988279755,
+ 0.5130848761444204,
+ 0.37334379917625177,
+ 0.2574618130649236,
+ 0.1668802689507941,
+ 0.1038507671950509,
+ 0.06115368099871682,
+ 0.03452531094845143,
+ 0.018603578147822663,
+ 0.00956051741874846,
+ 0.004689990484845557,
+ 0.0022235404552280497,
+ 0.0010111417491271402,
+ 4.0201835791559096E-4,
+ 1.2046253935740112E-4,
+ 2.2072704517587235E-5,
+ 1.5276946097946847E-6,
0.0,
0.0
]
@@ -61,33 +61,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.0038320165648555,
- 0.9057705268649429,
- 0.7875249886419105,
- 0.646418900623757,
- 0.4882256711176156,
- 0.3326428076794074,
- 0.20478981928867987,
- 0.11605620823277468,
- 0.0631495460606707,
- 0.033670693646757656,
- 0.017560259407659134,
- 0.00853103150445209,
- 0.003921440108418463,
- 0.0016798703505209835,
- 6.031299483740042E-4,
- 1.304993686643946E-4,
- 1.2042480549777548E-5,
- 2.2852168444346527E-7,
- 3.1708663587822375E-10,
+ 1.0105485858726029,
+ 0.9148221705812921,
+ 0.7979303883777544,
+ 0.6564470577487819,
+ 0.49685271028301914,
+ 0.33991040649881954,
+ 0.2106273415057383,
+ 0.12017051543358485,
+ 0.065562127735567,
+ 0.03476913997456692,
+ 0.017879139994933874,
+ 0.008538331655258077,
+ 0.0038728243008015295,
+ 0.0015641676624128234,
+ 4.735646901885909E-4,
+ 8.24452629145852E-5,
+ 5.761402214272294E-6,
+ 8.549050325452606E-8,
+ 0.0,
0.0
]
},
@@ -115,26 +115,26 @@
1.998773638612381
],
"ys": [
- 1.0667638963335844,
- 0.9865827154981542,
- 0.885693843075509,
- 0.7608557925362751,
- 0.608087709906037,
- 0.44839060199479647,
- 0.3029026005554235,
- 0.18897128034685856,
- 0.1114445428191399,
- 0.06331826478144816,
- 0.035125825079706796,
- 0.01885795753078175,
- 0.0095744801255221,
- 0.004527700423457455,
- 0.002011162445869445,
- 7.907593732871031E-4,
- 2.229299254168037E-4,
- 3.484169813642111E-5,
- 1.6439194740510125E-6,
- 4.675795093996697E-8
+ 1.0700866200736616,
+ 0.9917734004054771,
+ 0.8923963905032146,
+ 0.768213827030791,
+ 0.6155444970923921,
+ 0.45563716834846313,
+ 0.3094054654031962,
+ 0.19414422510732537,
+ 0.11499420789729181,
+ 0.06536062573910686,
+ 0.036025141766851544,
+ 0.01906777775052431,
+ 0.009503083652591261,
+ 0.0044191789734711944,
+ 0.0018861902166119864,
+ 6.558141603467896E-4,
+ 1.5212058972598988E-4,
+ 1.9130460930507163E-5,
+ 7.556890746184725E-7,
+ 5.44663885326246E-9
]
}
}
\ No newline at end of file
--
GitLab