From 09726182a172c18da187e470648f5051a397eb1d Mon Sep 17 00:00:00 2001
From: Jason Altekruse <jaltekruse@usgs.gov>
Date: Fri, 1 Mar 2024 15:05:47 -0700
Subject: [PATCH] clean up gomez 2022

---
 .../usgs/earthquake/nshmp/gmm/Gomez_2022.java    | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java
index 08a6992f..87d23e2b 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java
@@ -23,6 +23,9 @@ import gov.usgs.earthquake.nshmp.tree.LogicTree;
  *
  * <p><b>Implementation note:</b>
  *
+ * <li>Site term uses site class definitions from Japan (after Zhao et al.,
+ * 2006) and defines two binary variables based on these Vs30 bins.</li>
+ *
  * <p><b>Reference:</b> Gómez, D.F.C., 2022, Ground motion prediction equations
  * for Puerto Rico, Dissertation, Univ. Puerto Rico, Mayagüez campus, 317p.
  *
@@ -40,9 +43,9 @@ public abstract class Gomez_2022 implements GroundMotionModel {
 
   /* TODO: set constraints */
   static final Constraints CONSTRAINTS = Constraints.builder()
-      .set(MW, Range.closed(4.0, 8.0))
+      .set(MW, Range.closed(4.0, 9.5))
       .set(RRUP, Range.closed(0.0, 1000.0))
-      .set(VS30, Range.closed(150.0, 2000.0))
+      .set(VS30, Range.closed(150.0, 1000.0))
       .build();
 
   static final CoefficientContainer COEFFS = new CoefficientContainer("Gomez2022.csv");
@@ -112,7 +115,7 @@ public abstract class Gomez_2022 implements GroundMotionModel {
      * D = sqrt(d*d + h*h), where d is hypocentral distance and h is saturation
      * term
      *
-     * USING RRUP for RHYP for now
+     * USING RRUP for RHYP
      */
     double D = sqrt(rRup * rRup + c.h * c.h);
 
@@ -138,12 +141,9 @@ public abstract class Gomez_2022 implements GroundMotionModel {
       /* SC II (C) */
       S = 0.0;
       H = 1.0;
-    } else if (vs30 > 200.0 && vs30 <= 300.0) {
-      /* SC III (D) */
-      S = 1.0;
-      H = 0.0;
     } else {
-      /* SC IV (E) */
+      /* SC III (D): 200 < vs30 <= 300 */
+      /* SC IV (E): vs30 <= 200 */
       S = 1.0;
       H = 0.0;
     }
-- 
GitLab