From d20b0d8a62eb728225a88fdb542b9b4990e5316a Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 22 Nov 2024 10:50:10 -0700
Subject: [PATCH 1/3] added ceus 2014 gmms to group
---
src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
index 33b893b1..b3de9e2e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -1907,7 +1907,9 @@ public enum Gmm {
SILVA_02,
SOMERVILLE_01,
TP_05,
- TORO_97_MW)),
+ TORO_97_MW,
+ CONUS_STABLE_CRUST_2014_FAULT,
+ CONUS_STABLE_CRUST_2014_GRID)),
WUS_14_ACTIVE_CRUST(
"2014 Active Crust (WUS)",
--
GitLab
From 1a74b34c4fd618081e0366f04fc025d862530fa8 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 22 Nov 2024 11:14:01 -0700
Subject: [PATCH 2/3] hazard mag output filename fix
---
src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
index 35f95b04..1e1e7b63 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
@@ -258,7 +258,7 @@ public final class HazardExport {
private static String magsFilename(Site site) {
String baseName = String.format(
- "%.2f,%.2f.csv",
+ "%s,%s.csv",
site.location().longitude,
site.location().latitude);
return site.name().equals(Site.NO_NAME)
--
GitLab
From 07b981dd4820ef661d7bb675cfb21ff65b60208f Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Fri, 22 Nov 2024 11:14:31 -0700
Subject: [PATCH 3/3] disagg interface system fix
---
.../java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java | 3 +++
.../java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java | 2 ++
2 files changed, 5 insertions(+)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java
index 46ed521d..6754d020 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java
@@ -491,6 +491,9 @@ final class DisaggDataset {
case FAULT_SYSTEM:
putOrAddSystem((SystemContributor) disaggContributor);
break;
+ case INTERFACE_SYSTEM:
+ putOrAddSystem((SystemContributor) disaggContributor);
+ break;
default:
putOrAddSource((SourceContributor) disaggContributor);
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java
index 89010678..4487a2ff 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/Disaggregator.java
@@ -91,6 +91,8 @@ final class Disaggregator {
return processClusterSources();
case FAULT_SYSTEM:
return processSystemSources();
+ case INTERFACE_SYSTEM:
+ return processSystemSources();
default:
return processSources();
}
--
GitLab