From 84561f73cfb69d17aca2a06306128033e6b77861 Mon Sep 17 00:00:00 2001 From: Peter Powers <pmpowers@usgs.gov> Date: Mon, 4 Nov 2024 11:11:05 -0700 Subject: [PATCH] field edits wus --> nga --- .../nshmp/gmm/UsgsPrviBackbone2025.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java index 8cb0141e..5adb0489 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java @@ -82,7 +82,7 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { final double τ1, τ2, τ3, τ4; final double a, b; - final double φs2sPrvi, φs2sWus; + final double φs2sPrvi, φs2sNga; final double τSub, φSub, φSubSS, φSubS2S; Coefficients( @@ -104,7 +104,7 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { Map<String, Double> coeffsPhiS2S = ccPhiS2S.get(imt); φs2sPrvi = coeffsPhiS2S.get("phiS2S_PRVI"); - φs2sWus = coeffsPhiS2S.get("phiS2S_WUS"); + φs2sNga = coeffsPhiS2S.get("phiS2S_WUS"); Map<String, Double> coeffsSubSigma = ccSubSigma.get(imt); τSub = coeffsSubSigma.get("tau_mean"); @@ -244,9 +244,9 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { Coefficients c = super.coeffs; double τ = calcTau(in.Mw, c); double φSS = calcPhiSS(in.Mw, c); - double σWus = sqrt(τ * τ + c.φs2sWus * c.φs2sWus + φSS * φSS); + double σNga = sqrt(τ * τ + c.φs2sNga * c.φs2sNga + φSS * φSS); double σPrvi = sqrt(τ * τ + c.φs2sPrvi * c.φs2sPrvi + φSS * φSS); - return new double[] { σWus, σPrvi }; + return new double[] { σNga, σPrvi }; } // active crust tau @@ -400,9 +400,9 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { @Override double[] calcSigmas(GmmInput in) { Coefficients c = super.coeffs; - double σ = sqrt(c.τSub * c.τSub + c.φSub * c.φSub); + double σNga = sqrt(c.τSub * c.τSub + c.φSub * c.φSub); double σPrvi = sqrt(c.τSub * c.τSub + c.φSubS2S * c.φSubS2S + c.φSubSS * c.φSubSS); - return new double[] { σ, σPrvi }; + return new double[] { σNga, σPrvi }; } } @@ -535,9 +535,9 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { @Override double[] calcSigmas(GmmInput in) { Coefficients c = super.coeffs; - double σ = sqrt(c.τSub * c.τSub + c.φSub * c.φSub); + double σNga = sqrt(c.τSub * c.τSub + c.φSub * c.φSub); double σPrvi = sqrt(c.τSub * c.τSub + c.φSubS2S * c.φSubS2S + c.φSubSS * c.φSubSS); - return new double[] { σ, σPrvi }; + return new double[] { σNga, σPrvi }; } } -- GitLab