From f5c2a91d214f4fa68fda2aa63e197f50dcaaf077 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 10 Dec 2024 10:11:01 -0700
Subject: [PATCH] updated coeffs refs in gmm ids

---
 .../earthquake/nshmp/gmm/CombinedGmm.java     |  6 +--
 .../gov/usgs/earthquake/nshmp/gmm/Gmm.java    | 42 +++++++++----------
 .../gmm/UsgsPrviBackboneCrustal_tests.java    |  2 +-
 .../gmm/UsgsPrviBackboneInterface_tests.java  |  2 +-
 .../nshmp/gmm/UsgsPrviBackboneSlab_tests.java |  2 +-
 5 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/CombinedGmm.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/CombinedGmm.java
index c790609e..a7b5db0e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/CombinedGmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/CombinedGmm.java
@@ -585,7 +585,7 @@ class CombinedGmm implements GroundMotionModel {
 
     static final String NAME = CombinedGmm.NAME + "PRVI Active Crust 2025 (2.0)";
     static final Constraints CONSTRAINTS = UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS;
-    static final CoefficientContainer COEFFS = UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT;
+    static final CoefficientContainer COEFFS = UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION;
 
     PrviActiveCrust2025(Imt imt) {
       super(imt, PRVI_ACTIVE_CRUST_2025);
@@ -601,7 +601,7 @@ class CombinedGmm implements GroundMotionModel {
 
     static final String NAME = CombinedGmm.NAME + "PRVI Interface 2025 (2.0)";
     static final Constraints CONSTRAINTS = UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS;
-    static final CoefficientContainer COEFFS = UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT;
+    static final CoefficientContainer COEFFS = UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION;
 
     PrviInterface2025(Imt imt) {
       super(imt, PRVI_INTERFACE_2025);
@@ -617,7 +617,7 @@ class CombinedGmm implements GroundMotionModel {
 
     static final String NAME = CombinedGmm.NAME + "PRVI Intraslab 2025 (2.0)";
     static final Constraints CONSTRAINTS = UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS;
-    static final CoefficientContainer COEFFS = UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT;
+    static final CoefficientContainer COEFFS = UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION;
 
     PrviIntraslab2025(Imt imt) {
       super(imt, PRVI_INTRASLAB_2025);
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 fb37cd9d..9b23bb1c 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -1440,127 +1440,127 @@ public enum Gmm {
   USGS_PRVI_ACTIVE_CRUST(
       UsgsPrviBackbone2025.ActiveCrust.class,
       UsgsPrviBackbone2025.ActiveCrust.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
 
   USGS_PRVI_ACTIVE_CRUST_ADJUSTED(
       UsgsPrviBackbone2025.ActiveCrustAdjusted.class,
       UsgsPrviBackbone2025.ActiveCrustAdjusted.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
 
   USGS_PRVI_ACTIVE_CRUST_ADJUSTED_NO_EPI_SIGMA_NGA(
       UsgsPrviBackbone2025.ActiveCrustAdjustedNoEpiSigmaNga.class,
       UsgsPrviBackbone2025.ActiveCrustAdjustedNoEpiSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
 
   USGS_PRVI_ACTIVE_CRUST_SIGMA_NGA(
       UsgsPrviBackbone2025.ActiveCrustSigmaNga.class,
       UsgsPrviBackbone2025.ActiveCrustSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
 
   USGS_PRVI_ACTIVE_CRUST_NO_EPI_SIGMA_NGA(
       UsgsPrviBackbone2025.ActiveCrustNoEpiSigmaNga.class,
       UsgsPrviBackbone2025.ActiveCrustNoEpiSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
 
   USGS_PRVI_ACTIVE_CRUST_NO_EPI_SIGMA_PRVI(
       UsgsPrviBackbone2025.ActiveCrustNoEpiSigmaPrvi.class,
       UsgsPrviBackbone2025.ActiveCrustNoEpiSigmaPrvi.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.ActiveCrust.CONSTRAINTS),
 
   USGS_PRVI_ACTIVE_CRUST_COMBINED_TREE(
       UsgsPrviBackbone2025.ActiveCrustTotal.class,
       UsgsPrviBackbone2025.ActiveCrustTotal.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.ActiveCrustTotal.CONSTRAINTS),
 
   USGS_PRVI_INTERFACE(
       UsgsPrviBackbone2025.Interface.class,
       UsgsPrviBackbone2025.Interface.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Interface.CONSTRAINTS),
 
   USGS_PRVI_INTERFACE_ADJUSTED(
       UsgsPrviBackbone2025.InterfaceAdjusted.class,
       UsgsPrviBackbone2025.InterfaceAdjusted.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Interface.CONSTRAINTS),
 
   USGS_PRVI_INTERFACE_ADJUSTED_NO_EPI_SIGMA_NGA(
       UsgsPrviBackbone2025.InterfaceAdjustedNoEpiSigmaNga.class,
       UsgsPrviBackbone2025.InterfaceAdjustedNoEpiSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Interface.CONSTRAINTS),
 
   USGS_PRVI_INTERFACE_SIGMA_NGA(
       UsgsPrviBackbone2025.InterfaceSigmaNga.class,
       UsgsPrviBackbone2025.InterfaceSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Interface.CONSTRAINTS),
 
   USGS_PRVI_INTERFACE_NO_EPI_SIGMA_NGA(
       UsgsPrviBackbone2025.InterfaceNoEpiSigmaNga.class,
       UsgsPrviBackbone2025.InterfaceNoEpiSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Interface.CONSTRAINTS),
 
   USGS_PRVI_INTERFACE_NO_EPI_SIGMA_PRVI(
       UsgsPrviBackbone2025.InterfaceNoEpiSigmaPrvi.class,
       UsgsPrviBackbone2025.InterfaceNoEpiSigmaPrvi.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Interface.CONSTRAINTS),
 
   USGS_PRVI_INTERFACE_COMBINED_TREE(
       UsgsPrviBackbone2025.InterfaceTotal.class,
       UsgsPrviBackbone2025.InterfaceTotal.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.InterfaceTotal.CONSTRAINTS),
 
   USGS_PRVI_INTRASLAB(
       UsgsPrviBackbone2025.Slab.class,
       UsgsPrviBackbone2025.Slab.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Slab.CONSTRAINTS),
 
   USGS_PRVI_INTRASLAB_ADJUSTED(
       UsgsPrviBackbone2025.SlabAdjusted.class,
       UsgsPrviBackbone2025.SlabAdjusted.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Slab.CONSTRAINTS),
 
   USGS_PRVI_INTRASLAB_ADJUSTED_NO_EPI_SIGMA_NGA(
       UsgsPrviBackbone2025.SlabAdjustedNoEpiSigmaNga.class,
       UsgsPrviBackbone2025.SlabAdjustedNoEpiSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Slab.CONSTRAINTS),
 
   USGS_PRVI_INTRASLAB_SIGMA_NGA(
       UsgsPrviBackbone2025.SlabSigmaNga.class,
       UsgsPrviBackbone2025.SlabSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Slab.CONSTRAINTS),
 
   USGS_PRVI_INTRASLAB_NO_EPI_SIGMA_NGA(
       UsgsPrviBackbone2025.SlabNoEpiSigmaNga.class,
       UsgsPrviBackbone2025.SlabNoEpiSigmaNga.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Slab.CONSTRAINTS),
 
   USGS_PRVI_INTRASLAB_NO_EPI_SIGMA_PRVI(
       UsgsPrviBackbone2025.SlabNoEpiSigmaPrvi.class,
       UsgsPrviBackbone2025.SlabNoEpiSigmaPrvi.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.Slab.CONSTRAINTS),
 
   USGS_PRVI_INTRASLAB_COMBINED_TREE(
       UsgsPrviBackbone2025.SlabTotal.class,
       UsgsPrviBackbone2025.SlabTotal.NAME,
-      UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT,
+      UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION,
       UsgsPrviBackbone2025.SlabTotal.CONSTRAINTS),
 
   /* Combined: must be declared after any dependent models above. */
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneCrustal_tests.java b/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneCrustal_tests.java
index 49c8b7bd..788ae3b6 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneCrustal_tests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneCrustal_tests.java
@@ -37,7 +37,7 @@ public class UsgsPrviBackboneCrustal_tests implements ArgumentsProvider {
       USGS_PRVI_ACTIVE_CRUST_ADJUSTED,
       USGS_PRVI_ACTIVE_CRUST_COMBINED_TREE);
 
-  private static Set<Imt> imts = UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT.imts();
+  private static Set<Imt> imts = UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION.imts();
 
   public static void main(String[] args) throws IOException {
     GmmTest.generateResults(gmms, imts, GMM_INPUTS, GMM_RESULTS);
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneInterface_tests.java b/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneInterface_tests.java
index 19980384..7abb9412 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneInterface_tests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneInterface_tests.java
@@ -37,7 +37,7 @@ public class UsgsPrviBackboneInterface_tests implements ArgumentsProvider {
       USGS_PRVI_INTERFACE_ADJUSTED,
       USGS_PRVI_INTERFACE_COMBINED_TREE);
 
-  private static Set<Imt> imts = UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT.imts();
+  private static Set<Imt> imts = UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION.imts();
 
   public static void main(String[] args) throws IOException {
     GmmTest.generateResults(gmms, imts, GMM_INPUTS, GMM_RESULTS);
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneSlab_tests.java b/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneSlab_tests.java
index 29676c8f..7d94fc4a 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneSlab_tests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackboneSlab_tests.java
@@ -37,7 +37,7 @@ public class UsgsPrviBackboneSlab_tests implements ArgumentsProvider {
       USGS_PRVI_INTRASLAB_ADJUSTED,
       USGS_PRVI_INTRASLAB_COMBINED_TREE);
 
-  private static Set<Imt> imts = UsgsPrviBackbone2025.COEFFS_DATA_ADJUSTMENT.imts();
+  private static Set<Imt> imts = UsgsPrviBackbone2025.COEFFS_SIGMA_SUBDUCTION.imts();
 
   public static void main(String[] args) throws IOException {
     GmmTest.generateResults(gmms, imts, GMM_INPUTS, GMM_RESULTS);
-- 
GitLab