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 863bfda95ecb5a786a87f6b1f528aece098d3391..4db06d842638af72e8943da905459429933a8a70 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 b9a1582ff69f9068c9c0975190c21b694e3abb03..9b0f87dd32ad1390b2b5d6390fe4bf436152e9f6 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,