From aa43b6d7981762827833ad87c1de0d8faadf3101 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 11 Jun 2024 09:32:08 -0600
Subject: [PATCH 1/2] reverted to reporting all imts per gmm
---
src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java
index d336352..aa7777a 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java
@@ -30,7 +30,6 @@ import gov.usgs.earthquake.nshmp.www.gmm.GmmService.Distance;
import gov.usgs.earthquake.nshmp.www.gmm.GmmService.Magnitude;
import gov.usgs.earthquake.nshmp.www.gmm.GmmService.Request;
import gov.usgs.earthquake.nshmp.www.gmm.XyDataGroup.EpiSeries;
-
import jakarta.inject.Singleton;
/*
@@ -43,11 +42,12 @@ class GmmCalc {
/* Compute ground motion response spectra. */
static Map<Gmm, GmmSpectraData> spectra(Request request) {
- Set<Imt> saImts = Gmm.responseSpectrumImts(request.gmms);
Map<Gmm, GmmSpectraData> gmmSpectra = new EnumMap<>(Gmm.class);
for (Gmm gmm : request.gmms) {
+ Set<Imt> saImts = gmm.responseSpectrumImts();
+
List<LogicTree<GroundMotion>> saImtTrees = saImts.stream()
.map(imt -> gmm.instance(imt).calc(request.input))
.collect(Collectors.toList());
--
GitLab
From e0c7b6ef6350597b8bbfeb6ac29bb5a772aa90a1 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 11 Jun 2024 09:33:19 -0600
Subject: [PATCH 2/2] formatting
---
src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java
index aa7777a..31c51db 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java
@@ -30,6 +30,7 @@ import gov.usgs.earthquake.nshmp.www.gmm.GmmService.Distance;
import gov.usgs.earthquake.nshmp.www.gmm.GmmService.Magnitude;
import gov.usgs.earthquake.nshmp.www.gmm.GmmService.Request;
import gov.usgs.earthquake.nshmp.www.gmm.XyDataGroup.EpiSeries;
+
import jakarta.inject.Singleton;
/*
--
GitLab