diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle index 2a81e3a09e2c2fb9f3dfbaa7a03a4c847efc020d..af19505cd1bef520ab22beb648c802e286e8c3b5 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 90c2faad1fbd25d62f6b46e92c5d1c0eaf72b53d..d1ad3db91dd9ab2fe2e8358b69f8dd2156ba629e 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 d10e9eda757c0772d7979048479886afb6c1b511..e4d039601024e06a0ac5b2df0f01b3bf06aeaed1 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 d4d11ef0c76a2efa5215bacfdf56dc4f1d56d3e9..5ca3350641b37f5b8d35d94bb59f1bea3dc5b00b 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}