From 813e01ae5a47f6b011ae5dbd37eb0de34c85b229 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Sun, 30 Jan 2022 11:06:52 -0700
Subject: [PATCH] merged old stash for running local lib and conus
---
gradle/dependencies.gradle | 2 ++
settings.gradle | 3 +++
src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java | 1 +
src/main/resources/application.yml | 2 ++
4 files changed, 8 insertions(+)
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index 2a81e3a09..af19505cd 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,6 +1,8 @@
dependencies {
+
// NSHMP
+ // implementation files('../nshmp-lib/build/libs/nshmp-lib.jar')
implementation "ghsc:nshmp-lib:${nshmpLibVersion}"
implementation "ghsc:nshmp-ws-utils:${nshmpWsUtilsVersion}"
diff --git a/settings.gradle b/settings.gradle
index 90c2faad1..d1ad3db91 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,6 +20,9 @@ git {
fetch("https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git", {
name "nshmp-haz-dep--nshm-hi-2021"
tag "2.0.0"
+ // fetch("https://code.usgs.gov/ghsc/nshmp/nshms/nshm-conus.git", {
+ // name "nshmp-haz-dep--nshm-conus-2018"
+ // tag "main"
})
}
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
index d10e9eda7..e4d039601 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
@@ -146,6 +146,7 @@ public class DisaggEpsilon {
log.info("Spectra: " + imtImlMaps.size());
checkArgument(sites.size() == imtImlMaps.size(), "Sites and spectra lists different sizes");
+ // Spectra should be checked against IMTs supported by model GMMs
Path out = calc(model, config, sites, imtImlMaps, log);
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d4d11ef0c..5ca335064 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,4 +20,6 @@ nshmp-haz:
# The path to the models.
# To specify the model to use:
# java -jar build/libs/nshmp-haz.jar --models=<path/to/models>
+ #
model-path: ${models:libs/nshmp-haz-dep--nshm-hi-2021}
+ # model-path: ${models:libs/nshmp-haz-dep--nshm-conus-2018}
--
GitLab