From 2aefdfc9d75deb7c446fe8919730fe980213b593 Mon Sep 17 00:00:00 2001
From: Jason Altekruse <jaltekruse@usgs.gov>
Date: Wed, 13 Mar 2024 08:30:43 -0600
Subject: [PATCH] separate crustal and non-crustal constraints
---
src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java | 4 ++--
.../java/gov/usgs/earthquake/nshmp/gmm/Gomez_2022.java | 9 +++++++--
2 files changed, 9 insertions(+), 4 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 a33b6b94..e7e2c46e 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -69,13 +69,13 @@ public enum Gmm {
Gomez_2022.Crustal.class,
Gomez_2022.Crustal.NAME,
Gomez_2022.Crustal.COEFFS,
- Gomez_2022.Crustal.CONSTRAINTS),
+ Gomez_2022.Crustal.CONSTRAINTS_CRUSTAL),
GOMEZ_22_NONCRUSTAL(
Gomez_2022.NonCrustal.class,
Gomez_2022.NonCrustal.NAME,
Gomez_2022.NonCrustal.COEFFS,
- Gomez_2022.NonCrustal.CONSTRAINTS),
+ Gomez_2022.NonCrustal.CONSTRAINTS_CRUSTAL),
/*
* Active continent NGA-West1 WUS 2008.
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 87d23e2b..5c9b17be 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
@@ -31,7 +31,7 @@ import gov.usgs.earthquake.nshmp.tree.LogicTree;
*
* <p><b>doi:</b></a>
*
- * <p><b>Component:</b> not specified (avg horizontal implied)
+ * <p><b>Component:</b> not specified (avg. horizontal implied)
*
* @author U.S. Geological Survey
* @see Gmm#GOMEZ22_CRUSTAL
@@ -42,11 +42,16 @@ public abstract class Gomez_2022 implements GroundMotionModel {
static final String NAME = "Gomez (2022) BETA";
/* TODO: set constraints */
- static final Constraints CONSTRAINTS = Constraints.builder()
+ static final Constraints CONSTRAINTS_CRUSTAL = Constraints.builder()
.set(MW, Range.closed(4.0, 9.5))
.set(RRUP, Range.closed(0.0, 1000.0))
.set(VS30, Range.closed(150.0, 1000.0))
.build();
+ static final Constraints CONSTRAINTS_NONCRUSTAL = Constraints.builder()
+ .set(MW, Range.closed(3.8, 9.5)) // M 3.8 - 5.0
+ .set(RRUP, Range.closed(0.0, 1000.0)) // 100 - 400 km
+ .set(VS30, Range.closed(150.0, 1000.0))
+ .build();
static final CoefficientContainer COEFFS = new CoefficientContainer("Gomez2022.csv");
--
GitLab