From 956f5b25d33ebd35518322ebf31d0c6d349f3b56 Mon Sep 17 00:00:00 2001 From: Jason Altekruse <jaltekruse@usgs.gov> Date: Thu, 11 Apr 2024 11:58:47 -0600 Subject: [PATCH] add MA05 to PRVI subduction groups and using distinct names for base and USGS flavors --- src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java | 6 +++++- .../usgs/earthquake/nshmp/gmm/MotazedianAtkinson_2005.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 695b8866..bb2b45a9 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java @@ -61,7 +61,7 @@ public enum Gmm { MA_05( MotazedianAtkinson_2005.Usgs.class, - MotazedianAtkinson_2005.NAME, + MotazedianAtkinson_2005.Usgs.NAME, MotazedianAtkinson_2005.COEFFS, MotazedianAtkinson_2005.CONSTRAINTS), @@ -1692,6 +1692,8 @@ public enum Gmm { AG_20_GLOBAL_INTERFACE, KBCG_20_GLOBAL_INTERFACE, PSBAH_20_GLOBAL_INTERFACE, + MA_05_BASE, + MA_05, GOMEZ_22_NONCRUSTAL)), PRVI_25_SLAB( @@ -1700,6 +1702,8 @@ public enum Gmm { AG_20_GLOBAL_SLAB, KBCG_20_GLOBAL_SLAB, PSBAH_20_GLOBAL_SLAB, + MA_05_BASE, + MA_05, GOMEZ_22_NONCRUSTAL)), CEUS_14_STABLE_CRUST( diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/MotazedianAtkinson_2005.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/MotazedianAtkinson_2005.java index 5f8d1e19..d5798608 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/MotazedianAtkinson_2005.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/MotazedianAtkinson_2005.java @@ -79,7 +79,7 @@ import gov.usgs.earthquake.nshmp.tree.LogicTree; */ public class MotazedianAtkinson_2005 implements GroundMotionModel { - static final String NAME = "Motazedian & Atkinson (2005) BETA"; + static final String NAME = "Motazedian & Atkinson (2005) BASE BETA"; static final Constraints CONSTRAINTS = Constraints.builder() .set(MW, Range.closed(4.0, 9.5)) @@ -213,6 +213,8 @@ public class MotazedianAtkinson_2005 implements GroundMotionModel { */ static class Usgs extends MotazedianAtkinson_2005 { + static final String NAME = "Motazedian & Atkinson (2005) BETA"; + /* MA05 non-MPRS IMTs. */ private static final Map<Imt, Range<Imt>> INTERPOLATED_SITE_IMTS = new EnumMap<>(Map.of( -- GitLab