diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java index 3d159789a9a60536cbf4517ede4bed1cf4ef9766..bab0c00bbb64e8a32118da9885e71ff967b8478b 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java @@ -115,7 +115,7 @@ public class AbrahamsonEtAl_2014 implements GroundMotionModel { // Japan model // final double a25, a28, a29, a31, a36, a37, a38, a39, a40, a41, a42; - Coefficients(Imt imt) { + Coefficients(Imt imt, boolean prvi) { this.imt = imt; Map<String, Double> coeffs = COEFFS.get(imt); @@ -153,7 +153,11 @@ public class AbrahamsonEtAl_2014 implements GroundMotionModel { private final Coefficients coeffs; AbrahamsonEtAl_2014(Imt imt) { - coeffs = new Coefficients(imt); + this(imt, false); + } + + AbrahamsonEtAl_2014(Imt imt, boolean prvi) { + coeffs = new Coefficients(imt, prvi); } @Override @@ -458,4 +462,10 @@ public class AbrahamsonEtAl_2014 implements GroundMotionModel { } } + static final class Prvi extends AbrahamsonEtAl_2014 { + Prvi(Imt imt) { + super(imt, true); + } + } + } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java index 8a65689649e6c70d875c39bc063f84b8132fc998..a5d695a6e5bdbaa91e871f2b97d3ccaeb9b61f07 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java @@ -95,7 +95,7 @@ public class BooreEtAl_2014 implements GroundMotionModel { // unused regional coeffs // double Dc3CnTr, Dc3ItJp; - Coefficients(Imt imt) { + Coefficients(Imt imt, boolean prvi) { this.imt = imt; Map<String, Double> coeffs = COEFFS.get(imt); @@ -136,8 +136,12 @@ public class BooreEtAl_2014 implements GroundMotionModel { private final Coefficients coeffsPGA; BooreEtAl_2014(Imt imt) { - coeffs = new Coefficients(imt); - coeffsPGA = new Coefficients(PGA); + this(imt, false); + } + + BooreEtAl_2014(Imt imt, boolean prvi) { + coeffs = new Coefficients(imt, prvi); + coeffsPGA = new Coefficients(PGA, prvi); } @Override @@ -342,4 +346,10 @@ public class BooreEtAl_2014 implements GroundMotionModel { } } + static final class Prvi extends BooreEtAl_2014 { + Prvi(Imt imt) { + super(imt, true); + } + } + } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java index c927084a7d04a4034f7c455c1b43159862d4d1b9..f439051126e021f55c6eb8bae3488c21f737c8ef 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java @@ -114,7 +114,7 @@ public class CampbellBozorgnia_2014 implements GroundMotionModel { // unused regional and other coeffs // double c15, Dc20_CA, Dc20_JP, Dc20_CH, phiC; - Coefficients(Imt imt) { + Coefficients(Imt imt, boolean prvi) { this.imt = imt; Map<String, Double> coeffs = COEFFS.get(imt); @@ -158,8 +158,12 @@ public class CampbellBozorgnia_2014 implements GroundMotionModel { private final Coefficients coeffsPGA; CampbellBozorgnia_2014(Imt imt) { - coeffs = new Coefficients(imt); - coeffsPGA = new Coefficients(PGA); + this(imt, false); + } + + CampbellBozorgnia_2014(Imt imt, boolean prvi) { + coeffs = new Coefficients(imt, prvi); + coeffsPGA = new Coefficients(PGA, prvi); } @Override @@ -493,4 +497,10 @@ public class CampbellBozorgnia_2014 implements GroundMotionModel { } } + static final class Prvi extends CampbellBozorgnia_2014 { + Prvi(Imt imt) { + super(imt, true); + } + } + } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java index e4751a830038d8bc8f59a66288e763b87023c5d2..49979383b2cd2d09f4bf0dd6b9aa4f0ed66a7f3a 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java @@ -112,7 +112,7 @@ public class ChiouYoungs_2014 implements GroundMotionModel { // double c8, c8a, c8b, sigma2_JP, gamma_JP_IT, gamma_WN, phi1_JP, // phi5_JP, phi6_JP; - Coefficients(Imt imt) { + Coefficients(Imt imt, boolean prvi) { this.imt = imt; Map<String, Double> coeffs = COEFFS.get(imt); @@ -155,7 +155,11 @@ public class ChiouYoungs_2014 implements GroundMotionModel { private final Coefficients coeffs; ChiouYoungs_2014(Imt imt) { - coeffs = new Coefficients(imt); + this(imt, false); + } + + ChiouYoungs_2014(Imt imt, boolean prvi) { + coeffs = new Coefficients(imt, prvi); } @Override @@ -389,4 +393,10 @@ public class ChiouYoungs_2014 implements GroundMotionModel { } } + static final class Prvi extends ChiouYoungs_2014 { + Prvi(Imt imt) { + super(imt, true); + } + } + }