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

updated sigma test results

parent cb70a28b
No related branches found
No related tags found
1 merge request!436Prvi gmm 251
...@@ -124,7 +124,6 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { ...@@ -124,7 +124,6 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
vlinSub = coeffsAg20.get("vlin"); vlinSub = coeffsAg20.get("vlin");
ρB = coeffsAg20.get("rhoB"); ρB = coeffsAg20.get("rhoB");
ρW = coeffsAg20.get("rhoB"); ρW = coeffsAg20.get("rhoB");
} }
} }
...@@ -268,9 +267,8 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { ...@@ -268,9 +267,8 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
double φSS = calcPhiSS(in.Mw, c); double φSS = calcPhiSS(in.Mw, c);
double φSqNga = φSS * φSS + c.φs2sNga * c.φs2sNga; double φSqNga = φSS * φSS + c.φs2sNga * c.φs2sNga;
double φSqPrvi = φSS * φSS + c.φs2sPrvi * c.φs2sPrvi; double φSqPrvi = φSS * φSS + c.φs2sPrvi * c.φs2sPrvi;
double φNlNgaSq = calcPhiNonLinSq(φSqNga, dAmp_p1);
double φNlNgaSq = calcPhiSSNonLinSq(φSqNga, dAmp_p1); double φNlPrviSq = calcPhiNonLinSq(φSqPrvi, dAmp_p1);
double φNlPrviSq = calcPhiSSNonLinSq(φSqPrvi, dAmp_p1);
double σNga = sqrt(τnl * τnl + φNlNgaSq); double σNga = sqrt(τnl * τnl + φNlNgaSq);
double σPrvi = sqrt(τnl * τnl + φNlPrviSq); double σPrvi = sqrt(τnl * τnl + φNlPrviSq);
...@@ -309,7 +307,7 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { ...@@ -309,7 +307,7 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
return Mw <= 5.0 ? c.a : Mw > 6.5 ? c.b : c.a + (Mw - 5.0) * ((c.b - c.a) / 1.5); return Mw <= 5.0 ? c.a : Mw > 6.5 ? c.b : c.a + (Mw - 5.0) * ((c.b - c.a) / 1.5);
} }
static double calcPhiSSNonLinSq(double φ, double dAmp_p1) { static double calcPhiNonLinSq(double φ, double dAmp_p1) {
double phiBsq = φ * φ - AbrahamsonEtAl_2014.PHI_AMP_SQ; double phiBsq = φ * φ - AbrahamsonEtAl_2014.PHI_AMP_SQ;
return phiBsq * dAmp_p1 * dAmp_p1 + AbrahamsonEtAl_2014.PHI_AMP_SQ; return phiBsq * dAmp_p1 * dAmp_p1 + AbrahamsonEtAl_2014.PHI_AMP_SQ;
} }
...@@ -739,6 +737,8 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel { ...@@ -739,6 +737,8 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
GroundMotionModel σPgaGmm, GroundMotionModel σPgaGmm,
GmmInput in) { GmmInput in) {
System.out.println(σPgaGmm.getClass());
double pgaRock = calcSubPgaRock(in, σPgaGmm); double pgaRock = calcSubPgaRock(in, σPgaGmm);
double dSite = AbrahamsonGulerce_2020.calc_dSite(c.bnlSub, c.vlinSub, in.vs30, pgaRock); double dSite = AbrahamsonGulerce_2020.calc_dSite(c.bnlSub, c.vlinSub, in.vs30, pgaRock);
double τNlSq = calcNonLinTermSq(c.τSub, c.τSubPga, dSite, c.ρB); double τNlSq = calcNonLinTermSq(c.τSub, c.τSubPga, dSite, c.ρB);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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