diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fef51b0e57a6a4e1a83e7d0b747e77734176eef..64c6076dd151404e1c90838b184432ea1841e853 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -245,6 +245,7 @@ NSHM Tests:
needs: []
parallel:
matrix:
+ - CMD: testAlaska2007
- CMD: testAlaska2023
- CMD: testConus2018
- CMD: testConus2023
diff --git a/nshms.yml b/nshms.yml
index e414cbf46a0a87c1b53d298fd40f6f5fd5d8ae10..784b70c5ff474f647a38313cf8e6aec59765f109 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -2,10 +2,10 @@
# NSHMs to use for unit tests and for deployments.
####
nshms:
- # Alaska 2023 NSHM
+ # Alaska 2007 NSHM
-
repo: nshm-alaska
- tag: 2.2.0
+ tag: 2.2.1
year: 2007
deployments:
development:
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 81f87b76c9e26cd249a34929a553115f1c507f41..d327441dc38348100823e5520a161d4adffb9249 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -3,24 +3,24 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
1.216784296389448,
@@ -32,16 +32,16 @@
0.1660428466673632,
0.10003334171779812,
0.05737347098846019,
- 0.030619419719839037,
+ 0.030619419719839034,
0.014904607266644073,
- 0.006565568384584038,
+ 0.006565568384584037,
0.0026793854641647477,
- 0.0010416460147385325,
+ 0.0010416460147385327,
3.629137895691359E-4,
9.82623278317095E-5,
1.5879665844816693E-5,
6.648778909021348E-7,
- 1.7997491318464683E-12,
+ 1.7997491318464677E-12,
0.0
]
},
@@ -61,10 +61,10 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
@@ -73,18 +73,18 @@
1.4774726044583617,
1.2707743009482835,
1.0374950532982243,
- 0.7909487640658447,
+ 0.7909487640658448,
0.5566615888725722,
- 0.3627089251747853,
+ 0.36270892517478526,
0.22040790487251347,
0.12651798364766775,
0.06757725919698641,
- 0.033002677733662764,
+ 0.03300267773366276,
0.014271739151160378,
- 0.005693025514814955,
+ 0.005693025514814956,
0.0019431717707338516,
- 4.8730752588366135E-4,
- 7.326467022422194E-5,
+ 4.873075258836614E-4,
+ 7.326467022422193E-5,
5.361893639138177E-6,
2.0660199338622954E-7,
3.1708663587822375E-10,
@@ -115,24 +115,24 @@
1.998773638612381
],
"ys": [
- 1.722096296877698,
+ 1.7220962968776978,
1.57398677222407,
- 1.3948514208523581,
+ 1.394851420852358,
1.1868737782914325,
0.9486733636220279,
- 0.7100408174082283,
- 0.4947271612575376,
- 0.32261569377545196,
- 0.19947502689884467,
- 0.11681594901507046,
+ 0.7100408174082282,
+ 0.49472716125753763,
+ 0.3226156937754519,
+ 0.1994750268988446,
+ 0.11681594901507047,
0.06395461351278024,
0.031884675080501315,
- 0.014271993188868275,
+ 0.014271993188868272,
0.005793050581460287,
0.002121342475395979,
- 6.235952081095882E-4,
+ 6.235952081095883E-4,
1.226785445725974E-4,
- 1.4246353621355988E-5,
+ 1.4246353621355985E-5,
9.352016591244695E-7,
4.253931015422376E-8
]
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 9905470df879c8e282140f339401e0c1e8f85757..8cfd6806e8535e70a1c6ff7d6244f41896df4df6 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -3,43 +3,43 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
0.3464423908576828,
0.2746884250513254,
- 0.20330958648206365,
- 0.14036328868086187,
+ 0.20330958648206368,
+ 0.1403632886808619,
0.0915012349273498,
0.056022641564065334,
0.03311999914335675,
- 0.0185713164570039,
+ 0.018571316457003897,
0.009917617739224244,
0.004934944876941708,
- 0.002246095428853393,
- 9.151846593388017E-4,
- 3.2672748123260695E-4,
+ 0.0022460954288533925,
+ 9.151846593388019E-4,
+ 3.26727481232607E-4,
9.811837073821066E-5,
2.4114425298279172E-5,
4.475413565666441E-6,
- 4.930242108836648E-7,
+ 4.930242108836647E-7,
2.0581607286335368E-8,
3.9947818607662745E-11,
0.0
@@ -61,17 +61,17 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
0.42512155522078154,
0.3741248597866011,
- 0.3152726977613771,
+ 0.31527269776137723,
0.2491485882595672,
0.1799327453137114,
0.11646001961850086,
@@ -133,7 +133,7 @@
7.925255124903666E-5,
1.5951797142877935E-5,
1.963226654943825E-6,
- 1.089640439801509E-7,
+ 1.0896404398015089E-7,
2.452338948529823E-10
]
}
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 860bfd86525d5db1a2ba3b9ea301c4fd8a7713d9..a18ed264e491cd2a93b7ac4c7ecc1ecd364be801 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -3,44 +3,44 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.14018496089247262,
- 0.1082180504924474,
- 0.07924233732120106,
- 0.05582782598193431,
- 0.03894598542891116,
- 0.027051416538377965,
- 0.018782546895544608,
- 0.012334737104400877,
- 0.007428193921599053,
- 0.004041166881254465,
- 0.0019814162270296912,
- 8.466167136800707E-4,
- 2.985332224552966E-4,
- 8.107412195629211E-5,
- 1.5578100036615844E-5,
- 2.0319947482407376E-6,
+ 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.9031224848126113E-9,
+ 2.9031224848126118E-9,
3.2000505378803756E-12,
0.0
]
@@ -61,28 +61,28 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.16119691921728796,
- 0.13873414272430967,
- 0.11495867702672521,
- 0.08962877562496549,
- 0.06406406418411464,
- 0.04146443536571581,
- 0.024584756227350266,
- 0.013434411687047471,
- 0.006749211263866024,
- 0.0030316026784251,
- 0.0012097560999651123,
- 4.1753422654192433E-4,
- 1.255941387114207E-4,
- 2.8891731713975016E-5,
+ 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,
@@ -115,21 +115,21 @@
1.998773638612381
],
"ys": [
- 0.18505130966174427,
- 0.16345119360758736,
- 0.13975659408596586,
- 0.11382259847142859,
- 0.08555542293931166,
- 0.05945984027585358,
- 0.03845004207648512,
- 0.02325634313827287,
- 0.01311636208532044,
- 0.006922451437616338,
- 0.0034286644021358924,
- 0.001520932694912381,
- 5.788668145749388E-4,
- 1.850169501925151E-4,
- 4.846642143656083E-5,
+ 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,
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 55efc0f09e943fbd021f5d573f5db58940b8ab35..f71dcfe8e65907b258ed8072c20ce9269a10b1b1 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -3,35 +3,35 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
1.0202890885330151,
0.8375083352263466,
0.6475662303710862,
- 0.4707918425427096,
+ 0.4707918425427097,
0.32519272294896445,
- 0.21283124141356322,
+ 0.2128312414135632,
0.13574097527098886,
- 0.08381717413931657,
- 0.05102722546305094,
+ 0.08381717413931654,
+ 0.05102722546305095,
0.030533684096192584,
0.017757505947837975,
0.009779208536822154,
@@ -61,27 +61,27 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.3143840761818835,
+ 1.3143840761818832,
1.1715241821556248,
1.0073110589775853,
- 0.822439125345779,
+ 0.8224391253457789,
0.625115708600688,
0.4357796832874383,
- 0.2795278984445908,
+ 0.27952789844459086,
0.16752488019629042,
0.09692443479191427,
- 0.05487333213721911,
+ 0.054873332137219115,
0.030272844286145184,
- 0.015399970754471155,
- 0.007108660320946837,
+ 0.015399970754471156,
+ 0.007108660320946838,
0.0027335226497319045,
7.558825338514728E-4,
1.1765771038459163E-4,
@@ -117,21 +117,21 @@
"ys": [
1.3878090480442422,
1.2678189199286058,
- 1.1244476634474234,
+ 1.1244476634474232,
0.9577566116756505,
- 0.7648024244341658,
+ 0.7648024244341657,
0.5696821914048495,
0.3936262320736718,
0.25445762904341573,
0.1571249991498746,
0.094043350911653,
- 0.0551398685546081,
+ 0.055139868554608104,
0.03136425581007428,
0.016788523699286094,
- 0.008121696981340598,
- 0.0033908803225935636,
- 0.0010922520629723033,
- 2.2741198895158383E-4,
+ 0.008121696981340597,
+ 0.003390880322593564,
+ 0.0010922520629723035,
+ 2.2741198895158385E-4,
2.4083912692036422E-5,
1.1325656884416224E-6,
5.171979288734243E-8
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 e0f2be1bfe6c6213c8f6f0e09a58bb9e06bfcc03..b6e513485f775454808a22d52f2d5099308e71b0 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -3,36 +3,36 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076537,
+ -5.181423615076538,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.1535563587475584,
+ -3.153556358747558,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.5324768712979722,
+ -1.532476871297972,
-1.1270117631898076,
-0.7215466550816433,
- -0.31608154697347896,
- 0.08617769624105241,
+ -0.3160815469734789,
+ 0.0861776962410524,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591924
+ 1.7119945007591926
],
"ys": [
- 0.8012677504331033,
- 0.6573423103469673,
- 0.5063567337421476,
- 0.3656761465287457,
+ 0.8012677504331032,
+ 0.6573423103469674,
+ 0.5063567337421475,
+ 0.36567614652874564,
0.24998725414520195,
- 0.16073387876630174,
+ 0.16073387876630177,
0.09954072289402163,
0.05862243229234874,
0.03334265172051943,
- 0.01827894445150576,
+ 0.018278944451505758,
0.009656941823402142,
0.004895423521973996,
0.002401904041828213,
@@ -61,22 +61,22 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.0038320165648558,
- 0.9057705268649427,
+ 1.0038320165648555,
+ 0.9057705268649429,
0.7875249886419105,
0.646418900623757,
0.4882256711176156,
- 0.33264280767940735,
+ 0.3326428076794074,
0.20478981928867987,
- 0.11605620823277465,
+ 0.11605620823277468,
0.0631495460606707,
0.033670693646757656,
0.017560259407659134,
@@ -117,11 +117,11 @@
"ys": [
1.0667638963335844,
0.9865827154981542,
- 0.8856938430755091,
- 0.7608557925362749,
+ 0.885693843075509,
+ 0.7608557925362751,
0.608087709906037,
0.44839060199479647,
- 0.30290260055542356,
+ 0.3029026005554235,
0.18897128034685856,
0.1114445428191399,
0.06331826478144816,