From 9f21434077f71531c9e1c508bfc11b37a6367c47 Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Wed, 15 Jun 2022 15:09:32 -0600 Subject: [PATCH] kuehn cleaning --- .../earthquake/nshmp/gmm/KuehnEtAl_2020.java | 25 +------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java index 90fd24b2..03d06ae9 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java @@ -245,6 +245,7 @@ public abstract class KuehnEtAl_2020 implements GroundMotionModel { abstract boolean basin(); + /* Only true for interface */ abstract boolean seattle(); @Override @@ -376,8 +377,6 @@ public abstract class KuehnEtAl_2020 implements GroundMotionModel { double z2p5, boolean seattle) { - // TODO add Seattle flag - if (Double.isNaN(z2p5)) { return 0.0; } @@ -394,28 +393,6 @@ public abstract class KuehnEtAl_2020 implements GroundMotionModel { } return fb; - - // switch (region) { - // case Region.CASCADIA: - // // Eq. 4.14 - // switch (basin) { - // case Basin.SEATTLE: - // return c.θ11S; // Seattle-specific - // case Basin.OTHER: - // // TODO: - // // The paper returns this: - // // System.out.printf(" OTHER basin: taking minimum of %.9f and - // // %.9f\n",c.θ11 + c.θ12 * δlnZ, c.θ11S); - // // return min(c.θ11 + c.θ12 * δlnZ, c.θ11S); - // // The official python code just returns this: - // return c.θ11 + c.θ12 * δlnZ; - // default: - // return 0.0; - // } - // default: - // // Eq. 4.10 - // return c.θ11 + c.θ12 * δlnZ; - // } } /* Eq. 4.11 - basin reference depth for vs30; Cascadia model */ -- GitLab