Skip to content
Snippets Groups Projects
Commit e3203b13 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

ngaw2 prvi subclasses

parent cebe6060
No related branches found
No related tags found
1 merge request!436Prvi gmm 251
......@@ -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);
}
}
}
......@@ -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);
}
}
}
......@@ -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);
}
}
}
......@@ -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);
}
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment