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 14415cb4c149f9b1d57c6001e148bfff1a62af76..12780172539e77c513510785f2fe12969d2d6c91 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/CombinedGmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/CombinedGmm.java
@@ -155,8 +155,8 @@ class CombinedGmm implements GroundMotionModel {
static final class Ceus2018 extends CombinedGmm {
static final String NAME = CombinedGmm.NAME + "CEUS 2018 (5.0)";
- static final Constraints CONSTRAINTS = NgaEastUsgs_2017.CONSTRAINTS;
- static final CoefficientContainer COEFFS = NgaEastUsgs_2017.COEFFS_SIGMA_PANEL;
+ static final Constraints CONSTRAINTS = NgaEast_2018.CONSTRAINTS;
+ static final CoefficientContainer COEFFS = NgaEast_2018.COEFFS_SIGMA_PANEL;
Ceus2018(Imt imt) {
super(imt, CEUS_2018);
@@ -171,8 +171,8 @@ class CombinedGmm implements GroundMotionModel {
static final class Ceus2018Cpa extends CombinedGmm {
static final String NAME = CombinedGmm.NAME + "CEUS 2018 (Gulf Coast)";
- static final Constraints CONSTRAINTS = NgaEastUsgs_2017.CONSTRAINTS;
- static final CoefficientContainer COEFFS = NgaEastUsgs_2017.COEFFS_SIGMA_PANEL;
+ static final Constraints CONSTRAINTS = NgaEast_2018.CONSTRAINTS;
+ static final CoefficientContainer COEFFS = NgaEast_2018.COEFFS_SIGMA_PANEL;
Ceus2018Cpa(Imt imt) {
super(imt, CEUS_2018_CPA);
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 4a90b6d304e322fbe7754808d98d145cdd923b5d..1622886215827e87f23ffbbcde635be4f9ed93f6 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -854,189 +854,189 @@ public enum Gmm {
/** @see NgaEastUsgs_2017 */
NGA_EAST_USGS(
- NgaEastUsgs_2017.Usgs17.class,
- NgaEastUsgs_2017.Usgs17.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Usgs17.class,
+ NgaEast_2018.Usgs17.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** NGA-East for USGS with Guo & Chapman Gulf CPA **/
NGA_EAST_USGS_CPA(
- NgaEastUsgs_2017.Usgs17Cpa.class,
- NgaEastUsgs_2017.Usgs17Cpa.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Usgs17Cpa.class,
+ NgaEast_2018.Usgs17Cpa.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/* NGA-East USGS Seed Tree */
/** @see NgaEastUsgs_2017 */
NGA_EAST_USGS_SEEDS(
- NgaEastUsgs_2017.UsgsSeeds.class,
- NgaEastUsgs_2017.UsgsSeeds.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.UsgsSeeds.class,
+ NgaEast_2018.UsgsSeeds.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** NGA-East for USGS Seed Models with Guo & Chapman Gulf CPA **/
NGA_EAST_USGS_SEEDS_CPA(
- NgaEastUsgs_2017.UsgsSeedsCpa.class,
- NgaEastUsgs_2017.UsgsSeedsCpa.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.UsgsSeedsCpa.class,
+ NgaEast_2018.UsgsSeedsCpa.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/* NGA-East Seed Models */
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_1CCSP(
- NgaEastUsgs_2017.Seed_1CCSP.class,
- NgaEastUsgs_2017.Seed_1CCSP.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_1CCSP.class,
+ NgaEast_2018.Seed_1CCSP.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_1CVSP(
- NgaEastUsgs_2017.Seed_1CVSP.class,
- NgaEastUsgs_2017.Seed_1CVSP.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_1CVSP.class,
+ NgaEast_2018.Seed_1CVSP.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_2CCSP(
- NgaEastUsgs_2017.Seed_2CCSP.class,
- NgaEastUsgs_2017.Seed_2CCSP.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_2CCSP.class,
+ NgaEast_2018.Seed_2CCSP.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_2CVSP(
- NgaEastUsgs_2017.Seed_2CVSP.class,
- NgaEastUsgs_2017.Seed_2CVSP.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_2CVSP.class,
+ NgaEast_2018.Seed_2CVSP.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B_A04(
- NgaEastUsgs_2017.Seed_B_a04.class,
- NgaEastUsgs_2017.Seed_B_a04.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_B_a04.class,
+ NgaEast_2018.Seed_B_a04.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B_AB14(
- NgaEastUsgs_2017.Seed_B_ab14.class,
- NgaEastUsgs_2017.Seed_B_ab14.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_B_ab14.class,
+ NgaEast_2018.Seed_B_ab14.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B_AB95(
- NgaEastUsgs_2017.Seed_B_ab95.class,
- NgaEastUsgs_2017.Seed_B_ab95.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_B_ab95.class,
+ NgaEast_2018.Seed_B_ab95.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B_BCA10D(
- NgaEastUsgs_2017.Seed_B_bca10d.class,
- NgaEastUsgs_2017.Seed_B_bca10d.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_B_bca10d.class,
+ NgaEast_2018.Seed_B_bca10d.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B_BS11(
- NgaEastUsgs_2017.Seed_B_bs11.class,
- NgaEastUsgs_2017.Seed_B_bs11.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_B_bs11.class,
+ NgaEast_2018.Seed_B_bs11.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_B_SGD02(
- NgaEastUsgs_2017.Seed_B_sgd02.class,
- NgaEastUsgs_2017.Seed_B_sgd02.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_B_sgd02.class,
+ NgaEast_2018.Seed_B_sgd02.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.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),
+ NgaEast_2018.Seed_B20_ab14mod1.class,
+ NgaEast_2018.Seed_B20_ab14mod1.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.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),
+ NgaEast_2018.Seed_B20_ab14mod2.class,
+ NgaEast_2018.Seed_B20_ab14mod2.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.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),
+ NgaEast_2018.Seed_B20_bca10d.class,
+ NgaEast_2018.Seed_B20_bca10d.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_FRANKEL(
- NgaEastUsgs_2017.Seed_Frankel.class,
- NgaEastUsgs_2017.Seed_Frankel.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_Frankel.class,
+ NgaEast_2018.Seed_Frankel.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_GRAIZER(
- NgaEastUsgs_2017.Seed_Graizer.class,
- NgaEastUsgs_2017.Seed_Graizer.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_Graizer.class,
+ NgaEast_2018.Seed_Graizer.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_GRAIZER16(
- NgaEastUsgs_2017.Seed_Graizer16.class,
- NgaEastUsgs_2017.Seed_Graizer16.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_Graizer16.class,
+ NgaEast_2018.Seed_Graizer16.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_GRAIZER17(
- NgaEastUsgs_2017.Seed_Graizer17.class,
- NgaEastUsgs_2017.Seed_Graizer17.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_Graizer17.class,
+ NgaEast_2018.Seed_Graizer17.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_HA15(
- NgaEastUsgs_2017.Seed_HA15.class,
- NgaEastUsgs_2017.Seed_HA15.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_HA15.class,
+ NgaEast_2018.Seed_HA15.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_PEER_EX(
- NgaEastUsgs_2017.Seed_PEER_EX.class,
- NgaEastUsgs_2017.Seed_PEER_EX.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_PEER_EX.class,
+ NgaEast_2018.Seed_PEER_EX.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_PEER_GP(
- NgaEastUsgs_2017.Seed_PEER_GP.class,
- NgaEastUsgs_2017.Seed_PEER_GP.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_PEER_GP.class,
+ NgaEast_2018.Seed_PEER_GP.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_PZCT15_M1SS(
- NgaEastUsgs_2017.Seed_PZCT15_M1SS.class,
- NgaEastUsgs_2017.Seed_PZCT15_M1SS.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_PZCT15_M1SS.class,
+ NgaEast_2018.Seed_PZCT15_M1SS.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_PZCT15_M2ES(
- NgaEastUsgs_2017.Seed_PZCT15_M2ES.class,
- NgaEastUsgs_2017.Seed_PZCT15_M2ES.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_PZCT15_M2ES.class,
+ NgaEast_2018.Seed_PZCT15_M2ES.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see PezeshkEtAl_2018 */
NGA_EAST_SEED_PZCT18_M1SS(
@@ -1054,10 +1054,10 @@ public enum Gmm {
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_SP15(
- NgaEastUsgs_2017.Seed_SP15.class,
- NgaEastUsgs_2017.Seed_SP15.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_SP15.class,
+ NgaEast_2018.Seed_SP15.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/** @see NgaEastUsgs_2017 @see ShahjoueiPezeshk_2016 */
NGA_EAST_SEED_SP16(
@@ -1068,10 +1068,10 @@ public enum Gmm {
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_YA15(
- NgaEastUsgs_2017.Seed_YA15.class,
- NgaEastUsgs_2017.Seed_YA15.NAME,
- NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
- NgaEastUsgs_2017.CONSTRAINTS),
+ NgaEast_2018.Seed_YA15.class,
+ NgaEast_2018.Seed_YA15.NAME,
+ NgaEast_2018.COEFFS_SIGMA_PANEL,
+ NgaEast_2018.CONSTRAINTS),
/* Combined: must be declared after any dependent models above. */
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast_2018.java
similarity index 98%
rename from src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
rename to src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast_2018.java
index e25ad0cd7daaf40da15f6cd6a349bf069a07a1f1..847c04b9998d7ed3bbfd4e9c07528bc3b61f99c8 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast_2018.java
@@ -127,7 +127,7 @@ import gov.usgs.earthquake.nshmp.tree.LogicTree;
* @see Gmm#NGA_EAST_SEED_YA15
*/
@Beta
-public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
+public abstract class NgaEast_2018 implements GroundMotionModel {
/*
* Developer notes:
@@ -259,7 +259,7 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
private final CoefficientsSigmaEpri σCoeffsEpri;
final Imt imt;
- NgaEastUsgs_2017(Imt imt) {
+ NgaEast_2018(Imt imt) {
σCoeffsPanel = new CoefficientsSigmaPanel(imt, COEFFS_SIGMA_PANEL);
σCoeffsEpri = new CoefficientsSigmaEpri(imt, COEFFS_SIGMA_EPRI);
this.imt = imt;
@@ -363,7 +363,7 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
* Base model used for sammons and seed model groups that share common site
* class and sigma models.
*/
- static class Usgs17 extends NgaEastUsgs_2017 {
+ static class Usgs17 extends NgaEast_2018 {
static final int MODEL_COUNT = 17;
static final String[] MEAN_IDS = IntStream.range(1, MODEL_COUNT + 1)
@@ -408,7 +408,7 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
static class Usgs17Cpa extends Usgs17 {
// static final String NAME = "NGA-East (2023)";
- static final String NAME = NgaEastUsgs_2017.NAME + " (Gulf Coast)";
+ static final String NAME = NgaEast_2018.NAME + " (Gulf Coast)";
Usgs17Cpa(Imt imt) {
super(imt);
@@ -446,7 +446,7 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
* individual seed models which results in repeated position lookups. Both
* sigma models considered include coefficients for PGV.
*/
- static class UsgsSeeds extends NgaEastUsgs_2017 {
+ static class UsgsSeeds extends NgaEast_2018 {
static final String NAME = "NGA-East Seed Tree (2018)";
static final String SEED_PREFIX = "NGA_EAST_SEED_";
static final String SP16_ID = "SP16";
@@ -575,8 +575,8 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
}
}
- static abstract class Seed extends NgaEastUsgs_2017 {
- static final String NAME = NgaEastUsgs_2017.NAME + " : Seed : ";
+ static abstract class Seed extends NgaEast_2018 {
+ static final String NAME = NgaEast_2018.NAME + " : Seed : ";
final String id;
final GroundMotionTable table;
@@ -840,7 +840,7 @@ public abstract class NgaEastUsgs_2017 implements GroundMotionModel {
*/
static final class SiteAmp {
- static final String NAME = NgaEastUsgs_2017.NAME + " : Site Amplification";
+ static final String NAME = NgaEast_2018.NAME + " : Site Amplification";
private static final CoefficientContainer COEFFS = new CoefficientContainer(
"nga-east-usgs-siteamp.csv");
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018.java
index cd9776b2f1e165572ee9b999f7eccd9145265bd1..a6b0d17129e01961778b5dcdcb89569910e1af78 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018.java
@@ -19,7 +19,7 @@ import com.google.common.annotations.Beta;
import com.google.common.collect.Range;
import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
-import gov.usgs.earthquake.nshmp.gmm.NgaEastUsgs_2017.SiteAmp;
+import gov.usgs.earthquake.nshmp.gmm.NgaEast_2018.SiteAmp;
import gov.usgs.earthquake.nshmp.tree.LogicTree;
/**
@@ -157,7 +157,7 @@ public abstract class PezeshkEtAl_2018 implements GroundMotionModel {
CoefficientContainer cc = (model == Model.M1SS) ? COEFFS_M1SS : COEFFS_M2ES;
coeffs = new Coefficients(imt, cc, COEFFS_SIGMAS, model);
coeffsPga = new Coefficients(Imt.PGA, cc, COEFFS_SIGMAS, model);
- this.siteAmp = new NgaEastUsgs_2017.SiteAmp(imt);
+ this.siteAmp = new NgaEast_2018.SiteAmp(imt);
}
@Override
@@ -209,7 +209,7 @@ public abstract class PezeshkEtAl_2018 implements GroundMotionModel {
static final class Seed_PZCT18_M1SS extends PezeshkEtAl_2018 {
static final String MODEL = Model.M1SS;
- static final String NAME = NgaEastUsgs_2017.Seed.NAME + " : " + MODEL + "*";
+ static final String NAME = NgaEast_2018.Seed.NAME + " : " + MODEL + "*";
Seed_PZCT18_M1SS(Imt imt) {
super(imt, MODEL);
@@ -218,7 +218,7 @@ public abstract class PezeshkEtAl_2018 implements GroundMotionModel {
static final class Seed_PZCT18_M2ES extends PezeshkEtAl_2018 {
static final String MODEL = Model.M2ES;
- static final String NAME = NgaEastUsgs_2017.Seed.NAME + " : " + MODEL + "*";
+ static final String NAME = NgaEast_2018.Seed.NAME + " : " + MODEL + "*";
Seed_PZCT18_M2ES(Imt imt) {
super(imt, MODEL);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ShahjoueiPezeshk_2016.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ShahjoueiPezeshk_2016.java
index 877204212aae14ae97f1a488bb75e2d9680d08ad..1232ce60a7dcd336bb87ebaab6e65068108f730e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ShahjoueiPezeshk_2016.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ShahjoueiPezeshk_2016.java
@@ -15,7 +15,7 @@ import java.util.Map;
import com.google.common.collect.Range;
import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
-import gov.usgs.earthquake.nshmp.gmm.NgaEastUsgs_2017.SiteAmp;
+import gov.usgs.earthquake.nshmp.gmm.NgaEast_2018.SiteAmp;
import gov.usgs.earthquake.nshmp.tree.LogicTree;
/**
@@ -53,7 +53,7 @@ public final class ShahjoueiPezeshk_2016 implements GroundMotionModel {
* the sigma provided by this model is ignored in favor of the NGA-East sigma
* logic tree when used with the seed model logic tree.
*/
- static final String NAME = NgaEastUsgs_2017.Seed.NAME + "SP16áµ€*";
+ static final String NAME = NgaEast_2018.Seed.NAME + "SP16áµ€*";
static final Constraints CONSTRAINTS = Constraints.builder()
.set(MW, Range.closed(4.0, 8.0))
@@ -99,7 +99,7 @@ public final class ShahjoueiPezeshk_2016 implements GroundMotionModel {
ShahjoueiPezeshk_2016(Imt imt) {
this.coeffs = new Coefficients(imt, COEFFS);
this.coeffsPga = new Coefficients(Imt.PGA, COEFFS);
- this.siteAmp = new NgaEastUsgs_2017.SiteAmp(imt);
+ this.siteAmp = new NgaEast_2018.SiteAmp(imt);
}
@Override