From 1a8cceb94dbacf83487cd9daf8415547d2f7b951 Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Mon, 9 Dec 2024 14:08:09 -0700 Subject: [PATCH] added ngaw2 prvi ids; updated prvi groups --- .../gov/usgs/earthquake/nshmp/gmm/Gmm.java | 44 +++++++++++++++++-- 1 file changed, 41 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 d62217e2..fb37cd9d 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java @@ -175,6 +175,13 @@ public enum Gmm { AbrahamsonEtAl_2014.COEFFS, AbrahamsonEtAl_2014.CONSTRAINTS), + /** @see AbrahamsonEtAl_2014 */ + ASK_14_PRVI( + AbrahamsonEtAl_2014.Prvi.class, + AbrahamsonEtAl_2014.Prvi.NAME, + AbrahamsonEtAl_2014.COEFFS, + AbrahamsonEtAl_2014.CONSTRAINTS), + /** @see BooreEtAl_2014 */ BSSA_14( BooreEtAl_2014.Usgs.class, @@ -203,6 +210,13 @@ public enum Gmm { BooreEtAl_2014.COEFFS, BooreEtAl_2014.CONSTRAINTS), + /** @see BooreEtAl_2014 */ + BSSA_14_PRVI( + BooreEtAl_2014.Prvi.class, + BooreEtAl_2014.Prvi.NAME, + BooreEtAl_2014.COEFFS, + BooreEtAl_2014.CONSTRAINTS), + /** @see CampbellBozorgnia_2014 */ CB_14( CampbellBozorgnia_2014.Usgs.class, @@ -231,6 +245,13 @@ public enum Gmm { CampbellBozorgnia_2014.COEFFS, CampbellBozorgnia_2014.CONSTRAINTS), + /** @see CampbellBozorgnia_2014 */ + CB_14_PRVI( + CampbellBozorgnia_2014.Prvi.class, + CampbellBozorgnia_2014.Prvi.NAME, + CampbellBozorgnia_2014.COEFFS, + CampbellBozorgnia_2014.CONSTRAINTS), + /** @see ChiouYoungs_2014 */ CY_14( ChiouYoungs_2014.Usgs.class, @@ -266,6 +287,13 @@ public enum Gmm { ChiouYoungs_2014.COEFFS, ChiouYoungs_2014.CONSTRAINTS), + /** @see ChiouYoungs_2014 */ + CY_14_PRVI( + ChiouYoungs_2014.Prvi.class, + ChiouYoungs_2014.Prvi.NAME, + ChiouYoungs_2014.COEFFS, + ChiouYoungs_2014.CONSTRAINTS), + /** @see Idriss_2014 */ IDRISS_14( Idriss_2014.Usgs.class, @@ -1918,7 +1946,11 @@ public enum Gmm { ASK_14_BASE, BSSA_14_BASE, CB_14_BASE, - CY_14_BASE)), + CY_14_BASE, + ASK_14_PRVI, + BSSA_14_PRVI, + CB_14_PRVI, + CY_14_PRVI)), PRVI_25_INTERFACE( "2025 PRVI Interface (beta)", @@ -1927,7 +1959,10 @@ public enum Gmm { USGS_PRVI_INTERFACE_ADJUSTED, AG_20_GLOBAL_INTERFACE, KBCG_20_GLOBAL_INTERFACE, - PSBAH_20_GLOBAL_INTERFACE)), + PSBAH_20_GLOBAL_INTERFACE, + AG_20_PRVI_INTERFACE, + KBCG_20_PRVI_INTERFACE, + PSBAH_20_PRVI_INTERFACE)), PRVI_25_SLAB( "2025 PRVI Intraslab (beta)", @@ -1936,7 +1971,10 @@ public enum Gmm { USGS_PRVI_INTRASLAB_ADJUSTED, AG_20_GLOBAL_SLAB, KBCG_20_GLOBAL_SLAB, - PSBAH_20_GLOBAL_SLAB)), + PSBAH_20_GLOBAL_SLAB, + AG_20_PRVI_SLAB, + KBCG_20_PRVI_SLAB, + PSBAH_20_PRVI_SLAB)), CEUS_14_STABLE_CRUST( "2014 Stable Crust (CEUS)", -- GitLab