diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java index 246281018ef7f25d2fb2259c53373bc1a1fe2fe9..92b98a537e3640d3e168de422b2e8ff9eb43f9bb 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java @@ -44,6 +44,7 @@ import gov.usgs.earthquake.nshmp.tree.LogicTree; * @author U.S. Geological Survey * @see Gmm#BSSA_14 * @see Gmm#BSSA_14_BASIN + * @see Gmm#BSSA_14_CYBERSHAKE */ public class BooreEtAl_2014 implements GroundMotionModel { @@ -75,7 +76,7 @@ public class BooreEtAl_2014 implements GroundMotionModel { final Imt imt; final double e0, e1, e2, e3, e4, e5, e6, Mh, c1, c2, c3, h, c, Vc, f4, f5, - f6, f7, r1, r2, Δφ_r, Δφ_v, φ1, φ2, τ1, τ2; + f6, f7, f6c, f7c, r1, r2, Δφ_r, Δφ_v, φ1, φ2, τ1, τ2; // same for all periods; replaced with constant // double Mref, Rref, Dc3CaTw, Vref, f1, f3, v1, v2; @@ -104,6 +105,8 @@ public class BooreEtAl_2014 implements GroundMotionModel { f5 = coeffs.get("f5"); f6 = coeffs.get("f6"); f7 = coeffs.get("f7"); + f6c = coeffs.get("f6c"); + f7c = coeffs.get("f7c"); r1 = coeffs.get("R1"); r2 = coeffs.get("R2"); Δφ_r = coeffs.get("dPhiR"); @@ -123,23 +126,27 @@ public class BooreEtAl_2014 implements GroundMotionModel { coeffsPGA = new Coefficients(PGA, COEFFS); } - boolean deepBasinEffect() { + boolean basin() { + return false; + } + + boolean cybershake() { return false; } @Override public LogicTree<GroundMotion> calc(GmmInput in) { - return calc(coeffs, coeffsPGA, in, deepBasinEffect()); + return calc(coeffs, coeffsPGA, in, basin(), cybershake()); } private static final LogicTree<GroundMotion> calc( Coefficients c, Coefficients cPGA, - GmmInput in, boolean deepBasinEffect) { + GmmInput in, boolean deepBasinEffect, boolean cybershake) { FaultStyle style = GmmUtils.rakeToFaultStyle_NSHMP(in.rake); double pgaRock = calcPGArock(cPGA, in.Mw, in.rJB, style); - double μ = calcMean(c, style, pgaRock, in, deepBasinEffect); + double μ = calcMean(c, style, pgaRock, in, deepBasinEffect, cybershake); double σ = calcStdDev(c, in); return GroundMotions.createTree(μ, σ); @@ -147,7 +154,7 @@ public class BooreEtAl_2014 implements GroundMotionModel { // Mean ground motion model private static final double calcMean(Coefficients c, FaultStyle style, - double pgaRock, GmmInput in, boolean deepBasinEffect) { + double pgaRock, GmmInput in, boolean deepBasinEffect, boolean cybershake) { double Mw = in.Mw; double rJB = in.rJB; @@ -170,11 +177,17 @@ public class BooreEtAl_2014 implements GroundMotionModel { // Basin depth term -- Equations 9, 10 , 11 double DZ1 = calcDeltaZ1(c.imt, in.z1p0, vs30, deepBasinEffect); - double Fdz1 = (c.imt.isSA() && c.imt.period() >= 0.65) - ? (DZ1 <= c.f7 / c.f6) - ? c.f6 * DZ1 - : c.f7 - : 0.0; + + double Fdz1 = 0.0; + if (c.imt.isSA() && c.imt.period() >= 0.65) { + double f6 = c.f6; + double f7 = c.f7; + if (cybershake && c.imt.period() > 1.9) { + f6 = c.f6c; + f7 = c.f7c; + } + Fdz1 = (DZ1 <= f7 / f6) ? f6 * DZ1 : f7; + } if (deepBasinEffect) { Fdz1 *= GmmUtils.deltaZ1scale(c.imt, in.z1p0); } @@ -282,7 +295,7 @@ public class BooreEtAl_2014 implements GroundMotionModel { } } - static final class Basin extends Usgs { + static class Basin extends Usgs { static final String NAME = BooreEtAl_2014.NAME + " : Basin"; Basin(Imt imt) { @@ -290,8 +303,22 @@ public class BooreEtAl_2014 implements GroundMotionModel { } @Override - boolean deepBasinEffect() { + boolean basin() { return true; } } + + static final class Cybershake extends Basin { + static final String NAME = BooreEtAl_2014.NAME + " : Cybershake"; + + Cybershake(Imt imt) { + super(imt); + } + + @Override + boolean cybershake() { + return true; + } + } + } diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java index c25d80a1f648bcb25b409dec9d2fc7c15f3b02eb..576dc2802472e64d3c41f0e0f9b9636bd71c8c45 100644 --- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java +++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java @@ -151,6 +151,13 @@ public enum Gmm { BooreEtAl_2014.Basin.COEFFS, BooreEtAl_2014.Basin.CONSTRAINTS), + /** @see BooreEtAl_2014 */ + BSSA_14_CYBERSHAKE_ADJ( + BooreEtAl_2014.Cybershake.class, + BooreEtAl_2014.Cybershake.NAME, + BooreEtAl_2014.Cybershake.COEFFS, + BooreEtAl_2014.Cybershake.CONSTRAINTS), + /** @see CampbellBozorgnia_2014 */ CB_14( CampbellBozorgnia_2014.Usgs.class, @@ -1364,6 +1371,11 @@ public enum Gmm { CB_14_BASIN, CY_14_BASIN)), + WUS_23_ACTIVE_CRUST( + "2023 Development", + List.of( + BSSA_14_CYBERSHAKE_ADJ)), + WUS_14_INTERFACE( "2014 Subduction Interface (WUS)", List.of( diff --git a/src/main/resources/gmm/coeffs/BSSA14.csv b/src/main/resources/gmm/coeffs/BSSA14.csv index 178cbffb4f1dc5d55590cc06b372e4ef5133294a..fea2e1a00fd3294a3e69f25453778da773f16752 100644 --- a/src/main/resources/gmm/coeffs/BSSA14.csv +++ b/src/main/resources/gmm/coeffs/BSSA14.csv @@ -1,24 +1,24 @@ -T,e0,e1,e2,e3,e4,e5,e6,Mh,c1,c2,c3,Mref,Rref,h,Dc3CaTw,Dc3CnTr,Dc3ItJp,c,Vc,Vref,f1,f3,f4,f5,f6,f7,R1,R2,dPhiR,dPhiV,v1,v2,phi1,phi2,tau1,tau2 -0.01,0.4534,0.4916,0.2519,0.4599,1.421,0.04932,-0.1659,5.5,-1.134,0.1916,-0.008088,4.5,1,4.5,0,0.00282,-0.00244,-0.6037,1500.2,760,0,0.1,-0.1483,-0.00701,-9.9,-9.9,111.67,270,0.096,0.07,225,300,0.698,0.499,0.402,0.345 -0.02,0.48598,0.52359,0.29707,0.48875,1.4331,0.053388,-0.16561,5.5,-1.1394,0.18962,-0.008074,4.5,1,4.5,0,0.00278,-0.00234,-0.5739,1500.36,760,0,0.1,-0.1471,-0.00728,-9.9,-9.9,113.1,270,0.092,0.03,225,300,0.702,0.502,0.409,0.346 -0.03,0.56916,0.6092,0.40391,0.55783,1.4261,0.061444,-0.1669,5.5,-1.1421,0.18842,-0.008336,4.5,1,4.49,0,0.00276,-0.00217,-0.5341,1502.95,760,0,0.1,-0.1549,-0.00735,-9.9,-9.9,112.13,270,0.081,0.029,225,300,0.721,0.514,0.445,0.364 -0.05,0.75436,0.79905,0.60652,0.72726,1.3974,0.067357,-0.18082,5.5,-1.1159,0.18709,-0.009819,4.5,1,4.2,0,0.00296,-0.00199,-0.458,1501.42,760,0,0.1,-0.1963,-0.00647,-9.9,-9.9,97.93,270,0.063,0.03,225,300,0.753,0.532,0.503,0.426 -0.075,0.96447,1.0077,0.77678,0.9563,1.4174,0.073549,-0.19665,5.5,-1.0831,0.18225,-0.01058,4.5,1,4.04,0,0.00296,-0.00216,-0.4441,1494,760,0,0.1,-0.2287,-0.00573,-9.9,-9.9,85.99,270.04,0.064,0.022,225,300,0.745,0.542,0.474,0.466 -0.1,1.1268,1.1669,0.8871,1.1454,1.4293,0.055231,-0.19838,5.54,-1.0652,0.17203,-0.0102,4.5,1,4.13,0,0.00288,-0.00244,-0.4872,1479.12,760,0,0.1,-0.2492,-0.0056,-9.9,-9.9,79.59,270.09,0.087,0.014,225,300,0.728,0.541,0.415,0.458 -0.15,1.3095,1.3481,1.0648,1.3324,1.2844,-0.042065,-0.18234,5.74,-1.0532,0.15401,-0.008977,4.5,1,4.39,0,0.00279,-0.00271,-0.5796,1442.85,760,0,0.1,-0.2571,-0.00585,-9.9,-9.9,81.33,270.16,0.12,0.015,225,300,0.72,0.537,0.354,0.388 -0.2,1.3255,1.359,1.122,1.3414,1.1349,-0.11096,-0.15852,5.92,-1.0607,0.14489,-0.007717,4.5,1,4.61,0,0.00261,-0.00297,-0.6876,1392.61,760,0,0.1,-0.2466,-0.00614,-9.9,-9.9,90.91,270,0.136,0.045,225,300,0.711,0.539,0.344,0.309 -0.25,1.2766,1.3017,1.0828,1.3052,1.0166,-0.16213,-0.12784,6.05,-1.0773,0.13925,-0.006517,4.5,1,4.78,0,0.00244,-0.00314,-0.7718,1356.21,760,0,0.1,-0.2357,-0.00644,-9.9,-9.9,97.04,269.45,0.141,0.055,225,300,0.698,0.547,0.35,0.266 -0.3,1.2217,1.2401,1.0246,1.2653,0.95676,-0.1959,-0.092855,6.14,-1.0948,0.13388,-0.005475,4.5,1,4.93,0,0.0022,-0.0033,-0.8417,1308.47,760,0,0.1,-0.2191,-0.0067,-9.9,-9.9,103.15,268.59,0.138,0.05,225,300,0.675,0.561,0.363,0.229 -0.4,1.1046,1.1214,0.89765,1.1552,0.96766,-0.22608,-0.023189,6.2,-1.1243,0.12512,-0.004053,4.5,1,5.16,0,0.00211,-0.00321,-0.9109,1252.66,760,0,0.1,-0.1958,-0.00713,-9.9,-9.9,106.02,266.54,0.122,0.049,225,300,0.643,0.58,0.381,0.21 -0.5,0.96991,0.99106,0.7615,1.012,1.0384,-0.23522,0.029119,6.2,-1.1459,0.12015,-0.00322,4.5,1,5.34,0,0.00235,-0.00291,-0.9693,1203.91,760,0,0.1,-0.1704,-0.00744,-9.9,-9.9,105.54,265,0.109,0.06,225,300,0.615,0.599,0.41,0.224 -0.75,0.66903,0.69737,0.47523,0.69173,1.2871,-0.21591,0.10829,6.2,-1.1777,0.11054,-0.001931,4.5,1,5.6,0,0.00269,-0.00253,-1.0154,1147.59,760,0,0.1,-0.1387,-0.00812,0.092,0.059,108.39,266.51,0.1,0.07,225,300,0.581,0.622,0.457,0.266 -1,0.3932,0.4218,0.207,0.4124,1.5004,-0.18983,0.17895,6.2,-1.193,0.10248,-0.00121,4.5,1,5.74,0,0.00292,-0.00209,-1.05,1109.95,760,0,0.1,-0.1052,-0.00844,0.367,0.208,116.39,270,0.098,0.02,225,300,0.553,0.625,0.498,0.298 -1.5,-0.14954,-0.11866,-0.3138,-0.1437,1.7622,-0.1467,0.33896,6.2,-1.2063,0.09645,-0.000365,4.5,1,6.18,0,0.00304,-0.00152,-1.0454,1072.39,760,0,0.1,-0.0679,-0.00771,0.638,0.309,125.38,262.41,0.104,0.01,225,300,0.532,0.619,0.525,0.315 -2,-0.58669,-0.55003,-0.71466,-0.60658,1.9152,-0.11237,0.44788,6.2,-1.2159,0.09636,0,4.5,1,6.54,0,0.00292,-0.00117,-1.0392,1009.49,760,0,0.1,-0.0361,-0.00479,0.871,0.382,130.37,240.14,0.105,0.008,225,300,0.526,0.618,0.532,0.329 -3,-1.1898,-1.142,-1.23,-1.2664,2.1323,-0.04332,0.62694,6.2,-1.2179,0.09764,0,4.5,1,6.93,0,0.00262,-0.00119,-1.0112,922.43,760,0,0.1,-0.0136,-0.00183,1.135,0.516,130.36,195,0.088,0,225,300,0.534,0.619,0.537,0.344 -4,-1.6388,-1.5748,-1.6673,-1.7516,2.204,-0.014642,0.76303,6.2,-1.2162,0.10218,-0.000052,4.5,1,7.32,0,0.00261,-0.00108,-0.9694,844.48,760,0,0.1,-0.0032,-0.00152,1.271,0.629,129.49,199.45,0.07,0,225,300,0.536,0.616,0.543,0.349 -5,-1.966,-1.8882,-2.0245,-2.0928,2.2299,-0.014855,0.87314,6.2,-1.2189,0.10353,0,4.5,1,7.78,0,0.0026,-0.00057,-0.9195,793.13,760,0,0.1,-0.0003,-0.00144,1.329,0.738,130.22,230,0.061,0,225,300,0.528,0.622,0.532,0.335 -7.5,-2.5865,-2.4874,-2.8176,-2.6854,2.1187,-0.081606,1.0121,6.2,-1.2543,0.12507,0,4.5,1,9.48,0,0.0026,0.00038,-0.7766,771.01,760,0,0.1,-0.0001,-0.00137,1.329,0.809,130.72,250.39,0.058,0,225,300,0.512,0.634,0.511,0.27 -10,-3.0702,-2.9537,-3.3776,-3.1726,1.8837,-0.15096,1.0651,6.2,-1.3253,0.15183,0,4.5,1,9.66,0,0.00303,0.00149,-0.6558,775,760,0,0.1,0,-0.00136,1.183,0.703,130,210,0.06,0,225,300,0.51,0.604,0.487,0.239 -PGA,0.4473,0.4856,0.2459,0.4539,1.431,0.05053,-0.1662,5.5,-1.134,0.1917,-0.008088,4.5,1,4.5,0,0.00286,-0.00255,-0.6,1500,760,0,0.1,-0.15,-0.00701,-9.9,-9.9,110,270,0.1,0.07,225,300,0.695,0.495,0.398,0.348 -PGV,5.037,5.078,4.849,5.033,1.073,-0.1536,0.2252,6.2,-1.243,0.1489,-0.00344,4.5,1,5.3,0,0.00435,-0.00033,-0.84,1300,760,0,0.1,-0.1,-0.00844,-9.9,-9.9,105,272,0.082,0.08,225,300,0.644,0.552,0.401,0.346 +T,e0,e1,e2,e3,e4,e5,e6,Mh,c1,c2,c3,Mref,Rref,h,Dc3CaTw,Dc3CnTr,Dc3ItJp,c,Vc,Vref,f1,f3,f4,f5,f6,f7,f6c,f7c,R1,R2,dPhiR,dPhiV,v1,v2,phi1,phi2,tau1,tau2 +0.01,0.4534,0.4916,0.2519,0.4599,1.421,0.04932,-0.1659,5.5,-1.134,0.1916,-0.008088,4.5,1,4.5,0,0.00282,-0.00244,-0.6037,1500.2,760,0,0.1,-0.1483,-0.00701,-9.9,-9.9,-9.9,-9.9,111.67,270,0.096,0.07,225,300,0.698,0.499,0.402,0.345 +0.02,0.48598,0.52359,0.29707,0.48875,1.4331,0.053388,-0.16561,5.5,-1.1394,0.18962,-0.008074,4.5,1,4.5,0,0.00278,-0.00234,-0.5739,1500.36,760,0,0.1,-0.1471,-0.00728,-9.9,-9.9,-9.9,-9.9,113.1,270,0.092,0.03,225,300,0.702,0.502,0.409,0.346 +0.03,0.56916,0.6092,0.40391,0.55783,1.4261,0.061444,-0.1669,5.5,-1.1421,0.18842,-0.008336,4.5,1,4.49,0,0.00276,-0.00217,-0.5341,1502.95,760,0,0.1,-0.1549,-0.00735,-9.9,-9.9,-9.9,-9.9,112.13,270,0.081,0.029,225,300,0.721,0.514,0.445,0.364 +0.05,0.75436,0.79905,0.60652,0.72726,1.3974,0.067357,-0.18082,5.5,-1.1159,0.18709,-0.009819,4.5,1,4.2,0,0.00296,-0.00199,-0.458,1501.42,760,0,0.1,-0.1963,-0.00647,-9.9,-9.9,-9.9,-9.9,97.93,270,0.063,0.03,225,300,0.753,0.532,0.503,0.426 +0.075,0.96447,1.0077,0.77678,0.9563,1.4174,0.073549,-0.19665,5.5,-1.0831,0.18225,-0.01058,4.5,1,4.04,0,0.00296,-0.00216,-0.4441,1494,760,0,0.1,-0.2287,-0.00573,-9.9,-9.9,-9.9,-9.9,85.99,270.04,0.064,0.022,225,300,0.745,0.542,0.474,0.466 +0.1,1.1268,1.1669,0.8871,1.1454,1.4293,0.055231,-0.19838,5.54,-1.0652,0.17203,-0.0102,4.5,1,4.13,0,0.00288,-0.00244,-0.4872,1479.12,760,0,0.1,-0.2492,-0.0056,-9.9,-9.9,-9.9,-9.9,79.59,270.09,0.087,0.014,225,300,0.728,0.541,0.415,0.458 +0.15,1.3095,1.3481,1.0648,1.3324,1.2844,-0.042065,-0.18234,5.74,-1.0532,0.15401,-0.008977,4.5,1,4.39,0,0.00279,-0.00271,-0.5796,1442.85,760,0,0.1,-0.2571,-0.00585,-9.9,-9.9,-9.9,-9.9,81.33,270.16,0.12,0.015,225,300,0.72,0.537,0.354,0.388 +0.2,1.3255,1.359,1.122,1.3414,1.1349,-0.11096,-0.15852,5.92,-1.0607,0.14489,-0.007717,4.5,1,4.61,0,0.00261,-0.00297,-0.6876,1392.61,760,0,0.1,-0.2466,-0.00614,-9.9,-9.9,-9.9,-9.9,90.91,270,0.136,0.045,225,300,0.711,0.539,0.344,0.309 +0.25,1.2766,1.3017,1.0828,1.3052,1.0166,-0.16213,-0.12784,6.05,-1.0773,0.13925,-0.006517,4.5,1,4.78,0,0.00244,-0.00314,-0.7718,1356.21,760,0,0.1,-0.2357,-0.00644,-9.9,-9.9,-9.9,-9.9,97.04,269.45,0.141,0.055,225,300,0.698,0.547,0.35,0.266 +0.3,1.2217,1.2401,1.0246,1.2653,0.95676,-0.1959,-0.092855,6.14,-1.0948,0.13388,-0.005475,4.5,1,4.93,0,0.0022,-0.0033,-0.8417,1308.47,760,0,0.1,-0.2191,-0.0067,-9.9,-9.9,-9.9,-9.9,103.15,268.59,0.138,0.05,225,300,0.675,0.561,0.363,0.229 +0.4,1.1046,1.1214,0.89765,1.1552,0.96766,-0.22608,-0.023189,6.2,-1.1243,0.12512,-0.004053,4.5,1,5.16,0,0.00211,-0.00321,-0.9109,1252.66,760,0,0.1,-0.1958,-0.00713,-9.9,-9.9,-9.9,-9.9,106.02,266.54,0.122,0.049,225,300,0.643,0.58,0.381,0.21 +0.5,0.96991,0.99106,0.7615,1.012,1.0384,-0.23522,0.029119,6.2,-1.1459,0.12015,-0.00322,4.5,1,5.34,0,0.00235,-0.00291,-0.9693,1203.91,760,0,0.1,-0.1704,-0.00744,-9.9,-9.9,-9.9,-9.9,105.54,265,0.109,0.06,225,300,0.615,0.599,0.41,0.224 +0.75,0.66903,0.69737,0.47523,0.69173,1.2871,-0.21591,0.10829,6.2,-1.1777,0.11054,-0.001931,4.5,1,5.6,0,0.00269,-0.00253,-1.0154,1147.59,760,0,0.1,-0.1387,-0.00812,0.092,0.059,-9.9,-9.9,108.39,266.51,0.1,0.07,225,300,0.581,0.622,0.457,0.266 +1,0.3932,0.4218,0.207,0.4124,1.5004,-0.18983,0.17895,6.2,-1.193,0.10248,-0.00121,4.5,1,5.74,0,0.00292,-0.00209,-1.05,1109.95,760,0,0.1,-0.1052,-0.00844,0.367,0.208,-9.9,-9.9,116.39,270,0.098,0.02,225,300,0.553,0.625,0.498,0.298 +1.5,-0.14954,-0.11866,-0.3138,-0.1437,1.7622,-0.1467,0.33896,6.2,-1.2063,0.09645,-0.000365,4.5,1,6.18,0,0.00304,-0.00152,-1.0454,1072.39,760,0,0.1,-0.0679,-0.00771,0.638,0.309,-9.9,-9.9,125.38,262.41,0.104,0.01,225,300,0.532,0.619,0.525,0.315 +2,-0.58669,-0.55003,-0.71466,-0.60658,1.9152,-0.11237,0.44788,6.2,-1.2159,0.09636,0,4.5,1,6.54,0,0.00292,-0.00117,-1.0392,1009.49,760,0,0.1,-0.0361,-0.00479,0.871,0.382,0.292,0.729,130.37,240.14,0.105,0.008,225,300,0.526,0.618,0.532,0.329 +3,-1.1898,-1.142,-1.23,-1.2664,2.1323,-0.04332,0.62694,6.2,-1.2179,0.09764,0,4.5,1,6.93,0,0.00262,-0.00119,-1.0112,922.43,760,0,0.1,-0.0136,-0.00183,1.135,0.516,0.538,1.025,130.36,195,0.088,0,225,300,0.534,0.619,0.537,0.344 +4,-1.6388,-1.5748,-1.6673,-1.7516,2.204,-0.014642,0.76303,6.2,-1.2162,0.10218,-0.000052,4.5,1,7.32,0,0.00261,-0.00108,-0.9694,844.48,760,0,0.1,-0.0032,-0.00152,1.271,0.629,0.922,0.892,129.49,199.45,0.07,0,225,300,0.536,0.616,0.543,0.349 +5,-1.966,-1.8882,-2.0245,-2.0928,2.2299,-0.014855,0.87314,6.2,-1.2189,0.10353,0,4.5,1,7.78,0,0.0026,-0.00057,-0.9195,793.13,760,0,0.1,-0.0003,-0.00144,1.329,0.738,1.21,0.984,130.22,230,0.061,0,225,300,0.528,0.622,0.532,0.335 +7.5,-2.5865,-2.4874,-2.8176,-2.6854,2.1187,-0.081606,1.0121,6.2,-1.2543,0.12507,0,4.5,1,9.48,0,0.0026,0.00038,-0.7766,771.01,760,0,0.1,-0.0001,-0.00137,1.329,0.809,1.57,0.931,130.72,250.39,0.058,0,225,300,0.512,0.634,0.511,0.27 +10,-3.0702,-2.9537,-3.3776,-3.1726,1.8837,-0.15096,1.0651,6.2,-1.3253,0.15183,0,4.5,1,9.66,0,0.00303,0.00149,-0.6558,775,760,0,0.1,0,-0.00136,1.183,0.703,1.41,0.84,130,210,0.06,0,225,300,0.51,0.604,0.487,0.239 +PGA,0.4473,0.4856,0.2459,0.4539,1.431,0.05053,-0.1662,5.5,-1.134,0.1917,-0.008088,4.5,1,4.5,0,0.00286,-0.00255,-0.6,1500,760,0,0.1,-0.15,-0.00701,-9.9,-9.9,-9.9,-9.9,110,270,0.1,0.07,225,300,0.695,0.495,0.398,0.348 +PGV,5.037,5.078,4.849,5.033,1.073,-0.1536,0.2252,6.2,-1.243,0.1489,-0.00344,4.5,1,5.3,0,0.00435,-0.00033,-0.84,1300,760,0,0.1,-0.1,-0.00844,-9.9,-9.9,-9.9,-9.9,105,272,0.082,0.08,225,300,0.644,0.552,0.401,0.346 \ No newline at end of file diff --git a/src/test/java/gov/usgs/earthquake/nshmp/gmm/DeepBasin.java b/src/test/java/gov/usgs/earthquake/nshmp/gmm/DeepBasin.java index b45f6aa948b24b2f639c5df9f9cb2e94c9fe3800..22bed703abb9141f2fb9df3b28c9af7e627bf27d 100644 --- a/src/test/java/gov/usgs/earthquake/nshmp/gmm/DeepBasin.java +++ b/src/test/java/gov/usgs/earthquake/nshmp/gmm/DeepBasin.java @@ -5,6 +5,7 @@ import static gov.usgs.earthquake.nshmp.gmm.Gmm.ASK_14_BASIN; import static gov.usgs.earthquake.nshmp.gmm.Gmm.BCHYDRO_12_INTERFACE_BASIN; import static gov.usgs.earthquake.nshmp.gmm.Gmm.BCHYDRO_12_SLAB_BASIN; import static gov.usgs.earthquake.nshmp.gmm.Gmm.BSSA_14_BASIN; +import static gov.usgs.earthquake.nshmp.gmm.Gmm.BSSA_14_CYBERSHAKE_ADJ; import static gov.usgs.earthquake.nshmp.gmm.Gmm.CB_14_BASIN; import static gov.usgs.earthquake.nshmp.gmm.Gmm.CY_14_BASIN; import static gov.usgs.earthquake.nshmp.gmm.Gmm.ZHAO_06_INTERFACE_BASIN; @@ -52,6 +53,7 @@ class DeepBasin implements ArgumentsProvider { private static Set<Gmm> gmms = EnumSet.of( ASK_14_BASIN, BSSA_14_BASIN, + BSSA_14_CYBERSHAKE_ADJ, CB_14_BASIN, CY_14_BASIN, AM_09_INTERFACE_BASIN, diff --git a/src/test/resources/gmm/deep-basin-results.csv b/src/test/resources/gmm/deep-basin-results.csv index 5aceeea22a0ab98cb3a689395b639fc3f7371321..687b647c017140c6f51fd42acab22ebf7f679b75 100644 --- a/src/test/resources/gmm/deep-basin-results.csv +++ b/src/test/resources/gmm/deep-basin-results.csv @@ -286,6 +286,150 @@ 15-BSSA_14_BASIN-SA10P0,0.0262108819,0.6495667787 16-BSSA_14_BASIN-SA10P0,0.0262108819,0.6495667787 17-BSSA_14_BASIN-SA10P0,0.0529408189,0.6495667787 +0-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1454170141,0.5492986437 +1-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1454170141,0.5492986437 +2-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1454170141,0.5492986437 +3-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1204473019,0.6050859443 +4-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1204473019,0.6050859443 +5-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1204473019,0.6050859443 +6-BSSA_14_CYBERSHAKE_ADJ-PGA,0.0837048883,0.6050859443 +7-BSSA_14_CYBERSHAKE_ADJ-PGA,0.0837048883,0.6050859443 +8-BSSA_14_CYBERSHAKE_ADJ-PGA,0.0837048883,0.6050859443 +9-BSSA_14_CYBERSHAKE_ADJ-PGA,0.2327937322,0.5492986437 +10-BSSA_14_CYBERSHAKE_ADJ-PGA,0.2327937322,0.5492986437 +11-BSSA_14_CYBERSHAKE_ADJ-PGA,0.2327937322,0.5492986437 +12-BSSA_14_CYBERSHAKE_ADJ-PGA,0.2198797876,0.6050859443 +13-BSSA_14_CYBERSHAKE_ADJ-PGA,0.2198797876,0.6050859443 +14-BSSA_14_CYBERSHAKE_ADJ-PGA,0.2198797876,0.6050859443 +15-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1604357891,0.6050859443 +16-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1604357891,0.6050859443 +17-BSSA_14_CYBERSHAKE_ADJ-PGA,0.1604357891,0.6050859443 +0-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1386916475,0.5852349955 +1-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1386916475,0.5852349955 +2-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1386916475,0.5852349955 +3-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1182796115,0.6096884450 +4-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1182796115,0.6096884450 +5-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1182796115,0.6096884450 +6-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.0837262988,0.6096884450 +7-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.0837262988,0.6096884450 +8-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.0837262988,0.6096884450 +9-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.2188757362,0.5852349955 +10-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.2188757362,0.5852349955 +11-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.2188757362,0.5852349955 +12-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.2142260136,0.6096884450 +13-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.2142260136,0.6096884450 +14-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.2142260136,0.6096884450 +15-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1591161452,0.6096884450 +16-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1591161452,0.6096884450 +17-BSSA_14_CYBERSHAKE_ADJ-SA0P02,0.1591161452,0.6096884450 +0-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3265033139,0.5826808732 +1-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3265033139,0.5826808732 +2-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3265033139,0.5826808732 +3-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.2732010118,0.6212905922 +4-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.2732010118,0.6212905922 +5-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.2732010118,0.6212905922 +6-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.1870685639,0.6212905922 +7-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.1870685639,0.6212905922 +8-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.1870685639,0.6212905922 +9-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3996324784,0.5826808732 +10-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3996324784,0.5826808732 +11-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3996324784,0.5826808732 +12-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3972438494,0.6212905922 +13-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3972438494,0.6212905922 +14-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.3972438494,0.6212905922 +15-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.2940578154,0.6212905922 +16-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.2940578154,0.6212905922 +17-BSSA_14_CYBERSHAKE_ADJ-SA0P2,0.2940578154,0.6212905922 +0-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.2991159316,0.5836925561 +1-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.2991159316,0.5836925561 +2-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.2991159316,0.5836925561 +3-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.2036514335,0.6395130960 +4-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.2036514335,0.6395130960 +5-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.2036514335,0.6395130960 +6-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.1087450192,0.6395130960 +7-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.1087450192,0.6395130960 +8-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.1087450192,0.6395130960 +9-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.4228693482,0.5836925561 +10-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.4228693482,0.5836925561 +11-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.4228693482,0.5836925561 +12-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.3398723507,0.6395130960 +13-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.3398723507,0.6395130960 +14-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.3398723507,0.6395130960 +15-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.1919211863,0.6395130960 +16-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.1919211863,0.6395130960 +17-BSSA_14_CYBERSHAKE_ADJ-SA0P5,0.1919211863,0.6395130960 +0-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1824530718,0.6744101126 +1-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1824530718,0.6744101126 +2-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.2026156484,0.6744101126 +3-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1103410696,0.6924081166 +4-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1103410696,0.6924081166 +5-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1276610515,0.6924081166 +6-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.0535098565,0.6924081166 +7-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.0535098565,0.6924081166 +8-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.0658820400,0.6924081166 +9-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.3022273124,0.6744101126 +10-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.3022273124,0.6744101126 +11-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.3356259352,0.6744101126 +12-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.2081125381,0.6924081166 +13-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.2081125381,0.6924081166 +14-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.2407794808,0.6924081166 +15-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1045330015,0.6924081166 +16-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1045330015,0.6924081166 +17-BSSA_14_CYBERSHAKE_ADJ-SA1P0,0.1287024081,0.6924081166 +0-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0621710562,0.7081645289 +1-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0621710562,0.7081645289 +2-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0724970744,0.7081645289 +3-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0309433319,0.7081645289 +4-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0309433319,0.7081645289 +5-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0383170618,0.7081645289 +6-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0145968102,0.7081645289 +7-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0145968102,0.7081645289 +8-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0219545965,0.7081645289 +9-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.2027336392,0.7081645289 +10-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.2027336392,0.7081645289 +11-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.2364057591,0.7081645289 +12-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.1010884317,0.7081645289 +13-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.1010884317,0.7081645289 +14-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.1251775892,0.7081645289 +15-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0478027043,0.7081645289 +16-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0478027043,0.7081645289 +17-BSSA_14_CYBERSHAKE_ADJ-SA3P0,0.0718985221,0.7081645289 +0-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0332165479,0.7064764681 +1-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0332165479,0.7064764681 +2-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0469288603,0.7064764681 +3-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0175622643,0.7064764681 +4-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0175622643,0.7064764681 +5-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0284021207,0.7064764681 +6-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0088354105,0.7064764681 +7-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0088354105,0.7064764681 +8-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0221265577,0.7064764681 +9-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.1501054837,0.7064764681 +10-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.1501054837,0.7064764681 +11-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.2120713838,0.7064764681 +12-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0793662575,0.7064764681 +13-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0793662575,0.7064764681 +14-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.1283530411,0.7064764681 +15-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0399302339,0.7064764681 +16-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0399302339,0.7064764681 +17-BSSA_14_CYBERSHAKE_ADJ-SA5P0,0.0999974613,0.7064764681 +0-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0095389253,0.6495667787 +1-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0095389253,0.6495667787 +2-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0142689654,0.6495667787 +3-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0060545794,0.6495667787 +4-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0060545794,0.6495667787 +5-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0106013634,0.6495667787 +6-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0037091091,0.6495667787 +7-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0037091091,0.6495667787 +8-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0085916578,0.6495667787 +9-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0674080058,0.6495667787 +10-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0674080058,0.6495667787 +11-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.1008334238,0.6495667787 +12-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0427854405,0.6495667787 +13-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0427854405,0.6495667787 +14-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0749158567,0.6495667787 +15-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0262108819,0.6495667787 +16-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0262108819,0.6495667787 +17-BSSA_14_CYBERSHAKE_ADJ-SA10P0,0.0607140214,0.6495667787 0-CB_14_BASIN-PGA,0.1080488231,0.5058507986 1-CB_14_BASIN-PGA,0.1080488231,0.5058507986 2-CB_14_BASIN-PGA,0.1080488231,0.5058507986