From e8ffbb0b2fd45b07d097cc406fc30d59a8c853c4 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 26 Apr 2022 13:33:35 -0600
Subject: [PATCH] sp16 rRup --> rJB; cleanup
---
.../gov/usgs/earthquake/nshmp/gmm/NgaEast.java | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
index 7ea883f2..f4ad6247 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
@@ -524,8 +524,8 @@ public abstract class NgaEast implements GroundMotionModel {
for (int i = 0; i < GMMS.size(); i++) {
Gmm seed = GMMS.get(i);
if (seed == Gmm.NGA_EAST_SEED_SP16) {
- double μ = sp16.calcMeanRock(in.Mw, in.rRup);
- double μPga = exp(sp16pga.calcMeanRock(in.Mw, in.rRup));
+ double μ = sp16.calcMeanRock(in.Mw, in.rJB);
+ double μPga = exp(sp16pga.calcMeanRock(in.Mw, in.rJB));
SiteAmp.Value fSite = siteAmp.calc(μPga, in.vs30);
μs[i] = fSite.apply(μ);
} else if (imt == Imt.PGV && noPgvSeeds.contains(seed)) {
@@ -547,20 +547,6 @@ public abstract class NgaEast implements GroundMotionModel {
}
}
- public static void main(String[] args) {
- // TODO clean
- // Gmm gmm = Gmm.NGA_EAST_SEED_SP16;
- Gmm gmm = Gmm.NGA_EAST_SEEDS_2018;
- // Gmm gmm = Gmm.NGA_EAST_SEED_SP16;
- GmmInput in = GmmInput.builder().withDefaults().build();
- LogicTree<GroundMotion> gms = gmm.instance(Imt.PGA).calc(in);
- System.out.println(gms);
- gms.forEach(gm -> System.out.println(gm.id() + ": " + gm.value()));
- GroundMotion gm = GroundMotions.combine(gms);
- System.out.println(gm);
-
- }
-
/*
* Updated NGA-East for use in the 2023 nshm-conus update. This model includes
* (1) the final published nonlinear site amplification model of Hshash et al.
--
GitLab