From 307709982ad08ca821facfc2dac646fd5537b782 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 4 Apr 2024 10:15:48 -0600
Subject: [PATCH 1/4] update lib
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 26eadda..2556ff3 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
nshmFaultSectionsTag = v0.1
-nshmpLibVersion = 1.4.13
+nshmpLibVersion = 1.4.18
nshmpUtilsJavaVersion = 0.4.0
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
--
GitLab
From 84ec00f7efd51889315e8f9944cdf964006812d8 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 4 Apr 2024 10:36:21 -0600
Subject: [PATCH 2/4] convert to period
---
.../java/gov/usgs/earthquake/nshmp/www/gmm/GmmCalc.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
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 ef285d3..a55b162 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
@@ -52,12 +52,16 @@ class GmmCalc {
.map(imt -> gmm.instance(imt).calc(request.input))
.collect(Collectors.toList());
+ List<Double> saPeriods = saImts.stream()
+ .map(imt -> imt.period())
+ .collect(Collectors.toList());
+
gmmSpectra.put(
gmm,
new GmmSpectraData(
treeToDataGroup(gmm, Imt.PGA, request.input),
treeToDataGroup(gmm, Imt.PGV, request.input),
- treesToDataGroup(Imt.periods(saImts), saImtTrees)));
+ treesToDataGroup(saPeriods, saImtTrees)));
}
return gmmSpectra;
--
GitLab
From fe3117e7c7da18401b92f88c679a7ff1b0a2ee1f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 4 Apr 2024 10:37:18 -0600
Subject: [PATCH 3/4] spotless
---
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 a55b162..d336352 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
@@ -53,8 +53,8 @@ class GmmCalc {
.collect(Collectors.toList());
List<Double> saPeriods = saImts.stream()
- .map(imt -> imt.period())
- .collect(Collectors.toList());
+ .map(imt -> imt.period())
+ .collect(Collectors.toList());
gmmSpectra.put(
gmm,
--
GitLab
From 2ea54d321e0cbb77f5275d96787e1b3d9efecaaa Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Fri, 5 Apr 2024 09:04:25 -0600
Subject: [PATCH 4/4] update lib version
---
gradle.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gradle.properties b/gradle.properties
index 2556ff3..cf4efbb 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@ micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
nshmFaultSectionsTag = v0.1
-nshmpLibVersion = 1.4.18
+nshmpLibVersion = 1.4.19
nshmpUtilsJavaVersion = 0.4.0
shadowVersion = 7.1.2
spotbugsVersion = 4.7.0
--
GitLab