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

Merge branch 'boore-2020' into 'main'

Add B20 GMM tables

See merge request !257
parents e4129e2c 6f291b6d
No related branches found
No related tags found
1 merge request!257Add B20 GMM tables
Pipeline #127398 passed
...@@ -1024,6 +1024,27 @@ public enum Gmm { ...@@ -1024,6 +1024,27 @@ public enum Gmm {
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL, NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS), NgaEastUsgs_2017.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B20_AB14MOD1(
NgaEastUsgs_2017.Seed_B20_ab14mod1.class,
NgaEastUsgs_2017.Seed_B20_ab14mod1.NAME,
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B20_AB14MOD2(
NgaEastUsgs_2017.Seed_B20_ab14mod2.class,
NgaEastUsgs_2017.Seed_B20_ab14mod2.NAME,
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B20_BCA10D(
NgaEastUsgs_2017.Seed_B20_bca10d.class,
NgaEastUsgs_2017.Seed_B20_bca10d.NAME,
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */ /** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_FRANKEL( NGA_EAST_SEED_FRANKEL(
NgaEastUsgs_2017.Seed_Frankel.class, NgaEastUsgs_2017.Seed_Frankel.class,
...@@ -1588,6 +1609,9 @@ public enum Gmm { ...@@ -1588,6 +1609,9 @@ public enum Gmm {
NGA_EAST_SEED_B_BCA10D, NGA_EAST_SEED_B_BCA10D,
NGA_EAST_SEED_B_BS11, NGA_EAST_SEED_B_BS11,
NGA_EAST_SEED_B_SGD02, NGA_EAST_SEED_B_SGD02,
NGA_EAST_SEED_B20_AB14MOD1,
NGA_EAST_SEED_B20_AB14MOD2,
NGA_EAST_SEED_B20_BCA10D,
NGA_EAST_SEED_FRANKEL, NGA_EAST_SEED_FRANKEL,
NGA_EAST_SEED_GRAIZER, NGA_EAST_SEED_GRAIZER,
NGA_EAST_SEED_GRAIZER16, NGA_EAST_SEED_GRAIZER16,
......
...@@ -132,6 +132,9 @@ final class GroundMotionTables { ...@@ -132,6 +132,9 @@ final class GroundMotionTables {
"B_bca10d", "B_bca10d",
"B_bs11", "B_bs11",
"B_sgd02", "B_sgd02",
"B20_ab14mod1",
"B20_ab14mod2",
"B20_bca10d",
"Frankel", "Frankel",
"Graizer", "Graizer",
"Graizer16", "Graizer16",
......
...@@ -697,6 +697,33 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel { ...@@ -697,6 +697,33 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
} }
} }
static final class Seed_B20_ab14mod1 extends Seed {
static final String ID = "B20_ab14mod1";
static final String NAME = Seed.NAME + ID;
Seed_B20_ab14mod1(Imt imt) {
super(ID, imt);
}
}
static final class Seed_B20_ab14mod2 extends Seed {
static final String ID = "B20_ab14mod2";
static final String NAME = Seed.NAME + ID;
Seed_B20_ab14mod2(Imt imt) {
super(ID, imt);
}
}
static final class Seed_B20_bca10d extends Seed {
static final String ID = "B20_bca10d";
static final String NAME = Seed.NAME + ID;
Seed_B20_bca10d(Imt imt) {
super(ID, imt);
}
}
static final class Seed_Frankel extends Seed { static final class Seed_Frankel extends Seed {
static final String ID = "Frankel"; static final String ID = "Frankel";
static final String NAME = Seed.NAME + ID; static final String NAME = Seed.NAME + ID;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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