From f7f0e8bebbd42ff493477587935c6646ec5b73eb Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 15 Jun 2022 22:29:20 -0600
Subject: [PATCH] added M9 identifiers to seattle gmms
---
.../earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java | 4 ++--
src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java | 11 ++++++++---
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java
index 0a16d036..e6b9b15e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonGulerce_2020.java
@@ -538,7 +538,7 @@ public abstract class AbrahamsonGulerce_2020 implements GroundMotionModel {
static final String NAME = CascadiaAdjustedInterface.NAME + " (Seattle basin)";
SeattleAdjustedInterfaceBasin(Imt imt) {
- super(imt, Gmm.AG_20_SEATTLE_ADJ_INTERFACE_BASIN);
+ super(imt, Gmm.AG_20_SEATTLE_M9_ADJ_INTERFACE_BASIN);
}
@Override
@@ -583,7 +583,7 @@ public abstract class AbrahamsonGulerce_2020 implements GroundMotionModel {
static final String NAME = CascadiaInterface.NAME + " (Seattle basin)";
SeattleInterfaceBasin(Imt imt) {
- super(imt, Gmm.AG_20_SEATTLE_INTERFACE_BASIN);
+ super(imt, Gmm.AG_20_SEATTLE_M9_INTERFACE_BASIN);
}
@Override
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 6cb01c5b..c25d80a1 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -373,7 +373,7 @@ public enum Gmm {
AbrahamsonGulerce_2020.CONSTRAINTS_INTERFACE),
/** @see AbrahamsonGulerce_2020 */
- AG_20_SEATTLE_INTERFACE_BASIN(
+ AG_20_SEATTLE_M9_INTERFACE_BASIN(
AbrahamsonGulerce_2020.SeattleInterfaceBasin.class,
AbrahamsonGulerce_2020.SeattleInterfaceBasin.NAME,
AbrahamsonGulerce_2020.COEFFS,
@@ -394,7 +394,7 @@ public enum Gmm {
AbrahamsonGulerce_2020.CONSTRAINTS_INTERFACE),
/** @see AbrahamsonGulerce_2020 */
- AG_20_SEATTLE_ADJ_INTERFACE_BASIN(
+ AG_20_SEATTLE_M9_ADJ_INTERFACE_BASIN(
AbrahamsonGulerce_2020.SeattleAdjustedInterfaceBasin.class,
AbrahamsonGulerce_2020.SeattleAdjustedInterfaceBasin.NAME,
AbrahamsonGulerce_2020.COEFFS,
@@ -471,7 +471,7 @@ public enum Gmm {
ParkerEtAl_2020.CONSTRAINTS_INTERFACE),
/** @see ParkerEtAl_2020 */
- PSBAH_20_SEATTLE_INTERFACE_BASIN(
+ PSBAH_20_SEATTLE_M9_INTERFACE_BASIN(
ParkerEtAl_2020.SeattleInterfaceBasin.class,
ParkerEtAl_2020.SeattleInterfaceBasin.NAME,
ParkerEtAl_2020.COEFFS_INTERFACE,
@@ -1401,10 +1401,13 @@ public enum Gmm {
AG_20_CASCADIA_INTERFACE,
AG_20_CASCADIA_SLAB,
AG_20_CASCADIA_ADJ_INTERFACE,
+ AG_20_CASCADIA_ADJ_INTERFACE,
AG_20_CASCADIA_ADJ_SLAB,
AG_20_CASCADIA_INTERFACE_BASIN,
+ AG_20_SEATTLE_M9_INTERFACE_BASIN,
AG_20_CASCADIA_SLAB_BASIN,
AG_20_CASCADIA_ADJ_INTERFACE_BASIN,
+ AG_20_SEATTLE_M9_ADJ_INTERFACE_BASIN,
AG_20_CASCADIA_ADJ_SLAB_BASIN,
AG_20_ALASKA_INTERFACE,
AG_20_ALASKA_SLAB,
@@ -1415,6 +1418,7 @@ public enum Gmm {
KBCG_20_CASCADIA_INTERFACE,
KBCG_20_CASCADIA_SLAB,
KBCG_20_CASCADIA_INTERFACE_BASIN,
+ KBCG_20_SEATTLE_M9_INTERFACE_BASIN,
KBCG_20_CASCADIA_SLAB_BASIN,
KBCG_20_ALASKA_INTERFACE,
KBCG_20_ALASKA_SLAB,
@@ -1423,6 +1427,7 @@ public enum Gmm {
PSBAH_20_CASCADIA_INTERFACE,
PSBAH_20_CASCADIA_SLAB,
PSBAH_20_CASCADIA_INTERFACE_BASIN,
+ PSBAH_20_SEATTLE_M9_INTERFACE_BASIN,
PSBAH_20_CASCADIA_SLAB_BASIN,
PSBAH_20_ALASKA_INTERFACE,
PSBAH_20_ALASKA_SLAB)),
--
GitLab