Merge branch 'main' into 1.0.0-rc

src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java

@@ -1040,15 +1040,15 @@ public enum Gmm {
 
   /** @see PezeshkEtAl_2018 */
   NGA_EAST_SEED_PZCT18_1SS(
-      PezeshkEtAl_2018.PZCT18_1SS.class,
-      PezeshkEtAl_2018.PZCT18_1SS.NAME,
+      PezeshkEtAl_2018.Seed_PZCT18_1SS.class,
+      PezeshkEtAl_2018.Seed_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.Seed_PZCT18_2ES.class,
+      PezeshkEtAl_2018.Seed_PZCT18_2ES.NAME,
       PezeshkEtAl_2018.COEFFS_2ES,
       PezeshkEtAl_2018.CONSTRAINTS),
 

src/main/java/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2018.java

@@ -54,8 +54,8 @@ import gov.usgs.earthquake.nshmp.tree.LogicTree;
  * <p><b>Component:</b> **** RotD50 ?
  *
  * @author U.S. Geological Survey
- * @see Gmm#PZCT18_1SS
- * @see Gmm#PZCT18_2ES
+ * @see Gmm#NGA_EAST_SEED_PZCT18_1SS
+ * @see Gmm#NGA_EAST_SEED_PZCT18_2ES
  */
 @Beta
 public abstract class PezeshkEtAl_2018 implements GroundMotionModel {
@@ -69,8 +69,8 @@ public abstract class PezeshkEtAl_2018 implements GroundMotionModel {
       .build();
 
   static final class Model {
-    static final String PZCT18_1SS = "PZCT18-1SS";
-    static final String PZCT18_2ES = "PZCT18-2ES";
+    static final String PZCT18_1SS = "PZCT18_1SS";
+    static final String PZCT18_2ES = "PZCT18_2ES";
   }
 
   /*
@@ -192,20 +192,20 @@ public abstract class PezeshkEtAl_2018 implements GroundMotionModel {
     return sqrt(τ * τ + φ * φ);
   }
 
-  static final class PZCT18_1SS extends PezeshkEtAl_2018 {
+  static final class Seed_PZCT18_1SS extends PezeshkEtAl_2018 {
     static final String MODEL = Model.PZCT18_1SS;
     static final String NAME = PezeshkEtAl_2018.NAME + " : " + MODEL;
 
-    PZCT18_1SS(Imt imt) {
+    Seed_PZCT18_1SS(Imt imt) {
       super(imt, MODEL);
     }
   }
 
-  static final class PZCT18_2ES extends PezeshkEtAl_2018 {
+  static final class Seed_PZCT18_2ES extends PezeshkEtAl_2018 {
     static final String MODEL = Model.PZCT18_2ES;
     static final String NAME = PezeshkEtAl_2018.NAME + " : " + MODEL;
 
-    PZCT18_2ES(Imt imt) {
+    Seed_PZCT18_2ES(Imt imt) {
       super(imt, MODEL);
     }
   }