From 010047cef3e09bb5f42a11eab3b84c572f70f4d0 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 25 Jan 2022 13:07:29 -0700
Subject: [PATCH] increment lib; disagg epsilon edits
---
gradle.properties | 2 +-
src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 4b1f2b84d..cb06f8f26 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,7 +10,7 @@ micronautRxVersion = 2.1.1
micronautPluginVersion = 3.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 0.9.0
+nshmpLibVersion = 0.9.1
nshmpWsUtilsVersion = 0.1.7
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
index 066a6fca2..21222248e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
@@ -32,6 +32,7 @@ import com.google.gson.GsonBuilder;
import gov.usgs.earthquake.nshmp.calc.CalcConfig;
import gov.usgs.earthquake.nshmp.calc.Disaggregation;
+import gov.usgs.earthquake.nshmp.calc.Disaggs;
import gov.usgs.earthquake.nshmp.calc.Hazard;
import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
import gov.usgs.earthquake.nshmp.calc.Site;
@@ -251,6 +252,7 @@ public class DisaggEpsilon {
Site site = sites.get(i);
Map<Imt, Double> spectrum = rtrSpectra.get(i);
+ // use IMLs from site spectra
Hazard hazard = HazardCalcs.hazard(model, config, site, exec);
Disaggregation disagg = Disaggregation.atImls(hazard, spectrum, exec);
@@ -261,7 +263,9 @@ public class DisaggEpsilon {
site,
imt,
spectrum.get(imt));
- Response response = new Response(imtMetadata, disagg.toJsonCompact(imt));
+ Response response = new Response(
+ imtMetadata,
+ Disaggs.resultWithGmmAndType(disagg, imt));
responses.add(response);
}
Result result = new Result(responses);
--
GitLab