From eb695f07b11e738f2e63cd8597db28f4f9f974e7 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Thu, 12 May 2022 15:29:31 -0600
Subject: [PATCH] propagate zSed to HazardInput
---
.../gov/usgs/earthquake/nshmp/calc/HazardInput.java | 13 +++++++------
.../gov/usgs/earthquake/nshmp/calc/Transforms.java | 3 ++-
.../earthquake/nshmp/model/SystemRuptureSet.java | 3 ++-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardInput.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardInput.java
index a7d029c6..817eb0ed 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardInput.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/HazardInput.java
@@ -19,22 +19,23 @@ public final class HazardInput extends GmmInput {
double rate,
double Mw, double rJB, double rRup, double rX,
double dip, double width, double zTor, double zHyp, double rake,
- double vs30, boolean vsInf, double z1p0, double z2p5) {
+ double vs30, boolean vsInf, double z1p0, double z2p5, double zSed) {
super(GmmInput.builder()
- .dip(dip)
.mag(Mw)
- .rake(rake)
.rJB(rJB)
.rRup(rRup)
.rX(rX)
+ .dip(dip)
+ .width(width)
+ .zTor(zTor)
+ .zHyp(zHyp)
+ .rake(rake)
.vs30(vs30)
.vsInf(vsInf)
- .width(width)
.z1p0(z1p0)
.z2p5(z2p5)
- .zHyp(zHyp)
- .zTor(zTor));
+ .zSed(zSed));
this.rate = rate;
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/calc/Transforms.java b/src/main/java/gov/usgs/earthquake/nshmp/calc/Transforms.java
index 27aecac8..b0b69821 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/calc/Transforms.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/calc/Transforms.java
@@ -102,7 +102,8 @@ final class Transforms {
site.vs30(),
site.vsInferred(),
site.z1p0(),
- site.z2p5());
+ site.z2p5(),
+ site.zSed());
hazardInputs.add(input);
// System.out.println(input);
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/model/SystemRuptureSet.java b/src/main/java/gov/usgs/earthquake/nshmp/model/SystemRuptureSet.java
index 4bc773ef..ca825ed1 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/model/SystemRuptureSet.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/model/SystemRuptureSet.java
@@ -758,7 +758,8 @@ public class SystemRuptureSet extends AbstractRuptureSet<SystemRuptureSet.System
site.vs30(),
site.vsInferred(),
site.z1p0(),
- site.z2p5());
+ site.z2p5(),
+ site.zSed());
}
}
--
GitLab