Skip to content
Snippets Groups Projects
Commit 84561f73 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

field edits wus --> nga

parent 9dbdcf3b
No related branches found
No related tags found
1 merge request!432General edits and improvements
......@@ -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 };
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment