From bed7c5bfcbdbed745122a7709ae4a32b907a289b Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 22 May 2023 13:44:45 -0600
Subject: [PATCH 01/10] added AK 2007 refs
---
gradle/nshm.gradle | 24 +++++++++++++++++++
nshms.yml | 14 +++++++++++
.../earthquake/nshmp/model/NshmTests.java | 12 +++++++++-
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle
index 8b8cfbd7..3b3ce34f 100644
--- a/gradle/nshm.gradle
+++ b/gradle/nshm.gradle
@@ -76,6 +76,30 @@ task nshms() {
}
}
+// Test Alaska 2007 NSHM
+task testAlaska2007(type: Test) {
+ description = "Test Alaska 2007 NSHM"
+ group = "verification"
+
+ doFirst {
+ downloadNshm(findNshm("nshm-alaska", 2007))
+ }
+
+ testLogging {
+ exceptionFormat "full"
+ }
+
+ useJUnitPlatform()
+ jvmArgs(
+ "-Xms2g",
+ "-Xmx8g",
+ )
+
+ filter {
+ includeTestsMatching "gov.usgs.earthquake.nshmp.model.NshmTests.testAlaska2007"
+ }
+}
+
// Test Alaska 2023 NSHM
task testAlaska2023(type: Test) {
description = "Test Alaska 2023 NSHM"
diff --git a/nshms.yml b/nshms.yml
index ed307186..674894c7 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -2,6 +2,20 @@
# NSHMs to use for unit tests and for deployments.
####
nshms:
+ # Alaska 2023 NSHM
+ -
+ repo: nshm-alaska
+ tag: 2.1.0
+ year: 2007
+ deployments:
+ development:
+ instanceType: t4g.xlarge
+ staging:
+ instanceType: t4g.2xlarge
+ # TODO: Add to production when model is stable
+ # production:
+ # instanceType: c7g.8xlarge
+
# Alaska 2023 NSHM
-
repo: nshm-alaska
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 a0668cb4..58281e4e 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -90,7 +90,7 @@ class NshmTests {
// run single model
NshmModel nshmModel =
- NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2018"));
+ NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2007"));
NshmTestUtils.writeExpecteds(nshmModel);
nshmModel.exec.shutdown();
@@ -102,6 +102,16 @@ class NshmTests {
// }
}
+ /**
+ * Test Alaska 2007 NSHM
+ *
+ * To run test: ./gradlew testAlaska2007
+ */
+ @Test
+ final void testAlaska2007() throws IOException {
+ NshmTestUtils.testNshm(NSHMS.get("nshm-alaska-2007"));
+ }
+
/**
* Test Alaska 2023 NSHM
*
--
GitLab
From b9d5a854775078dd33a356ec5f79b636706d3d53 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 22 May 2023 14:03:36 -0600
Subject: [PATCH 02/10] added AK 2007 e-2- unit tests
---
nshms.yml | 2 +-
.../earthquake/nshmp/model/NshmTestUtils.java | 2 -
.../earthquake/nshmp/model/NshmTests.java | 10 +-
.../nshm-alaska-2007-2007-ANCHORAGE_AK.json | 140 ++++++++++++++++++
.../nshm-alaska-2007-2007-FAIRBANKS_AK.json | 140 ++++++++++++++++++
.../nshm-alaska-2007-2007-JUNEAU_AK.json | 140 ++++++++++++++++++
.../nshm-alaska-2007-2007-KODIAK_AK.json | 140 ++++++++++++++++++
.../nshm-alaska-2007-2007-VALDEZ_AK.json | 140 ++++++++++++++++++
8 files changed, 709 insertions(+), 5 deletions(-)
create mode 100644 src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-ANCHORAGE_AK.json
create mode 100644 src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-FAIRBANKS_AK.json
create mode 100644 src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-JUNEAU_AK.json
create mode 100644 src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-KODIAK_AK.json
create mode 100644 src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-VALDEZ_AK.json
diff --git a/nshms.yml b/nshms.yml
index 674894c7..e39a3842 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -5,7 +5,7 @@ nshms:
# Alaska 2023 NSHM
-
repo: nshm-alaska
- tag: 2.1.0
+ tag: 2.2.0
year: 2007
deployments:
development:
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index f53119eb..c04ddf0d 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -33,7 +33,6 @@ import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt;
-
import io.swagger.v3.core.util.Yaml;
/**
@@ -55,7 +54,6 @@ class NshmTestUtils {
*/
static NshmModel loadModel(Nshm nshm) {
int cores = Runtime.getRuntime().availableProcessors();
-
return new NshmModel(
nshm,
ModelLoader.load(nshm.modelPath()),
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 58281e4e..c63e0ee9 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTests.java
@@ -48,6 +48,7 @@ class NshmTests {
NshmpSite.KAILUA_KONA_HI);
private static final Set<Imt> IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0, Imt.SA5P0);
+ private static final Set<Imt> AK_2007_IMTS = EnumSet.of(Imt.PGA, Imt.SA0P2, Imt.SA1P0);
private static final Map<String, Nshm> NSHMS;
@@ -56,6 +57,7 @@ class NshmTests {
for (NshmInfo nshmInfo : NshmTestUtils.readNshms().nshms) {
List<NamedLocation> locations = new ArrayList<>();
+ Set<Imt> imts = IMTS;
switch (nshmInfo.repo) {
case "nshm-conus": {
@@ -64,6 +66,9 @@ class NshmTests {
}
case "nshm-alaska": {
locations = ALASKA_LOCATIONS;
+ if (nshmInfo.year == 2007) {
+ imts = AK_2007_IMTS;
+ }
break;
}
case "nshm-hawaii": {
@@ -74,7 +79,7 @@ class NshmTests {
throw new RuntimeException(nshmInfo.repo + " not supported");
}
- nshms.put(nshmInfo.repo + "-" + nshmInfo.year, new Nshm(nshmInfo, locations, IMTS));
+ nshms.put(nshmInfo.repo + "-" + nshmInfo.year, new Nshm(nshmInfo, locations, imts));
}
NSHMS = nshms;
@@ -90,7 +95,8 @@ class NshmTests {
// run single model
NshmModel nshmModel =
- NshmTestUtils.loadModel(NSHMS.get("nshm-conus-2007"));
+ NshmTestUtils.loadModel(NSHMS.get("nshm-alaska-2007"));
+
NshmTestUtils.writeExpecteds(nshmModel);
nshmModel.exec.shutdown();
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-ANCHORAGE_AK.json
new file mode 100644
index 00000000..81f87b76
--- /dev/null
+++ b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-ANCHORAGE_AK.json
@@ -0,0 +1,140 @@
+{
+ "1.00 Second Spectral Acceleration": {
+ "xs": [
+ -5.991464547107982,
+ -5.585999438999818,
+ -5.181423615076537,
+ -4.775958506968373,
+ -4.374058465024705,
+ -3.9633162998156966,
+ -3.5613661338149765,
+ -3.1535563587475584,
+ -2.7488721956224653,
+ -2.3434070875143007,
+ -1.9379419794061366,
+ -1.5324768712979722,
+ -1.1270117631898076,
+ -0.7215466550816433,
+ -0.31608154697347896,
+ 0.08617769624105241,
+ 0.494696241836107,
+ 0.9001613499442714,
+ 1.3056264580524357,
+ 1.7119945007591924
+ ],
+ "ys": [
+ 1.216784296389448,
+ 1.001712499365357,
+ 0.7796429247164196,
+ 0.5719011068498189,
+ 0.39834574699730324,
+ 0.2617839994778919,
+ 0.1660428466673632,
+ 0.10003334171779812,
+ 0.05737347098846019,
+ 0.030619419719839037,
+ 0.014904607266644073,
+ 0.006565568384584038,
+ 0.0026793854641647477,
+ 0.0010416460147385325,
+ 3.629137895691359E-4,
+ 9.82623278317095E-5,
+ 1.5879665844816693E-5,
+ 6.648778909021348E-7,
+ 1.7997491318464683E-12,
+ 0.0
+ ]
+ },
+ "Peak Ground Acceleration": {
+ "xs": [
+ -6.061887011404528,
+ -5.654992310486769,
+ -5.251433780649187,
+ -4.845968672541022,
+ -4.439655747510518,
+ -4.034190639402354,
+ -3.6306105459899607,
+ -3.223888366691745,
+ -2.8184232585835804,
+ -2.4123999590012524,
+ -2.0099154790312257,
+ -1.5994875815809322,
+ -1.1973282616072674,
+ -0.789658080940789,
+ -0.3856624808119846,
+ 0.01980262729617973,
+ 0.4252677354043441,
+ 0.8329091229351039,
+ 1.235471471385307,
+ 1.6428726885203377
+ ],
+ "ys": [
+ 1.65397819274769,
+ 1.4774726044583617,
+ 1.2707743009482835,
+ 1.0374950532982243,
+ 0.7909487640658447,
+ 0.5566615888725722,
+ 0.3627089251747853,
+ 0.22040790487251347,
+ 0.12651798364766775,
+ 0.06757725919698641,
+ 0.033002677733662764,
+ 0.014271739151160378,
+ 0.005693025514814955,
+ 0.0019431717707338516,
+ 4.8730752588366135E-4,
+ 7.326467022422194E-5,
+ 5.361893639138177E-6,
+ 2.0660199338622954E-7,
+ 3.1708663587822375E-10,
+ 0.0
+ ]
+ },
+ "0.20 Second Spectral Acceleration": {
+ "xs": [
+ -5.704782974989785,
+ -5.30031936921871,
+ -4.8941864814530085,
+ -4.491841500681089,
+ -4.080441657053109,
+ -3.6769508832486624,
+ -3.2728041668937564,
+ -2.866459937849852,
+ -2.4615808244845034,
+ -2.05572501506252,
+ -1.6502599069543555,
+ -1.2447947988461912,
+ -0.8393296907380268,
+ -0.4338645826298623,
+ -0.028399474521698,
+ 0.37843643572024505,
+ 0.7839015438284094,
+ 1.1878434223960523,
+ 1.5933085305042167,
+ 1.998773638612381
+ ],
+ "ys": [
+ 1.722096296877698,
+ 1.57398677222407,
+ 1.3948514208523581,
+ 1.1868737782914325,
+ 0.9486733636220279,
+ 0.7100408174082283,
+ 0.4947271612575376,
+ 0.32261569377545196,
+ 0.19947502689884467,
+ 0.11681594901507046,
+ 0.06395461351278024,
+ 0.031884675080501315,
+ 0.014271993188868275,
+ 0.005793050581460287,
+ 0.002121342475395979,
+ 6.235952081095882E-4,
+ 1.226785445725974E-4,
+ 1.4246353621355988E-5,
+ 9.352016591244695E-7,
+ 4.253931015422376E-8
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-FAIRBANKS_AK.json
new file mode 100644
index 00000000..9905470d
--- /dev/null
+++ b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-FAIRBANKS_AK.json
@@ -0,0 +1,140 @@
+{
+ "1.00 Second Spectral Acceleration": {
+ "xs": [
+ -5.991464547107982,
+ -5.585999438999818,
+ -5.181423615076537,
+ -4.775958506968373,
+ -4.374058465024705,
+ -3.9633162998156966,
+ -3.5613661338149765,
+ -3.1535563587475584,
+ -2.7488721956224653,
+ -2.3434070875143007,
+ -1.9379419794061366,
+ -1.5324768712979722,
+ -1.1270117631898076,
+ -0.7215466550816433,
+ -0.31608154697347896,
+ 0.08617769624105241,
+ 0.494696241836107,
+ 0.9001613499442714,
+ 1.3056264580524357,
+ 1.7119945007591924
+ ],
+ "ys": [
+ 0.3464423908576828,
+ 0.2746884250513254,
+ 0.20330958648206365,
+ 0.14036328868086187,
+ 0.0915012349273498,
+ 0.056022641564065334,
+ 0.03311999914335675,
+ 0.0185713164570039,
+ 0.009917617739224244,
+ 0.004934944876941708,
+ 0.002246095428853393,
+ 9.151846593388017E-4,
+ 3.2672748123260695E-4,
+ 9.811837073821066E-5,
+ 2.4114425298279172E-5,
+ 4.475413565666441E-6,
+ 4.930242108836648E-7,
+ 2.0581607286335368E-8,
+ 3.9947818607662745E-11,
+ 0.0
+ ]
+ },
+ "Peak Ground Acceleration": {
+ "xs": [
+ -6.061887011404528,
+ -5.654992310486769,
+ -5.251433780649187,
+ -4.845968672541022,
+ -4.439655747510518,
+ -4.034190639402354,
+ -3.6306105459899607,
+ -3.223888366691745,
+ -2.8184232585835804,
+ -2.4123999590012524,
+ -2.0099154790312257,
+ -1.5994875815809322,
+ -1.1973282616072674,
+ -0.789658080940789,
+ -0.3856624808119846,
+ 0.01980262729617973,
+ 0.4252677354043441,
+ 0.8329091229351039,
+ 1.235471471385307,
+ 1.6428726885203377
+ ],
+ "ys": [
+ 0.42512155522078154,
+ 0.3741248597866011,
+ 0.3152726977613771,
+ 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.0,
+ 0.0
+ ]
+ },
+ "0.20 Second Spectral Acceleration": {
+ "xs": [
+ -5.704782974989785,
+ -5.30031936921871,
+ -4.8941864814530085,
+ -4.491841500681089,
+ -4.080441657053109,
+ -3.6769508832486624,
+ -3.2728041668937564,
+ -2.866459937849852,
+ -2.4615808244845034,
+ -2.05572501506252,
+ -1.6502599069543555,
+ -1.2447947988461912,
+ -0.8393296907380268,
+ -0.4338645826298623,
+ -0.028399474521698,
+ 0.37843643572024505,
+ 0.7839015438284094,
+ 1.1878434223960523,
+ 1.5933085305042167,
+ 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.089640439801509E-7,
+ 2.452338948529823E-10
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-JUNEAU_AK.json
new file mode 100644
index 00000000..860bfd86
--- /dev/null
+++ b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-JUNEAU_AK.json
@@ -0,0 +1,140 @@
+{
+ "1.00 Second Spectral Acceleration": {
+ "xs": [
+ -5.991464547107982,
+ -5.585999438999818,
+ -5.181423615076537,
+ -4.775958506968373,
+ -4.374058465024705,
+ -3.9633162998156966,
+ -3.5613661338149765,
+ -3.1535563587475584,
+ -2.7488721956224653,
+ -2.3434070875143007,
+ -1.9379419794061366,
+ -1.5324768712979722,
+ -1.1270117631898076,
+ -0.7215466550816433,
+ -0.31608154697347896,
+ 0.08617769624105241,
+ 0.494696241836107,
+ 0.9001613499442714,
+ 1.3056264580524357,
+ 1.7119945007591924
+ ],
+ "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,
+ 1.7178404489425482E-7,
+ 2.9031224848126113E-9,
+ 3.2000505378803756E-12,
+ 0.0
+ ]
+ },
+ "Peak Ground Acceleration": {
+ "xs": [
+ -6.061887011404528,
+ -5.654992310486769,
+ -5.251433780649187,
+ -4.845968672541022,
+ -4.439655747510518,
+ -4.034190639402354,
+ -3.6306105459899607,
+ -3.223888366691745,
+ -2.8184232585835804,
+ -2.4123999590012524,
+ -2.0099154790312257,
+ -1.5994875815809322,
+ -1.1973282616072674,
+ -0.789658080940789,
+ -0.3856624808119846,
+ 0.01980262729617973,
+ 0.4252677354043441,
+ 0.8329091229351039,
+ 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,
+ 4.9391883396298844E-6,
+ 6.333607105458819E-7,
+ 4.213447857938414E-8,
+ 2.8098517790646575E-10,
+ 0.0,
+ 0.0
+ ]
+ },
+ "0.20 Second Spectral Acceleration": {
+ "xs": [
+ -5.704782974989785,
+ -5.30031936921871,
+ -4.8941864814530085,
+ -4.491841500681089,
+ -4.080441657053109,
+ -3.6769508832486624,
+ -3.2728041668937564,
+ -2.866459937849852,
+ -2.4615808244845034,
+ -2.05572501506252,
+ -1.6502599069543555,
+ -1.2447947988461912,
+ -0.8393296907380268,
+ -0.4338645826298623,
+ -0.028399474521698,
+ 0.37843643572024505,
+ 0.7839015438284094,
+ 1.1878434223960523,
+ 1.5933085305042167,
+ 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,
+ 9.96081599232255E-6,
+ 1.5784375508128453E-6,
+ 1.6294075376712294E-7,
+ 8.817948928079425E-9,
+ 1.972572104269551E-11
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-KODIAK_AK.json
new file mode 100644
index 00000000..55efc0f0
--- /dev/null
+++ b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-KODIAK_AK.json
@@ -0,0 +1,140 @@
+{
+ "1.00 Second Spectral Acceleration": {
+ "xs": [
+ -5.991464547107982,
+ -5.585999438999818,
+ -5.181423615076537,
+ -4.775958506968373,
+ -4.374058465024705,
+ -3.9633162998156966,
+ -3.5613661338149765,
+ -3.1535563587475584,
+ -2.7488721956224653,
+ -2.3434070875143007,
+ -1.9379419794061366,
+ -1.5324768712979722,
+ -1.1270117631898076,
+ -0.7215466550816433,
+ -0.31608154697347896,
+ 0.08617769624105241,
+ 0.494696241836107,
+ 0.9001613499442714,
+ 1.3056264580524357,
+ 1.7119945007591924
+ ],
+ "ys": [
+ 1.0202890885330151,
+ 0.8375083352263466,
+ 0.6475662303710862,
+ 0.4707918425427096,
+ 0.32519272294896445,
+ 0.21283124141356322,
+ 0.13574097527098886,
+ 0.08381717413931657,
+ 0.05102722546305094,
+ 0.030533684096192584,
+ 0.017757505947837975,
+ 0.009779208536822154,
+ 0.00495739062237132,
+ 0.00223748814778023,
+ 8.360775271106734E-4,
+ 2.3127145518716242E-4,
+ 3.908766959259963E-5,
+ 2.5626815539339554E-6,
+ 0.0,
+ 0.0
+ ]
+ },
+ "Peak Ground Acceleration": {
+ "xs": [
+ -6.061887011404528,
+ -5.654992310486769,
+ -5.251433780649187,
+ -4.845968672541022,
+ -4.439655747510518,
+ -4.034190639402354,
+ -3.6306105459899607,
+ -3.223888366691745,
+ -2.8184232585835804,
+ -2.4123999590012524,
+ -2.0099154790312257,
+ -1.5994875815809322,
+ -1.1973282616072674,
+ -0.789658080940789,
+ -0.3856624808119846,
+ 0.01980262729617973,
+ 0.4252677354043441,
+ 0.8329091229351039,
+ 1.235471471385307,
+ 1.6428726885203377
+ ],
+ "ys": [
+ 1.3143840761818835,
+ 1.1715241821556248,
+ 1.0073110589775853,
+ 0.822439125345779,
+ 0.625115708600688,
+ 0.4357796832874383,
+ 0.2795278984445908,
+ 0.16752488019629042,
+ 0.09692443479191427,
+ 0.05487333213721911,
+ 0.030272844286145184,
+ 0.015399970754471155,
+ 0.007108660320946837,
+ 0.0027335226497319045,
+ 7.558825338514728E-4,
+ 1.1765771038459163E-4,
+ 6.310901665123947E-6,
+ 2.450787801717188E-7,
+ 3.507351114684557E-10,
+ 0.0
+ ]
+ },
+ "0.20 Second Spectral Acceleration": {
+ "xs": [
+ -5.704782974989785,
+ -5.30031936921871,
+ -4.8941864814530085,
+ -4.491841500681089,
+ -4.080441657053109,
+ -3.6769508832486624,
+ -3.2728041668937564,
+ -2.866459937849852,
+ -2.4615808244845034,
+ -2.05572501506252,
+ -1.6502599069543555,
+ -1.2447947988461912,
+ -0.8393296907380268,
+ -0.4338645826298623,
+ -0.028399474521698,
+ 0.37843643572024505,
+ 0.7839015438284094,
+ 1.1878434223960523,
+ 1.5933085305042167,
+ 1.998773638612381
+ ],
+ "ys": [
+ 1.3878090480442422,
+ 1.2678189199286058,
+ 1.1244476634474234,
+ 0.9577566116756505,
+ 0.7648024244341658,
+ 0.5696821914048495,
+ 0.3936262320736718,
+ 0.25445762904341573,
+ 0.1571249991498746,
+ 0.094043350911653,
+ 0.0551398685546081,
+ 0.03136425581007428,
+ 0.016788523699286094,
+ 0.008121696981340598,
+ 0.0033908803225935636,
+ 0.0010922520629723033,
+ 2.2741198895158383E-4,
+ 2.4083912692036422E-5,
+ 1.1325656884416224E-6,
+ 5.171979288734243E-8
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-VALDEZ_AK.json
new file mode 100644
index 00000000..e0f2be1b
--- /dev/null
+++ b/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-VALDEZ_AK.json
@@ -0,0 +1,140 @@
+{
+ "1.00 Second Spectral Acceleration": {
+ "xs": [
+ -5.991464547107982,
+ -5.585999438999818,
+ -5.181423615076537,
+ -4.775958506968373,
+ -4.374058465024705,
+ -3.9633162998156966,
+ -3.5613661338149765,
+ -3.1535563587475584,
+ -2.7488721956224653,
+ -2.3434070875143007,
+ -1.9379419794061366,
+ -1.5324768712979722,
+ -1.1270117631898076,
+ -0.7215466550816433,
+ -0.31608154697347896,
+ 0.08617769624105241,
+ 0.494696241836107,
+ 0.9001613499442714,
+ 1.3056264580524357,
+ 1.7119945007591924
+ ],
+ "ys": [
+ 0.8012677504331033,
+ 0.6573423103469673,
+ 0.5063567337421476,
+ 0.3656761465287457,
+ 0.24998725414520195,
+ 0.16073387876630174,
+ 0.09954072289402163,
+ 0.05862243229234874,
+ 0.03334265172051943,
+ 0.01827894445150576,
+ 0.009656941823402142,
+ 0.004895423521973996,
+ 0.002401904041828213,
+ 0.0011587127756169883,
+ 5.217832797347172E-4,
+ 1.8943907736914238E-4,
+ 4.520195530459815E-5,
+ 5.9031694728150844E-6,
+ 0.0,
+ 0.0
+ ]
+ },
+ "Peak Ground Acceleration": {
+ "xs": [
+ -6.061887011404528,
+ -5.654992310486769,
+ -5.251433780649187,
+ -4.845968672541022,
+ -4.439655747510518,
+ -4.034190639402354,
+ -3.6306105459899607,
+ -3.223888366691745,
+ -2.8184232585835804,
+ -2.4123999590012524,
+ -2.0099154790312257,
+ -1.5994875815809322,
+ -1.1973282616072674,
+ -0.789658080940789,
+ -0.3856624808119846,
+ 0.01980262729617973,
+ 0.4252677354043441,
+ 0.8329091229351039,
+ 1.235471471385307,
+ 1.6428726885203377
+ ],
+ "ys": [
+ 1.0038320165648558,
+ 0.9057705268649427,
+ 0.7875249886419105,
+ 0.646418900623757,
+ 0.4882256711176156,
+ 0.33264280767940735,
+ 0.20478981928867987,
+ 0.11605620823277465,
+ 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,
+ 0.0
+ ]
+ },
+ "0.20 Second Spectral Acceleration": {
+ "xs": [
+ -5.704782974989785,
+ -5.30031936921871,
+ -4.8941864814530085,
+ -4.491841500681089,
+ -4.080441657053109,
+ -3.6769508832486624,
+ -3.2728041668937564,
+ -2.866459937849852,
+ -2.4615808244845034,
+ -2.05572501506252,
+ -1.6502599069543555,
+ -1.2447947988461912,
+ -0.8393296907380268,
+ -0.4338645826298623,
+ -0.028399474521698,
+ 0.37843643572024505,
+ 0.7839015438284094,
+ 1.1878434223960523,
+ 1.5933085305042167,
+ 1.998773638612381
+ ],
+ "ys": [
+ 1.0667638963335844,
+ 0.9865827154981542,
+ 0.8856938430755091,
+ 0.7608557925362749,
+ 0.608087709906037,
+ 0.44839060199479647,
+ 0.30290260055542356,
+ 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
+ ]
+ }
+}
\ No newline at end of file
--
GitLab
From fb3c462b711b3dfb464928dd80d1938de0cf036b Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 22 May 2023 14:12:29 -0600
Subject: [PATCH 03/10] refined names of e-2-e test files
---
.../java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 2 +-
...shm-alaska-2007-2007-ANCHORAGE_AK.json => ANCHORAGE_AK.json} | 0
...shm-alaska-2007-2007-FAIRBANKS_AK.json => FAIRBANKS_AK.json} | 0
.../{nshm-alaska-2007-2007-JUNEAU_AK.json => JUNEAU_AK.json} | 0
.../{nshm-alaska-2007-2007-KODIAK_AK.json => KODIAK_AK.json} | 0
.../{nshm-alaska-2007-2007-VALDEZ_AK.json => VALDEZ_AK.json} | 0
...shm-alaska-2023-2023-ANCHORAGE_AK.json => ANCHORAGE_AK.json} | 0
...shm-alaska-2023-2023-FAIRBANKS_AK.json => FAIRBANKS_AK.json} | 0
.../{nshm-alaska-2023-2023-JUNEAU_AK.json => JUNEAU_AK.json} | 0
.../{nshm-alaska-2023-2023-KODIAK_AK.json => KODIAK_AK.json} | 0
.../{nshm-alaska-2023-2023-VALDEZ_AK.json => VALDEZ_AK.json} | 0
.../{nshm-conus-2018-2018-BOSTON_MA.json => BOSTON_MA.json} | 0
.../{nshm-conus-2018-2018-CHICAGO_IL.json => CHICAGO_IL.json} | 0
...-conus-2018-2018-LOS_ANGELES_CA.json => LOS_ANGELES_CA.json} | 0
...hm-conus-2018-2018-NEW_MADRID_MO.json => NEW_MADRID_MO.json} | 0
.../{nshm-conus-2018-2018-NEW_YORK_NY.json => NEW_YORK_NY.json} | 0
.../{nshm-conus-2018-2018-RENO_NV.json => RENO_NV.json} | 0
...-2018-2018-SALT_LAKE_CITY_UT.json => SALT_LAKE_CITY_UT.json} | 0
...us-2018-2018-SAN_FRANCISCO_CA.json => SAN_FRANCISCO_CA.json} | 0
.../{nshm-conus-2018-2018-SEATTLE_WA.json => SEATTLE_WA.json} | 0
.../{nshm-conus-2023-2023-BOSTON_MA.json => BOSTON_MA.json} | 0
.../{nshm-conus-2023-2023-CHICAGO_IL.json => CHICAGO_IL.json} | 0
...-conus-2023-2023-LOS_ANGELES_CA.json => LOS_ANGELES_CA.json} | 0
...hm-conus-2023-2023-NEW_MADRID_MO.json => NEW_MADRID_MO.json} | 0
.../{nshm-conus-2023-2023-NEW_YORK_NY.json => NEW_YORK_NY.json} | 0
.../{nshm-conus-2023-2023-RENO_NV.json => RENO_NV.json} | 0
...-2023-2023-SALT_LAKE_CITY_UT.json => SALT_LAKE_CITY_UT.json} | 0
...us-2023-2023-SAN_FRANCISCO_CA.json => SAN_FRANCISCO_CA.json} | 0
.../{nshm-conus-2023-2023-SEATTLE_WA.json => SEATTLE_WA.json} | 0
.../{nshm-hawaii-2021-2021-HILO_HI.json => HILO_HI.json} | 0
...{nshm-hawaii-2021-2021-HONOLULU_HI.json => HONOLULU_HI.json} | 0
...hawaii-2021-2021-KAILUA_KONA_HI.json => KAILUA_KONA_HI.json} | 0
32 files changed, 1 insertion(+), 1 deletion(-)
rename src/test/resources/e2e/nshm-alaska-2007/{nshm-alaska-2007-2007-ANCHORAGE_AK.json => ANCHORAGE_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2007/{nshm-alaska-2007-2007-FAIRBANKS_AK.json => FAIRBANKS_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2007/{nshm-alaska-2007-2007-JUNEAU_AK.json => JUNEAU_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2007/{nshm-alaska-2007-2007-KODIAK_AK.json => KODIAK_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2007/{nshm-alaska-2007-2007-VALDEZ_AK.json => VALDEZ_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2023/{nshm-alaska-2023-2023-ANCHORAGE_AK.json => ANCHORAGE_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2023/{nshm-alaska-2023-2023-FAIRBANKS_AK.json => FAIRBANKS_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2023/{nshm-alaska-2023-2023-JUNEAU_AK.json => JUNEAU_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2023/{nshm-alaska-2023-2023-KODIAK_AK.json => KODIAK_AK.json} (100%)
rename src/test/resources/e2e/nshm-alaska-2023/{nshm-alaska-2023-2023-VALDEZ_AK.json => VALDEZ_AK.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-BOSTON_MA.json => BOSTON_MA.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-CHICAGO_IL.json => CHICAGO_IL.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-LOS_ANGELES_CA.json => LOS_ANGELES_CA.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-NEW_MADRID_MO.json => NEW_MADRID_MO.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-NEW_YORK_NY.json => NEW_YORK_NY.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-RENO_NV.json => RENO_NV.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json => SALT_LAKE_CITY_UT.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-SAN_FRANCISCO_CA.json => SAN_FRANCISCO_CA.json} (100%)
rename src/test/resources/e2e/nshm-conus-2018/{nshm-conus-2018-2018-SEATTLE_WA.json => SEATTLE_WA.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-BOSTON_MA.json => BOSTON_MA.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-CHICAGO_IL.json => CHICAGO_IL.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-LOS_ANGELES_CA.json => LOS_ANGELES_CA.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-NEW_MADRID_MO.json => NEW_MADRID_MO.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-NEW_YORK_NY.json => NEW_YORK_NY.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-RENO_NV.json => RENO_NV.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json => SALT_LAKE_CITY_UT.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-SAN_FRANCISCO_CA.json => SAN_FRANCISCO_CA.json} (100%)
rename src/test/resources/e2e/nshm-conus-2023/{nshm-conus-2023-2023-SEATTLE_WA.json => SEATTLE_WA.json} (100%)
rename src/test/resources/e2e/nshm-hawaii-2021/{nshm-hawaii-2021-2021-HILO_HI.json => HILO_HI.json} (100%)
rename src/test/resources/e2e/nshm-hawaii-2021/{nshm-hawaii-2021-2021-HONOLULU_HI.json => HONOLULU_HI.json} (100%)
rename src/test/resources/e2e/nshm-hawaii-2021/{nshm-hawaii-2021-2021-KAILUA_KONA_HI.json => KAILUA_KONA_HI.json} (100%)
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index c04ddf0d..04a96930 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -283,7 +283,7 @@ class NshmTestUtils {
}
String resultFilename(NamedLocation location) {
- return String.format("%s-%s-%s.json", modelName(), year(), location.name());
+ return String.format("%s.json", location.name());
}
}
}
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-ANCHORAGE_AK.json
rename to src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-FAIRBANKS_AK.json
rename to src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-JUNEAU_AK.json
rename to src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-KODIAK_AK.json
rename to src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2007/nshm-alaska-2007-2007-VALDEZ_AK.json
rename to src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/ANCHORAGE_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/FAIRBANKS_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/JUNEAU_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/KODIAK_AK.json
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
similarity index 100%
rename from src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
rename to src/test/resources/e2e/nshm-alaska-2023/VALDEZ_AK.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
rename to src/test/resources/e2e/nshm-conus-2018/BOSTON_MA.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
rename to src/test/resources/e2e/nshm-conus-2018/CHICAGO_IL.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
rename to src/test/resources/e2e/nshm-conus-2018/LOS_ANGELES_CA.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
rename to src/test/resources/e2e/nshm-conus-2018/NEW_MADRID_MO.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
rename to src/test/resources/e2e/nshm-conus-2018/NEW_YORK_NY.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
rename to src/test/resources/e2e/nshm-conus-2018/RENO_NV.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
rename to src/test/resources/e2e/nshm-conus-2018/SALT_LAKE_CITY_UT.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
rename to src/test/resources/e2e/nshm-conus-2018/SAN_FRANCISCO_CA.json
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
rename to src/test/resources/e2e/nshm-conus-2018/SEATTLE_WA.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
rename to src/test/resources/e2e/nshm-conus-2023/BOSTON_MA.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
rename to src/test/resources/e2e/nshm-conus-2023/CHICAGO_IL.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
rename to src/test/resources/e2e/nshm-conus-2023/LOS_ANGELES_CA.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
rename to src/test/resources/e2e/nshm-conus-2023/NEW_MADRID_MO.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
rename to src/test/resources/e2e/nshm-conus-2023/NEW_YORK_NY.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
rename to src/test/resources/e2e/nshm-conus-2023/RENO_NV.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
rename to src/test/resources/e2e/nshm-conus-2023/SALT_LAKE_CITY_UT.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
rename to src/test/resources/e2e/nshm-conus-2023/SAN_FRANCISCO_CA.json
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
similarity index 100%
rename from src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
rename to src/test/resources/e2e/nshm-conus-2023/SEATTLE_WA.json
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
similarity index 100%
rename from src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021/HILO_HI.json
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
similarity index 100%
rename from src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021/HONOLULU_HI.json
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
similarity index 100%
rename from src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json
rename to src/test/resources/e2e/nshm-hawaii-2021/KAILUA_KONA_HI.json
--
GitLab
From acaacd3851c1c30d9f1aa1bf8213dbb9f9f51489 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 22 May 2023 14:16:31 -0600
Subject: [PATCH 04/10] spotless edits
---
src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
index 04a96930..b8769966 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestUtils.java
@@ -33,6 +33,7 @@ import gov.usgs.earthquake.nshmp.calc.Site;
import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt;
+
import io.swagger.v3.core.util.Yaml;
/**
--
GitLab
From 87d30ba8283fc98da3c79c76b7a7f6f3fab1460d Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 26 Jun 2023 11:44:13 -0600
Subject: [PATCH 05/10] update lib
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 8316a970..07be0cbc 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.3.3
+nshmpLibVersion = 1.3.5
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
--
GitLab
From 93c2a0dd1cdadf8a5f81f9095347fd7e3c096861 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 26 Jun 2023 12:54:51 -0600
Subject: [PATCH 06/10] add tests
---
.gitlab-ci.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7fef51b0..64c6076d 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
--
GitLab
From a26933aa28399e41078b1cb097298bbb2a07a426 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 26 Jun 2023 12:55:29 -0600
Subject: [PATCH 07/10] change tag
---
nshms.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index e414cbf4..784b70c5 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:
--
GitLab
From 75b48f86e4a6e98970349ad9e801093977132dc5 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 26 Jun 2023 13:06:12 -0600
Subject: [PATCH 08/10] update test results
---
.../e2e/nshm-alaska-2007/ANCHORAGE_AK.json | 44 ++++++++---------
.../e2e/nshm-alaska-2007/FAIRBANKS_AK.json | 32 ++++++-------
.../e2e/nshm-alaska-2007/JUNEAU_AK.json | 48 +++++++++----------
.../e2e/nshm-alaska-2007/KODIAK_AK.json | 38 +++++++--------
.../e2e/nshm-alaska-2007/VALDEZ_AK.json | 30 ++++++------
5 files changed, 96 insertions(+), 96 deletions(-)
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 81f87b76..5e9d01b8 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -3,30 +3,30 @@
"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,
1.001712499365357,
0.7796429247164196,
- 0.5719011068498189,
+ 0.571901106849819,
0.39834574699730324,
0.2617839994778919,
0.1660428466673632,
@@ -34,14 +34,14 @@
0.05737347098846019,
0.030619419719839037,
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,30 +61,30 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.3856624808119846,
+ -0.38566248081198456,
0.01980262729617973,
0.4252677354043441,
- 0.8329091229351039,
+ 0.832909122935104,
1.235471471385307,
1.6428726885203377
],
"ys": [
1.65397819274769,
- 1.4774726044583617,
+ 1.4774726044583613,
1.2707743009482835,
1.0374950532982243,
- 0.7909487640658447,
+ 0.7909487640658448,
0.5566615888725722,
0.3627089251747853,
0.22040790487251347,
0.12651798364766775,
0.06757725919698641,
- 0.033002677733662764,
- 0.014271739151160378,
+ 0.03300267773366276,
+ 0.01427173915116038,
0.005693025514814955,
0.0019431717707338516,
4.8730752588366135E-4,
- 7.326467022422194E-5,
+ 7.326467022422193E-5,
5.361893639138177E-6,
2.0660199338622954E-7,
3.1708663587822375E-10,
@@ -117,14 +117,14 @@
"ys": [
1.722096296877698,
1.57398677222407,
- 1.3948514208523581,
+ 1.394851420852358,
1.1868737782914325,
0.9486733636220279,
0.7100408174082283,
0.4947271612575376,
- 0.32261569377545196,
- 0.19947502689884467,
- 0.11681594901507046,
+ 0.3226156937754519,
+ 0.1994750268988446,
+ 0.11681594901507047,
0.06395461351278024,
0.031884675080501315,
0.014271993188868275,
@@ -132,7 +132,7 @@
0.002121342475395979,
6.235952081095882E-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 9905470d..a7211bad 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.2033095864820637,
+ 0.1403632886808619,
0.0915012349273498,
0.056022641564065334,
0.03311999914335675,
0.0185713164570039,
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 860bfd86..27ba52ff 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -3,32 +3,32 @@
"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.1401849608924726,
0.1082180504924474,
0.07924233732120106,
0.05582782598193431,
0.03894598542891116,
- 0.027051416538377965,
+ 0.02705141653837797,
0.018782546895544608,
0.012334737104400877,
0.007428193921599053,
@@ -36,11 +36,11 @@
0.0019814162270296912,
8.466167136800707E-4,
2.985332224552966E-4,
- 8.107412195629211E-5,
+ 8.10741219562921E-5,
1.5578100036615844E-5,
2.0319947482407376E-6,
1.7178404489425482E-7,
- 2.9031224848126113E-9,
+ 2.9031224848126118E-9,
3.2000505378803756E-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
],
@@ -75,14 +75,14 @@
0.08962877562496549,
0.06406406418411464,
0.04146443536571581,
- 0.024584756227350266,
+ 0.024584756227350263,
0.013434411687047471,
0.006749211263866024,
- 0.0030316026784251,
+ 0.0030316026784251004,
0.0012097560999651123,
- 4.1753422654192433E-4,
+ 4.175342265419243E-4,
1.255941387114207E-4,
- 2.8891731713975016E-5,
+ 2.8891731713975013E-5,
4.9391883396298844E-6,
6.333607105458819E-7,
4.213447857938414E-8,
@@ -119,17 +119,17 @@
0.16345119360758736,
0.13975659408596586,
0.11382259847142859,
- 0.08555542293931166,
- 0.05945984027585358,
- 0.03845004207648512,
- 0.02325634313827287,
- 0.01311636208532044,
+ 0.08555542293931165,
+ 0.059459840275853576,
+ 0.03845004207648513,
+ 0.023256343138272875,
+ 0.013116362085320441,
0.006922451437616338,
- 0.0034286644021358924,
- 0.001520932694912381,
+ 0.003428664402135892,
+ 0.0015209326949123807,
5.788668145749388E-4,
1.850169501925151E-4,
- 4.846642143656083E-5,
+ 4.8466421436560827E-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 55efc0f0..d0d99e47 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -3,38 +3,38 @@
"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.13574097527098886,
- 0.08381717413931657,
+ 0.08381717413931655,
0.05102722546305094,
0.030533684096192584,
0.017757505947837975,
- 0.009779208536822154,
+ 0.009779208536822152,
0.00495739062237132,
0.00223748814778023,
8.360775271106734E-4,
@@ -61,16 +61,16 @@
-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.1715241821556248,
+ 1.3143840761818832,
+ 1.1715241821556246,
1.0073110589775853,
0.822439125345779,
0.625115708600688,
@@ -115,12 +115,12 @@
1.998773638612381
],
"ys": [
- 1.3878090480442422,
- 1.2678189199286058,
+ 1.3878090480442424,
+ 1.2678189199286056,
1.1244476634474234,
0.9577566116756505,
0.7648024244341658,
- 0.5696821914048495,
+ 0.5696821914048494,
0.3936262320736718,
0.25445762904341573,
0.1571249991498746,
@@ -128,10 +128,10 @@
0.0551398685546081,
0.03136425581007428,
0.016788523699286094,
- 0.008121696981340598,
- 0.0033908803225935636,
+ 0.008121696981340597,
+ 0.003390880322593564,
0.0010922520629723033,
- 2.2741198895158383E-4,
+ 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 e0f2be1b..59dcbb3e 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.8012677504331032,
0.6573423103469673,
0.5063567337421476,
- 0.3656761465287457,
+ 0.36567614652874564,
0.24998725414520195,
0.16073387876630174,
0.09954072289402163,
0.05862243229234874,
0.03334265172051943,
- 0.01827894445150576,
+ 0.018278944451505758,
0.009656941823402142,
0.004895423521973996,
0.002401904041828213,
@@ -61,16 +61,16 @@
-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,
@@ -117,11 +117,11 @@
"ys": [
1.0667638963335844,
0.9865827154981542,
- 0.8856938430755091,
+ 0.885693843075509,
0.7608557925362749,
0.608087709906037,
0.44839060199479647,
- 0.30290260055542356,
+ 0.3029026005554235,
0.18897128034685856,
0.1114445428191399,
0.06331826478144816,
--
GitLab
From b83a546aae770b4ce57ea888639466eef76a6b24 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 26 Jun 2023 13:13:25 -0600
Subject: [PATCH 09/10] update test files
---
.../resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json | 4 ++--
.../resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json | 4 ++--
src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json | 2 +-
src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json | 10 +++++-----
src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
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 5e9d01b8..66f7d4f3 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -36,7 +36,7 @@
0.014904607266644073,
0.006565568384584037,
0.0026793854641647477,
- 0.0010416460147385327,
+ 0.0010416460147385325,
3.629137895691359E-4,
9.82623278317095E-5,
1.5879665844816693E-5,
@@ -75,7 +75,7 @@
1.0374950532982243,
0.7909487640658448,
0.5566615888725722,
- 0.3627089251747853,
+ 0.36270892517478526,
0.22040790487251347,
0.12651798364766775,
0.06757725919698641,
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 a7211bad..7dec0cca 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -25,9 +25,9 @@
"ys": [
0.3464423908576828,
0.2746884250513254,
- 0.2033095864820637,
+ 0.20330958648206368,
0.1403632886808619,
- 0.0915012349273498,
+ 0.09150123492734981,
0.056022641564065334,
0.03311999914335675,
0.0185713164570039,
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 27ba52ff..993c02f9 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -123,7 +123,7 @@
0.059459840275853576,
0.03845004207648513,
0.023256343138272875,
- 0.013116362085320441,
+ 0.01311636208532044,
0.006922451437616338,
0.003428664402135892,
0.0015209326949123807,
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 d0d99e47..aa9b21fe 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -30,14 +30,14 @@
0.32519272294896445,
0.21283124141356322,
0.13574097527098886,
- 0.08381717413931655,
+ 0.08381717413931652,
0.05102722546305094,
0.030533684096192584,
0.017757505947837975,
- 0.009779208536822152,
+ 0.009779208536822154,
0.00495739062237132,
0.00223748814778023,
- 8.360775271106734E-4,
+ 8.360775271106735E-4,
2.3127145518716242E-4,
3.908766959259963E-5,
2.5626815539339554E-6,
@@ -82,7 +82,7 @@
0.030272844286145184,
0.015399970754471155,
0.007108660320946837,
- 0.0027335226497319045,
+ 0.0027335226497319054,
7.558825338514728E-4,
1.1765771038459163E-4,
6.310901665123947E-6,
@@ -131,7 +131,7 @@
0.008121696981340597,
0.003390880322593564,
0.0010922520629723033,
- 2.2741198895158385E-4,
+ 2.2741198895158383E-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 59dcbb3e..cfaa332e 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -32,7 +32,7 @@
0.09954072289402163,
0.05862243229234874,
0.03334265172051943,
- 0.018278944451505758,
+ 0.01827894445150576,
0.009656941823402142,
0.004895423521973996,
0.002401904041828213,
--
GitLab
From b1676347f28709aa49b73e9d002ed9c4203b7c74 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 26 Jun 2023 13:35:01 -0600
Subject: [PATCH 10/10] update files
---
.../e2e/nshm-alaska-2007/ANCHORAGE_AK.json | 24 ++---
.../e2e/nshm-alaska-2007/FAIRBANKS_AK.json | 4 +-
.../e2e/nshm-alaska-2007/JUNEAU_AK.json | 88 +++++++++----------
.../e2e/nshm-alaska-2007/KODIAK_AK.json | 38 ++++----
.../e2e/nshm-alaska-2007/VALDEZ_AK.json | 14 +--
5 files changed, 84 insertions(+), 84 deletions(-)
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 66f7d4f3..d327441d 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/ANCHORAGE_AK.json
@@ -26,17 +26,17 @@
1.216784296389448,
1.001712499365357,
0.7796429247164196,
- 0.571901106849819,
+ 0.5719011068498189,
0.39834574699730324,
0.2617839994778919,
0.1660428466673632,
0.10003334171779812,
0.05737347098846019,
- 0.030619419719839037,
+ 0.030619419719839034,
0.014904607266644073,
0.006565568384584037,
0.0026793854641647477,
- 0.0010416460147385325,
+ 0.0010416460147385327,
3.629137895691359E-4,
9.82623278317095E-5,
1.5879665844816693E-5,
@@ -70,7 +70,7 @@
],
"ys": [
1.65397819274769,
- 1.4774726044583613,
+ 1.4774726044583617,
1.2707743009482835,
1.0374950532982243,
0.7909487640658448,
@@ -80,10 +80,10 @@
0.12651798364766775,
0.06757725919698641,
0.03300267773366276,
- 0.01427173915116038,
- 0.005693025514814955,
+ 0.014271739151160378,
+ 0.005693025514814956,
0.0019431717707338516,
- 4.8730752588366135E-4,
+ 4.873075258836614E-4,
7.326467022422193E-5,
5.361893639138177E-6,
2.0660199338622954E-7,
@@ -115,22 +115,22 @@
1.998773638612381
],
"ys": [
- 1.722096296877698,
+ 1.7220962968776978,
1.57398677222407,
1.394851420852358,
1.1868737782914325,
0.9486733636220279,
- 0.7100408174082283,
- 0.4947271612575376,
+ 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.4246353621355985E-5,
9.352016591244695E-7,
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 7dec0cca..8cfd6806 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/FAIRBANKS_AK.json
@@ -27,10 +27,10 @@
0.2746884250513254,
0.20330958648206368,
0.1403632886808619,
- 0.09150123492734981,
+ 0.0915012349273498,
0.056022641564065334,
0.03311999914335675,
- 0.0185713164570039,
+ 0.018571316457003897,
0.009917617739224244,
0.004934944876941708,
0.0022460954288533925,
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 993c02f9..a18ed264 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/JUNEAU_AK.json
@@ -23,22 +23,22 @@
1.7119945007591926
],
"ys": [
- 0.1401849608924726,
- 0.1082180504924474,
- 0.07924233732120106,
- 0.05582782598193431,
- 0.03894598542891116,
- 0.02705141653837797,
- 0.018782546895544608,
- 0.012334737104400877,
- 0.007428193921599053,
- 0.004041166881254465,
- 0.0019814162270296912,
- 8.466167136800707E-4,
- 2.985332224552966E-4,
- 8.10741219562921E-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.9031224848126118E-9,
3.2000505378803756E-12,
@@ -69,19 +69,19 @@
1.6428726885203377
],
"ys": [
- 0.16119691921728796,
- 0.13873414272430967,
- 0.11495867702672521,
- 0.08962877562496549,
- 0.06406406418411464,
- 0.04146443536571581,
- 0.024584756227350263,
- 0.013434411687047471,
- 0.006749211263866024,
- 0.0030316026784251004,
- 0.0012097560999651123,
- 4.175342265419243E-4,
- 1.255941387114207E-4,
+ 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,
@@ -115,21 +115,21 @@
1.998773638612381
],
"ys": [
- 0.18505130966174427,
- 0.16345119360758736,
- 0.13975659408596586,
- 0.11382259847142859,
- 0.08555542293931165,
- 0.059459840275853576,
- 0.03845004207648513,
- 0.023256343138272875,
- 0.01311636208532044,
- 0.006922451437616338,
- 0.003428664402135892,
- 0.0015209326949123807,
- 5.788668145749388E-4,
- 1.850169501925151E-4,
- 4.8466421436560827E-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 aa9b21fe..f71dcfe8 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/KODIAK_AK.json
@@ -28,16 +28,16 @@
0.6475662303710862,
0.4707918425427097,
0.32519272294896445,
- 0.21283124141356322,
+ 0.2128312414135632,
0.13574097527098886,
- 0.08381717413931652,
- 0.05102722546305094,
+ 0.08381717413931654,
+ 0.05102722546305095,
0.030533684096192584,
0.017757505947837975,
0.009779208536822154,
0.00495739062237132,
0.00223748814778023,
- 8.360775271106735E-4,
+ 8.360775271106734E-4,
2.3127145518716242E-4,
3.908766959259963E-5,
2.5626815539339554E-6,
@@ -70,19 +70,19 @@
],
"ys": [
1.3143840761818832,
- 1.1715241821556246,
+ 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.0027335226497319054,
+ 0.015399970754471156,
+ 0.007108660320946838,
+ 0.0027335226497319045,
7.558825338514728E-4,
1.1765771038459163E-4,
6.310901665123947E-6,
@@ -115,23 +115,23 @@
1.998773638612381
],
"ys": [
- 1.3878090480442424,
- 1.2678189199286056,
- 1.1244476634474234,
+ 1.3878090480442422,
+ 1.2678189199286058,
+ 1.1244476634474232,
0.9577566116756505,
- 0.7648024244341658,
- 0.5696821914048494,
+ 0.7648024244341657,
+ 0.5696821914048495,
0.3936262320736718,
0.25445762904341573,
0.1571249991498746,
0.094043350911653,
- 0.0551398685546081,
+ 0.055139868554608104,
0.03136425581007428,
0.016788523699286094,
0.008121696981340597,
0.003390880322593564,
- 0.0010922520629723033,
- 2.2741198895158383E-4,
+ 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 cfaa332e..b6e51348 100644
--- a/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2007/VALDEZ_AK.json
@@ -24,15 +24,15 @@
],
"ys": [
0.8012677504331032,
- 0.6573423103469673,
- 0.5063567337421476,
+ 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,
@@ -74,9 +74,9 @@
0.7875249886419105,
0.646418900623757,
0.4882256711176156,
- 0.33264280767940735,
+ 0.3326428076794074,
0.20478981928867987,
- 0.11605620823277465,
+ 0.11605620823277468,
0.0631495460606707,
0.033670693646757656,
0.017560259407659134,
@@ -118,7 +118,7 @@
1.0667638963335844,
0.9865827154981542,
0.885693843075509,
- 0.7608557925362749,
+ 0.7608557925362751,
0.608087709906037,
0.44839060199479647,
0.3029026005554235,
--
GitLab