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 c790609e65dda6a164e0ac5bb044a1b2efda6bd3..a7b5db0e43fa5ea1fd0cd7f53337e2eaa309eb7c 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 fb37cd9d3e17b532303e2c1edbc2f3d0178fd32f..9b23bb1c051f4033ca4873a704c7d713e0619fe3 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 49c8b7bd1793f300602a81d5d3eb82cad6758e1f..788ae3b65bd87b62c581c55111b62f06c1498c5a 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 1998038415f273534969978c21d60d8472587b69..7abb941211030147cabaec918cdb80ecefd96590 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 29676c8f3571d4fb516d383c3176732b7dc10073..7d94fc4a6fb9ec479dc4c348fbbc4c6127791f43 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);