From 2bc299148f7783a6c5b00c43c9f9d099f53006a1 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 4 Apr 2022 11:16:42 -0600
Subject: [PATCH] ngae seed renames
---
.../gov/usgs/earthquake/nshmp/gmm/Gmm.java | 30 ++++++++++---------
.../nshmp/gmm/PezeshkEtAl_2018Tests.java | 8 ++---
2 files changed, 20 insertions(+), 18 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 9ed68e43..b82de79c 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -1038,6 +1038,20 @@ public enum Gmm {
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
+ /** @see PezeshkEtAl_2018 */
+ NGA_EAST_SEED_PZCT18_1SS(
+ PezeshkEtAl_2018.PZCT18_1SS.class,
+ PezeshkEtAl_2018.PZCT18_1SS.NAME,
+ PezeshkEtAl_2018.COEFFS_1SS,
+ PezeshkEtAl_2018.CONSTRAINTS),
+
+ /** @see PezeshkEtAl_2018 */
+ NGA_EAST_SEED_PZCT18_2ES(
+ PezeshkEtAl_2018.PZCT18_2ES.class,
+ PezeshkEtAl_2018.PZCT18_2ES.NAME,
+ PezeshkEtAl_2018.COEFFS_2ES,
+ PezeshkEtAl_2018.CONSTRAINTS),
+
/** @see NgaEastUsgs_2017 */
NGA_EAST_SEED_SP15(
NgaEastUsgs_2017.Seed_SP15.class,
@@ -1059,20 +1073,6 @@ public enum Gmm {
NgaEastUsgs_2017.COEFFS_SIGMA_PANEL,
NgaEastUsgs_2017.CONSTRAINTS),
- /** @see PezeshkEtAl_2018 */
- PZCT18_1SS(
- PezeshkEtAl_2018.PZCT18_1SS.class,
- PezeshkEtAl_2018.PZCT18_1SS.NAME,
- PezeshkEtAl_2018.COEFFS_1SS,
- PezeshkEtAl_2018.CONSTRAINTS),
-
- /** @see PezeshkEtAl_2018 */
- PZCT18_2ES(
- PezeshkEtAl_2018.PZCT18_2ES.class,
- PezeshkEtAl_2018.PZCT18_2ES.NAME,
- PezeshkEtAl_2018.COEFFS_2ES,
- PezeshkEtAl_2018.CONSTRAINTS),
-
/* Combined: must be declared after any dependent models above. */
/**
@@ -1542,6 +1542,8 @@ public enum Gmm {
NGA_EAST_SEED_PEER_GP,
NGA_EAST_SEED_PZCT15_M1SS,
NGA_EAST_SEED_PZCT15_M2ES,
+ NGA_EAST_SEED_PZCT18_1SS,
+ NGA_EAST_SEED_PZCT18_2ES,
NGA_EAST_SEED_SP15,
NGA_EAST_SEED_SP16,
NGA_EAST_SEED_YA15));
diff --git a/src/test/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018Tests.java b/src/test/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018Tests.java
index 8476d32f..54d2da31 100644
--- a/src/test/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018Tests.java
+++ b/src/test/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018Tests.java
@@ -1,7 +1,7 @@
package gov.usgs.earthquake.nshmp.gmm;
-import static gov.usgs.earthquake.nshmp.gmm.Gmm.PZCT18_1SS;
-import static gov.usgs.earthquake.nshmp.gmm.Gmm.PZCT18_2ES;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.NGA_EAST_SEED_PZCT18_1SS;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.NGA_EAST_SEED_PZCT18_2ES;
import java.io.IOException;
import java.util.EnumSet;
@@ -32,8 +32,8 @@ public class PezeshkEtAl_2018Tests implements ArgumentsProvider {
/* Result generation sets */
private static Set<Gmm> gmms = EnumSet.of(
- PZCT18_1SS,
- PZCT18_2ES);
+ NGA_EAST_SEED_PZCT18_1SS,
+ NGA_EAST_SEED_PZCT18_2ES);
private static Set<Imt> imts = PezeshkEtAl_2018.COEFFS_1SS.imts();
--
GitLab