diff --git a/gradle/nshm.gradle b/gradle/nshm.gradle index 8b8cfbd74a60b182f3239c6882b7b6793251b0f4..3b3ce34fd9e586c4b0c4492025f647420a5df18e 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 ed3071867d0ef39bb4970ebd2d637294f1be46e2..674894c77c6bec77c3bd5fbb89bb99e322d74943 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 a0668cb41122988c442b32125a07e9cfdf8bddb3..58281e4e9ad419567c3fd97bf03c50208eb40ddf 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 *