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 a7d029c6563983f7cb58fbaca8601e6c6d300805..817eb0edc6b1de54140cd3f32b26ae99e7b04f8b 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 27aecac80e599f4326bc67e274f6ae298c0ac375..b0b69821f10e65d513d4de866388ec6d645c2698 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 4bc773ef16c31e483704cb2765bc12d8e4f34dd3..ca825ed1c9f0e1fb31506561320312aa519ac3d2 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()); } }