From c7e058d4d0188cd6e32d0fd44dbabd9962392047 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 14 Aug 2024 06:58:02 -0600
Subject: [PATCH] added prvi gmm enum ids
---
.../gov/usgs/earthquake/nshmp/gmm/Gmm.java | 37 +++++++++++++++++++
.../nshmp/gmm/UsgsPrviBackbone2025.java | 3 --
2 files changed, 37 insertions(+), 3 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 863bfda9..4db06d84 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -1294,6 +1294,43 @@ public enum Gmm {
NgaEast.COEFFS_SIGMA_PANEL,
NgaEast.CONSTRAINTS),
+ /* PRVI */
+ USGS_PRVI_ACTIVE_CRUST(
+ UsgsPrviBackbone2025.ActiveCrust.class,
+ UsgsPrviBackbone2025.ActiveCrust.NAME,
+ UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+ UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
+
+ USGS_PRVI_ACTIVE_CRUST_ADJUSTED(
+ UsgsPrviBackbone2025.ActiveCrustAdjusted.class,
+ UsgsPrviBackbone2025.ActiveCrustAdjusted.NAME,
+ UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+ UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
+
+ USGS_PRVI_INTERFACE(
+ UsgsPrviBackbone2025.Interface.class,
+ UsgsPrviBackbone2025.Interface.NAME,
+ UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+ UsgsPrviBackbone2025.Interface.CONSTRAINTS),
+
+ USGS_PRVI_INTERFACE_ADJUSTED(
+ UsgsPrviBackbone2025.InterfaceAdjusted.class,
+ UsgsPrviBackbone2025.InterfaceAdjusted.NAME,
+ UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+ UsgsPrviBackbone2025.Interface.CONSTRAINTS),
+
+ USGS_PRVI_INTRASLAB(
+ UsgsPrviBackbone2025.Slab.class,
+ UsgsPrviBackbone2025.Slab.NAME,
+ UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+ UsgsPrviBackbone2025.Slab.CONSTRAINTS),
+
+ USGS_PRVI_INTRASLAB_ADJUSTED(
+ UsgsPrviBackbone2025.SlabAdjusted.class,
+ UsgsPrviBackbone2025.SlabAdjusted.NAME,
+ UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+ UsgsPrviBackbone2025.Slab.CONSTRAINTS),
+
/* Combined: must be declared after any dependent models above. */
/** 2021 Hawaii weight-averaged GMM for deep earthquakes. */
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java
index b9a1582f..9b0f87dd 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java
@@ -185,7 +185,6 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
static final String NAME = UsgsPrviBackbone2025.NAME + ": Active Crust";
static final Constraints CONSTRAINTS = AbrahamsonEtAl_2014.CONSTRAINTS;
- static final CoefficientContainer COEFFS = AbrahamsonEtAl_2014.COEFFS;
static final Map<Gmm, Double> GMM_MAP = Map.of(
ASK_14, 0.25,
@@ -261,7 +260,6 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
static final String NAME = UsgsPrviBackbone2025.NAME + ":" + INTERFACE;
static final Constraints CONSTRAINTS = AbrahamsonGulerce_2020.CONSTRAINTS_INTERFACE;
- static final CoefficientContainer COEFFS = AbrahamsonGulerce_2020.COEFFS;
static final Map<Gmm, Double> GMM_MAP = Map.of(
AG_20_GLOBAL_INTERFACE, 0.3333,
@@ -314,7 +312,6 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
static final String NAME = UsgsPrviBackbone2025.NAME + ":" + SLAB;
static final Constraints CONSTRAINTS = AbrahamsonGulerce_2020.CONSTRAINTS_SLAB;
- static final CoefficientContainer COEFFS = AbrahamsonGulerce_2020.COEFFS;
static final Map<Gmm, Double> GMM_MAP = Map.of(
AG_20_GLOBAL_SLAB, 0.3333,
--
GitLab