diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java
index ea596ef1d5654fc89ba4ad3aa67a4f0e6784a386..214981c7cf0716c3998d8d7d859858efc6565802 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java
@@ -124,12 +124,14 @@ public class AtkinsonMacias_2009 implements GroundMotionModel {
// interpolatedGmm = null if !interpolated
private final boolean interpolated;
private final GroundMotionModel interpolatedGmm;
+ private final Gmm subtype;
AtkinsonMacias_2009(final Imt imt) {
this(imt, Gmm.AM_09_INTERFACE);
}
AtkinsonMacias_2009(final Imt imt, Gmm subtype) {
+ this.subtype = subtype;
coeffs = new Coefficients(imt, COEFFS);
coeffsPGA = new Coefficients(PGA, COEFFS);
siteAmp = new BooreAtkinson_2008(imt);
@@ -142,10 +144,15 @@ public class AtkinsonMacias_2009 implements GroundMotionModel {
@Override
public final ScalarGroundMotion calc(final GmmInput in) {
+
if (interpolated) {
return interpolatedGmm.calc(in);
}
+ if (coeffs.imt == Imt.PGV) {
+ return UsgsPgvSupport.calcPgv(subtype, in);
+ }
+
double σ = coeffs.σ * BASE_10_TO_E;
double μRef = calcMean(coeffs, in);
double μPga = calcMean(coeffsPGA, in);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/MultiScalarGroundMotion.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/MultiScalarGroundMotion.java
index b614551ee5ed6f0385f602a44fc82a4d90a4acca..e11f512e3def09ed8a780ea3dadc73d543e078c6 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/MultiScalarGroundMotion.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/MultiScalarGroundMotion.java
@@ -1,5 +1,6 @@
package gov.usgs.earthquake.nshmp.gmm;
+import gov.usgs.earthquake.nshmp.Maths;
import gov.usgs.earthquake.nshmp.data.DoubleData;
/**
@@ -36,7 +37,7 @@ public class MultiScalarGroundMotion extends DefaultScalarGroundMotion {
super(
DoubleData.weightedSumLn(means, meanWts),
- DoubleData.weightedSum(sigmas, sigmaWts));
+ Maths.srssWeighted(sigmas, sigmaWts));
this.means = means;
this.meanWts = meanWts;
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java
index 999a441e65e54975dd8bf0f4a55e9448bf5511ec..6bd92a0042ba2e6a77e138dc257d613c75e27e77 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java
@@ -195,8 +195,10 @@ public abstract class ZhaoEtAl_2006 implements GroundMotionModel {
private final GroundMotionModel interpolatedGmm;
private final boolean extrapolated;
private final GroundMotionModel extrapolatedGmm;
+ private final Gmm subtype;
ZhaoEtAl_2006(final Imt imt, Gmm subtype) {
+ this.subtype = subtype;
coeffs = new Coefficients(imt, COEFFS);
cb14 = new CampbellBozorgnia_2014(imt);
interpolated = INTERPOLATED_IMTS.containsKey(imt);
@@ -211,6 +213,11 @@ public abstract class ZhaoEtAl_2006 implements GroundMotionModel {
@Override
public final ScalarGroundMotion calc(GmmInput in) {
+
+ if (coeffs.imt == Imt.PGV) {
+ return UsgsPgvSupport.calcPgv(subtype, in);
+ }
+
if (interpolated) {
return interpolatedGmm.calc(in);
}
diff --git a/src/main/resources/gmm/coeffs/AM09.csv b/src/main/resources/gmm/coeffs/AM09.csv
index bc04de18a6428e28c18bac9d2175d54f9f65edde..ce25f7cf8b3eb27707fd56c718c59ea197679234 100644
--- a/src/main/resources/gmm/coeffs/AM09.csv
+++ b/src/main/resources/gmm/coeffs/AM09.csv
@@ -22,3 +22,4 @@ PGA,5.006,-1.5573,-0.00034,0.1774,0.0827,0.24
5,2.671,-0.5942,-0.0004,0.3822,-0.0417,0.32
7.5,2.489,-0.6412,-3.00E-05,0.476,-0.0629,0.35
10,2.338,-0.6311,0,0.5357,-0.0737,0.38
+PGV,0.0,0.0,0.0,0.0,0.0,0.0
diff --git a/src/main/resources/gmm/coeffs/SP16.csv b/src/main/resources/gmm/coeffs/SP16.csv
index b8a64a1c9c34e5b1131711c0e9026b48a94a5df9..e54b65f4ad307728fdccb05d76593d7dd176f9e0 100644
--- a/src/main/resources/gmm/coeffs/SP16.csv
+++ b/src/main/resources/gmm/coeffs/SP16.csv
@@ -1,6 +1,6 @@
T,c1,c2,c3,c4,c5,c6,c7,c8,c9,c10,c11,c12,c13,c14,sigma_reg,sigma_par
PGA,-0.3002,0.5066,-0.04526,-3.224,0.2998,-1.283,0.1045,-3.0856,0.2778,-0.0007711,3.81,-0.0554,0.978,0.663,0.1,0.288
-# PGV,-2.3891,1.259,-0.07901,-0.029386,0.3034,-0.00929,-0.04605,-2.7548,0.3467,-0.0007623,-4.598,-0.41,0.876,0.611,0.194,0.373
+PGV,-2.3891,1.259,-0.07901,-2.9386,0.3034,-0.00929,-0.04605,-2.7548,0.3467,-0.0007623,-4.598,-0.041,0.876,0.611,0.194,0.373
0.01,-0.3472,0.4838,-0.04093,-3.0832,0.2712,-0.9676,0.04983,-2.9695,0.2693,-0.0006695,-4.434,-0.056,0.982,0.664,0.132,0.281
0.02,0.832,0.1934,-0.0206,-3.1134,0.2786,-1.133,0.05994,-3.5023,0.2901,-0.0005857,-4.412,-0.0559,0.983,0.665,0.0928,0.281
0.03,1.185,0.1064,-0.01423,-3.1029,0.2792,-1.078,0.05239,-3.5722,0.2865,-0.000622,-4.353,-0.0577,1,0.676,0.0833,0.277
diff --git a/src/main/resources/gmm/coeffs/Zhao06.csv b/src/main/resources/gmm/coeffs/Zhao06.csv
index e115973fe08fecf009b1e4afa6b941ede172366c..b9b092992cf4670dde22dd46fa53a62a7922f9ce 100644
--- a/src/main/resources/gmm/coeffs/Zhao06.csv
+++ b/src/main/resources/gmm/coeffs/Zhao06.csv
@@ -27,3 +27,4 @@ PGA, 1.101, -0.00564, 0.0055, 1.080, 0.01412, 0.251, 0.000, 2.607, -0.528, 0
5.00, 1.825, -0.00237, 0.0050, 1.065, 0.00510, 0.248, -0.498, 0.225, -0.120, -6.752, -6.347, -6.051, -5.873, -5.798, 0.643, 0.377, 0.272, 0.296, -0.0117, -0.1578, 0.0246, 0.1090, -0.0268
7.5, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
10.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
+PGV, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
diff --git a/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-epri.csv b/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-epri.csv
index 9b891bf996f7a5dbc8c94e475d9c847c087bc34d..abf0e08d2145efdab55bdf864acb072a199d59ae 100644
--- a/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-epri.csv
+++ b/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-epri.csv
@@ -22,4 +22,4 @@
7.5, 0.4803, 0.5502, 0.4067, 0.5982, 0.3835, 0.5982
10.0, 0.4666, 0.5389, 0.3993, 0.5885, 0.3761, 0.5885
PGA, 0.4320, 0.6269, 0.3779, 0.5168, 0.3525, 0.5039
-# PGV, 0.3925, 0.5979, 0.3612, 0.5218, 0.3502, 0.5090
+ PGV, 0.3925, 0.5979, 0.3612, 0.5218, 0.3502, 0.5090
diff --git a/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-panel.csv b/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-panel.csv
index ec11a31a18488aa1a604fae52f6aac09a5f5c1f3..04eb7e459380f1c537a91cdc5a655b2ae87902fb 100644
--- a/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-panel.csv
+++ b/src/main/resources/gmm/coeffs/nga-east-usgs-sigma-panel.csv
@@ -22,4 +22,4 @@
7.5, 0.4436, 0.4169, 0.3736, 0.3415, 0.3482, 0.3481, 0.378, 0.201
10.0, 0.4436, 0.4169, 0.3736, 0.3415, 0.3472, 0.3471, 0.319, 0.193
PGA, 0.4436, 0.4169, 0.3736, 0.3415, 0.5423, 0.3439, 0.533, 0.566
-# PGV, 0.3633, 0.3532, 0.3340, 0.3136, 0.4985, 0.3548, 0.487, 0.458
+ PGV, 0.3633, 0.3532, 0.3340, 0.3136, 0.4985, 0.3548, 0.487, 0.458
diff --git a/src/main/resources/gmm/tables/nga-east-Graizer16.dat b/src/main/resources/gmm/tables/nga-east-Graizer16.dat
index 7d7c290453ec4f695b0959b5cb9b779036f37c69..5f98bccfb8f076c0c6352e628aab983e91a1739c 100644
--- a/src/main/resources/gmm/tables/nga-east-Graizer16.dat
+++ b/src/main/resources/gmm/tables/nga-east-Graizer16.dat
@@ -34,6 +34,42 @@ r/m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
1000.0,2.97502E-06,1.01218E-05,2.82001E-05,7.33766E-05,0.000182456,0.00040579,0.000764371,0.001275443,0.001675791,0.001991504,0.002353001
1200.0,1.14102E-06,4.09336E-06,1.20251E-05,3.29922E-05,8.65025E-05,0.000202856,0.000402911,0.000708897,0.000961507,0.001167134,0.001408538
1500.0,2.85012E-07,1.10707E-06,3.52134E-06,1.04606E-05,2.96961E-05,7.54024E-05,0.000162155,0.000308909,0.000439456,0.000550674,0.000686045
+PGV
+r\m,4,4.5,5,5.5,6,6.5,7,7.5,7.8,8,8.2
+0,7.707664349,13.27072367,22.52388491,37.67514497,50.41764053,64.36349852,85.04439053,114.8154083,121.5373876,126.4842618,131.5702669
+1,5.339157988,9.665206361,16.3212247,25.69696183,34.3933784,42.78578225,56.56780266,77.67227663,84.11597574,88.81037426,93.71992811
+5,1.457756228,3.331287249,6.950436657,12.98877589,20.0210074,27.43615651,38.61494941,55.74011775,61.73515651,66.14205769,70.80275562
+10,0.674803843,1.567018402,3.412150414,6.768425089,12.02040503,18.99848876,28.48390947,41.95774053,49.79036657,55.61760355,61.96699172
+15,0.374942269,0.890156751,1.999680266,4.17545287,7.970485858,13.77150547,21.54202485,32.5164503,40.00971361,45.47003254,51.55691006
+20,0.234300607,0.570452012,1.341359763,2.900124704,5.823169231,10.51187781,17.04112278,26.61342308,33.7095355,39.2022929,44.91676923
+25,0.168219837,0.418437692,0.986660488,2.169929586,4.446295266,8.16066287,13.62476775,22.54829882,29.13213166,34.60920562,40.98299822
+30,0.130755464,0.326453314,0.775799941,1.712559615,3.540666568,6.594925592,11.50380281,19.44388018,25.7829571,30.91992012,36.96534675
+40,0.084606854,0.21635932,0.526180873,1.191645,2.475414941,4.625759024,8.45751997,15.22727959,20.35568935,24.56219822,29.71744941
+50,0.059117497,0.15500003,0.38541787,0.893077278,1.872115976,3.529267751,6.736000148,12.96362825,17.16728402,20.66299704,24.86460237
+60,0.048886744,0.129393145,0.325088861,0.761715636,1.617228107,3.073141864,5.895560947,11.40280444,15.35408343,18.73181509,22.82340118
+70,0.041115485,0.109911414,0.279018092,0.661825666,1.422145237,2.733924556,5.250720414,10.40221036,14.11685754,17.21826553,20.98787544
+80,0.035204072,0.095320541,0.244825163,0.586305962,1.280567781,2.478747041,4.844250296,9.686435059,13.12127322,16.0290858,19.57081716
+90,0.031339694,0.085311062,0.220564157,0.532609053,1.173067485,2.299773521,4.507038905,9.073156065,12.28096686,14.93154379,18.15655873
+100,0.028193074,0.077186157,0.200832204,0.488295044,1.091764083,2.149968047,4.239144379,8.553141864,11.5033784,14.00290503,17.04687396
+110,0.025760404,0.070753161,0.184999867,0.456116361,1.025155991,2.053804586,4.098048669,8.198609024,11.01552973,13.39149482,16.28801686
+120,0.023418339,0.065311833,0.17292676,0.428619482,0.981007618,1.973779438,3.913797189,7.889311391,10.57609024,12.85428935,15.63151568
+130,0.021422706,0.060036726,0.159826036,0.401797145,0.923849275,1.844078846,3.652998077,7.346865385,9.885104586,12.06163299,14.71902352
+140,0.019436627,0.055392756,0.149491527,0.377716036,0.862276805,1.727284024,3.418099852,6.864659467,9.285601479,11.34831257,13.86946139
+150,0.017882064,0.051205386,0.138890678,0.355740444,0.815972722,1.664211834,3.318667012,6.691384024,9.046443343,11.08526553,13.58102678
+175,0.014085025,0.041129623,0.113695167,0.294761287,0.693225015,1.437015932,2.899418047,5.920155769,7.987146598,9.721223373,11.84265266
+200,0.011320745,0.033541484,0.093466598,0.243588314,0.583195991,1.227201257,2.482196302,5.070241124,6.834999556,8.344338609,10.19973121
+250,0.007865832,0.023567451,0.066488052,0.173818595,0.422838506,0.911390547,1.848406065,3.885357988,5.591306509,6.931175296,8.536424349
+300,0.005816911,0.017431254,0.049377058,0.130438962,0.324356879,0.706769926,1.50817321,3.298248669,4.536776627,5.612775296,6.950557544
+350,0.004365451,0.013226741,0.03798679,0.105516836,0.260806583,0.574072781,1.243391169,2.799627515,3.881401923,4.889190237,6.155121953
+400,0.003196295,0.010316375,0.031109201,0.087395777,0.217036095,0.475852263,1.057407411,2.419163609,3.43393787,4.330218195,5.45835355
+450,0.00244578,0.007960661,0.024261874,0.068559737,0.172305518,0.390697219,0.878221391,2.016736331,2.906477959,3.78559068,4.924527751
+500,0.001907148,0.006256142,0.019205963,0.054733589,0.141762006,0.324928964,0.737643166,1.705952145,2.560752219,3.345977811,4.367282041
+600,0.001210346,0.004079536,0.012858441,0.037745889,0.10117838,0.24279108,0.569708817,1.353650237,1.982036302,2.549912426,3.280613166
+700,0.000808939,0.00279329,0.00903226,0.027351012,0.072845679,0.174659991,0.418943107,1.013540547,1.560637396,2.073211006,2.752580414
+800,0.000554628,0.001965966,0.006544776,0.020579812,0.05649383,0.141388095,0.342384527,0.824782959,1.276243536,1.700876257,2.265870355
+1000,0.000305265,0.001121663,0.003898465,0.012943702,0.037522571,0.101660926,0.280026885,0.783337382,1.347668047,1.933406553,2.744457604
+1200,0.000155097,0.000590834,0.002140645,0.007530107,0.022016277,0.06020646,0.168403393,0.475456908,0.835316509,1.215303284,1.771799246
+1500,7.02526E-05,0.000276743,0.001047907,0.003957514,0.012165541,0.035334733,0.105171384,0.316921086,0.60860355,0.944208595,1.473147651
SA0P01
r/m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
0.01,0.133521443,0.194305529,0.288125821,0.441010971,0.68358768,0.983575514,1.230327832,1.389948906,1.454068157,1.488312879,1.517392836
diff --git a/src/main/resources/gmm/tables/nga-east-Graizer17.dat b/src/main/resources/gmm/tables/nga-east-Graizer17.dat
index d3839dca78e5b6196708db757fa4ca0ef4930b99..86cf03fc11311c8f4295c08749c466f39f892578 100644
--- a/src/main/resources/gmm/tables/nga-east-Graizer17.dat
+++ b/src/main/resources/gmm/tables/nga-east-Graizer17.dat
@@ -34,6 +34,42 @@ r/m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
1000.0,1.41466E-06,5.87819E-06,1.87293E-05,5.28735E-05,0.000136656,0.00030493,0.000559507,0.000887034,0.001118538,0.0012883,0.001470951
1200.0,3.92079E-07,1.78574E-06,6.15551E-06,1.86037E-05,5.10398E-05,0.000120048,0.000230834,0.000381623,0.000492466,0.000575567,0.000666473
1500.0,5.8664E-08,3.06608E-07,1.18922E-06,3.98112E-06,1.19448E-05,3.04033E-05,6.27121E-05,0.0001104,0.000147485,0.000176194,0.000208366
+PGV
+r\m,4,4.5,5,5.5,6,6.5,7,7.5,7.8,8,8.2
+0,7.707664349,13.27072367,22.52388491,37.67514497,50.41764053,64.36349852,85.04439053,114.8154083,121.5373876,126.4842618,131.5702669
+1,5.339157988,9.665206361,16.3212247,25.69696183,34.3933784,42.78578225,56.56780266,77.67227663,84.11597574,88.81037426,93.71992811
+5,1.457756228,3.331287249,6.950436657,12.98877589,20.0210074,27.43615651,38.61494941,55.74011775,61.73515651,66.14205769,70.80275562
+10,0.674803843,1.567018402,3.412150414,6.768425089,12.02040503,18.99848876,28.48390947,41.95774053,49.79036657,55.61760355,61.96699172
+15,0.374942269,0.890156751,1.999680266,4.17545287,7.970485858,13.77150547,21.54202485,32.5164503,40.00971361,45.47003254,51.55691006
+20,0.234300607,0.570452012,1.341359763,2.900124704,5.823169231,10.51187781,17.04112278,26.61342308,33.7095355,39.2022929,44.91676923
+25,0.168219837,0.418437692,0.986660488,2.169929586,4.446295266,8.16066287,13.62476775,22.54829882,29.13213166,34.60920562,40.98299822
+30,0.130755464,0.326453314,0.775799941,1.712559615,3.540666568,6.594925592,11.50380281,19.44388018,25.7829571,30.91992012,36.96534675
+40,0.084606854,0.21635932,0.526180873,1.191645,2.475414941,4.625759024,8.45751997,15.22727959,20.35568935,24.56219822,29.71744941
+50,0.059117497,0.15500003,0.38541787,0.893077278,1.872115976,3.529267751,6.736000148,12.96362825,17.16728402,20.66299704,24.86460237
+60,0.048886744,0.129393145,0.325088861,0.761715636,1.617228107,3.073141864,5.895560947,11.40280444,15.35408343,18.73181509,22.82340118
+70,0.041115485,0.109911414,0.279018092,0.661825666,1.422145237,2.733924556,5.250720414,10.40221036,14.11685754,17.21826553,20.98787544
+80,0.035204072,0.095320541,0.244825163,0.586305962,1.280567781,2.478747041,4.844250296,9.686435059,13.12127322,16.0290858,19.57081716
+90,0.031339694,0.085311062,0.220564157,0.532609053,1.173067485,2.299773521,4.507038905,9.073156065,12.28096686,14.93154379,18.15655873
+100,0.028193074,0.077186157,0.200832204,0.488295044,1.091764083,2.149968047,4.239144379,8.553141864,11.5033784,14.00290503,17.04687396
+110,0.025760404,0.070753161,0.184999867,0.456116361,1.025155991,2.053804586,4.098048669,8.198609024,11.01552973,13.39149482,16.28801686
+120,0.023418339,0.065311833,0.17292676,0.428619482,0.981007618,1.973779438,3.913797189,7.889311391,10.57609024,12.85428935,15.63151568
+130,0.021422706,0.060036726,0.159826036,0.401797145,0.923849275,1.844078846,3.652998077,7.346865385,9.885104586,12.06163299,14.71902352
+140,0.019436627,0.055392756,0.149491527,0.377716036,0.862276805,1.727284024,3.418099852,6.864659467,9.285601479,11.34831257,13.86946139
+150,0.017882064,0.051205386,0.138890678,0.355740444,0.815972722,1.664211834,3.318667012,6.691384024,9.046443343,11.08526553,13.58102678
+175,0.014085025,0.041129623,0.113695167,0.294761287,0.693225015,1.437015932,2.899418047,5.920155769,7.987146598,9.721223373,11.84265266
+200,0.011320745,0.033541484,0.093466598,0.243588314,0.583195991,1.227201257,2.482196302,5.070241124,6.834999556,8.344338609,10.19973121
+250,0.007865832,0.023567451,0.066488052,0.173818595,0.422838506,0.911390547,1.848406065,3.885357988,5.591306509,6.931175296,8.536424349
+300,0.005816911,0.017431254,0.049377058,0.130438962,0.324356879,0.706769926,1.50817321,3.298248669,4.536776627,5.612775296,6.950557544
+350,0.004365451,0.013226741,0.03798679,0.105516836,0.260806583,0.574072781,1.243391169,2.799627515,3.881401923,4.889190237,6.155121953
+400,0.003196295,0.010316375,0.031109201,0.087395777,0.217036095,0.475852263,1.057407411,2.419163609,3.43393787,4.330218195,5.45835355
+450,0.00244578,0.007960661,0.024261874,0.068559737,0.172305518,0.390697219,0.878221391,2.016736331,2.906477959,3.78559068,4.924527751
+500,0.001907148,0.006256142,0.019205963,0.054733589,0.141762006,0.324928964,0.737643166,1.705952145,2.560752219,3.345977811,4.367282041
+600,0.001210346,0.004079536,0.012858441,0.037745889,0.10117838,0.24279108,0.569708817,1.353650237,1.982036302,2.549912426,3.280613166
+700,0.000808939,0.00279329,0.00903226,0.027351012,0.072845679,0.174659991,0.418943107,1.013540547,1.560637396,2.073211006,2.752580414
+800,0.000554628,0.001965966,0.006544776,0.020579812,0.05649383,0.141388095,0.342384527,0.824782959,1.276243536,1.700876257,2.265870355
+1000,0.000305265,0.001121663,0.003898465,0.012943702,0.037522571,0.101660926,0.280026885,0.783337382,1.347668047,1.933406553,2.744457604
+1200,0.000155097,0.000590834,0.002140645,0.007530107,0.022016277,0.06020646,0.168403393,0.475456908,0.835316509,1.215303284,1.771799246
+1500,7.02526E-05,0.000276743,0.001047907,0.003957514,0.012165541,0.035334733,0.105171384,0.316921086,0.60860355,0.944208595,1.473147651
SA0P01
r/m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
0.01,0.192564807,0.280228205,0.41553669,0.636028939,0.98587492,1.418519338,1.774386551,2.004591836,2.097063985,2.146451134,2.188389544
diff --git a/src/main/resources/gmm/tables/nga-east-PEER_GP.dat b/src/main/resources/gmm/tables/nga-east-PEER_GP.dat
index 1d14ad33e310d649c973948efd9fd68d8f6bd66f..0f71d0bfa1b709a0aaf824fc17aabbc8048e1c25 100644
--- a/src/main/resources/gmm/tables/nga-east-PEER_GP.dat
+++ b/src/main/resources/gmm/tables/nga-east-PEER_GP.dat
@@ -34,6 +34,42 @@ r\m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
1000.0,5.9854E-6,1.5069E-5,3.3112E-5,8.1437E-5,1.8226E-4,4.1225E-4,8.1769E-4,0.0014155,0.0018374,0.0021296,0.0024186
1200.0,2.0341E-6,5.3062E-6,1.2302E-5,2.97E-5,7.6519E-5,1.7801E-4,3.6565E-4,6.4452E-4,8.3852E-4,9.7033E-4,0.0010979
1500.0,4.2022E-7,1.181E-6,2.6871E-6,7.7345E-6,2.0753E-5,5.17E-5,1.1236E-4,2.0348E-4,2.6522E-4,3.0571E-4,3.4309E-4
+PGV
+r\m,4,4.5,5,5.5,6,6.5,7,7.5,7.8,8,8.2
+0,7.707664349,13.27072367,22.52388491,37.67514497,50.41764053,64.36349852,85.04439053,114.8154083,121.5373876,126.4842618,131.5702669
+1,5.339157988,9.665206361,16.3212247,25.69696183,34.3933784,42.78578225,56.56780266,77.67227663,84.11597574,88.81037426,93.71992811
+5,1.457756228,3.331287249,6.950436657,12.98877589,20.0210074,27.43615651,38.61494941,55.74011775,61.73515651,66.14205769,70.80275562
+10,0.674803843,1.567018402,3.412150414,6.768425089,12.02040503,18.99848876,28.48390947,41.95774053,49.79036657,55.61760355,61.96699172
+15,0.374942269,0.890156751,1.999680266,4.17545287,7.970485858,13.77150547,21.54202485,32.5164503,40.00971361,45.47003254,51.55691006
+20,0.234300607,0.570452012,1.341359763,2.900124704,5.823169231,10.51187781,17.04112278,26.61342308,33.7095355,39.2022929,44.91676923
+25,0.168219837,0.418437692,0.986660488,2.169929586,4.446295266,8.16066287,13.62476775,22.54829882,29.13213166,34.60920562,40.98299822
+30,0.130755464,0.326453314,0.775799941,1.712559615,3.540666568,6.594925592,11.50380281,19.44388018,25.7829571,30.91992012,36.96534675
+40,0.084606854,0.21635932,0.526180873,1.191645,2.475414941,4.625759024,8.45751997,15.22727959,20.35568935,24.56219822,29.71744941
+50,0.059117497,0.15500003,0.38541787,0.893077278,1.872115976,3.529267751,6.736000148,12.96362825,17.16728402,20.66299704,24.86460237
+60,0.048886744,0.129393145,0.325088861,0.761715636,1.617228107,3.073141864,5.895560947,11.40280444,15.35408343,18.73181509,22.82340118
+70,0.041115485,0.109911414,0.279018092,0.661825666,1.422145237,2.733924556,5.250720414,10.40221036,14.11685754,17.21826553,20.98787544
+80,0.035204072,0.095320541,0.244825163,0.586305962,1.280567781,2.478747041,4.844250296,9.686435059,13.12127322,16.0290858,19.57081716
+90,0.031339694,0.085311062,0.220564157,0.532609053,1.173067485,2.299773521,4.507038905,9.073156065,12.28096686,14.93154379,18.15655873
+100,0.028193074,0.077186157,0.200832204,0.488295044,1.091764083,2.149968047,4.239144379,8.553141864,11.5033784,14.00290503,17.04687396
+110,0.025760404,0.070753161,0.184999867,0.456116361,1.025155991,2.053804586,4.098048669,8.198609024,11.01552973,13.39149482,16.28801686
+120,0.023418339,0.065311833,0.17292676,0.428619482,0.981007618,1.973779438,3.913797189,7.889311391,10.57609024,12.85428935,15.63151568
+130,0.021422706,0.060036726,0.159826036,0.401797145,0.923849275,1.844078846,3.652998077,7.346865385,9.885104586,12.06163299,14.71902352
+140,0.019436627,0.055392756,0.149491527,0.377716036,0.862276805,1.727284024,3.418099852,6.864659467,9.285601479,11.34831257,13.86946139
+150,0.017882064,0.051205386,0.138890678,0.355740444,0.815972722,1.664211834,3.318667012,6.691384024,9.046443343,11.08526553,13.58102678
+175,0.014085025,0.041129623,0.113695167,0.294761287,0.693225015,1.437015932,2.899418047,5.920155769,7.987146598,9.721223373,11.84265266
+200,0.011320745,0.033541484,0.093466598,0.243588314,0.583195991,1.227201257,2.482196302,5.070241124,6.834999556,8.344338609,10.19973121
+250,0.007865832,0.023567451,0.066488052,0.173818595,0.422838506,0.911390547,1.848406065,3.885357988,5.591306509,6.931175296,8.536424349
+300,0.005816911,0.017431254,0.049377058,0.130438962,0.324356879,0.706769926,1.50817321,3.298248669,4.536776627,5.612775296,6.950557544
+350,0.004365451,0.013226741,0.03798679,0.105516836,0.260806583,0.574072781,1.243391169,2.799627515,3.881401923,4.889190237,6.155121953
+400,0.003196295,0.010316375,0.031109201,0.087395777,0.217036095,0.475852263,1.057407411,2.419163609,3.43393787,4.330218195,5.45835355
+450,0.00244578,0.007960661,0.024261874,0.068559737,0.172305518,0.390697219,0.878221391,2.016736331,2.906477959,3.78559068,4.924527751
+500,0.001907148,0.006256142,0.019205963,0.054733589,0.141762006,0.324928964,0.737643166,1.705952145,2.560752219,3.345977811,4.367282041
+600,0.001210346,0.004079536,0.012858441,0.037745889,0.10117838,0.24279108,0.569708817,1.353650237,1.982036302,2.549912426,3.280613166
+700,0.000808939,0.00279329,0.00903226,0.027351012,0.072845679,0.174659991,0.418943107,1.013540547,1.560637396,2.073211006,2.752580414
+800,0.000554628,0.001965966,0.006544776,0.020579812,0.05649383,0.141388095,0.342384527,0.824782959,1.276243536,1.700876257,2.265870355
+1000,0.000305265,0.001121663,0.003898465,0.012943702,0.037522571,0.101660926,0.280026885,0.783337382,1.347668047,1.933406553,2.744457604
+1200,0.000155097,0.000590834,0.002140645,0.007530107,0.022016277,0.06020646,0.168403393,0.475456908,0.835316509,1.215303284,1.771799246
+1500,7.02526E-05,0.000276743,0.001047907,0.003957514,0.012165541,0.035334733,0.105171384,0.316921086,0.60860355,0.944208595,1.473147651
SA0P01
r\m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
0.0,0.46851,0.69925,0.86089,1.0263,1.1547,1.2269,1.2326,1.1703,1.1058,1.0536,0.92821
diff --git a/src/main/resources/gmm/tables/nga-east-PZCT15_M1SS.dat b/src/main/resources/gmm/tables/nga-east-PZCT15_M1SS.dat
index 06fe3a610d99e1a798a718569206aa6d9c4aefd9..bf2daab05e61eacdd42d2c79566663c612f9f9a7 100644
--- a/src/main/resources/gmm/tables/nga-east-PZCT15_M1SS.dat
+++ b/src/main/resources/gmm/tables/nga-east-PZCT15_M1SS.dat
@@ -34,6 +34,42 @@ r\m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
1000.0,1.2744E-6,4.0514E-6,1.1785E-5,3.0844E-5,7.3452E-5,1.5933E-4,3.1666E-4,5.743E-4,7.8556E-4,9.5043E-4,0.0011332
1200.0,3.1566E-7,1.0114E-6,2.9569E-6,7.8885E-6,1.9204E-5,4.2663E-5,8.6484E-5,1.5998E-4,2.2144E-4,2.7004E-4,3.2452E-4
1500.0,3.9641E-8,1.3012E-7,3.8974E-7,1.0653E-6,2.6569E-6,6.0469E-6,1.2558E-5,2.3799E-5,3.3425E-5,4.0664E-5,4.8468E-5
+PGV
+r\m,4,4.5,5,5.5,6,6.5,7,7.5,7.8,8,8.2
+0,7.707664349,13.27072367,22.52388491,37.67514497,50.41764053,64.36349852,85.04439053,114.8154083,121.5373876,126.4842618,131.5702669
+1,5.339157988,9.665206361,16.3212247,25.69696183,34.3933784,42.78578225,56.56780266,77.67227663,84.11597574,88.81037426,93.71992811
+5,1.457756228,3.331287249,6.950436657,12.98877589,20.0210074,27.43615651,38.61494941,55.74011775,61.73515651,66.14205769,70.80275562
+10,0.674803843,1.567018402,3.412150414,6.768425089,12.02040503,18.99848876,28.48390947,41.95774053,49.79036657,55.61760355,61.96699172
+15,0.374942269,0.890156751,1.999680266,4.17545287,7.970485858,13.77150547,21.54202485,32.5164503,40.00971361,45.47003254,51.55691006
+20,0.234300607,0.570452012,1.341359763,2.900124704,5.823169231,10.51187781,17.04112278,26.61342308,33.7095355,39.2022929,44.91676923
+25,0.168219837,0.418437692,0.986660488,2.169929586,4.446295266,8.16066287,13.62476775,22.54829882,29.13213166,34.60920562,40.98299822
+30,0.130755464,0.326453314,0.775799941,1.712559615,3.540666568,6.594925592,11.50380281,19.44388018,25.7829571,30.91992012,36.96534675
+40,0.084606854,0.21635932,0.526180873,1.191645,2.475414941,4.625759024,8.45751997,15.22727959,20.35568935,24.56219822,29.71744941
+50,0.059117497,0.15500003,0.38541787,0.893077278,1.872115976,3.529267751,6.736000148,12.96362825,17.16728402,20.66299704,24.86460237
+60,0.048886744,0.129393145,0.325088861,0.761715636,1.617228107,3.073141864,5.895560947,11.40280444,15.35408343,18.73181509,22.82340118
+70,0.041115485,0.109911414,0.279018092,0.661825666,1.422145237,2.733924556,5.250720414,10.40221036,14.11685754,17.21826553,20.98787544
+80,0.035204072,0.095320541,0.244825163,0.586305962,1.280567781,2.478747041,4.844250296,9.686435059,13.12127322,16.0290858,19.57081716
+90,0.031339694,0.085311062,0.220564157,0.532609053,1.173067485,2.299773521,4.507038905,9.073156065,12.28096686,14.93154379,18.15655873
+100,0.028193074,0.077186157,0.200832204,0.488295044,1.091764083,2.149968047,4.239144379,8.553141864,11.5033784,14.00290503,17.04687396
+110,0.025760404,0.070753161,0.184999867,0.456116361,1.025155991,2.053804586,4.098048669,8.198609024,11.01552973,13.39149482,16.28801686
+120,0.023418339,0.065311833,0.17292676,0.428619482,0.981007618,1.973779438,3.913797189,7.889311391,10.57609024,12.85428935,15.63151568
+130,0.021422706,0.060036726,0.159826036,0.401797145,0.923849275,1.844078846,3.652998077,7.346865385,9.885104586,12.06163299,14.71902352
+140,0.019436627,0.055392756,0.149491527,0.377716036,0.862276805,1.727284024,3.418099852,6.864659467,9.285601479,11.34831257,13.86946139
+150,0.017882064,0.051205386,0.138890678,0.355740444,0.815972722,1.664211834,3.318667012,6.691384024,9.046443343,11.08526553,13.58102678
+175,0.014085025,0.041129623,0.113695167,0.294761287,0.693225015,1.437015932,2.899418047,5.920155769,7.987146598,9.721223373,11.84265266
+200,0.011320745,0.033541484,0.093466598,0.243588314,0.583195991,1.227201257,2.482196302,5.070241124,6.834999556,8.344338609,10.19973121
+250,0.007865832,0.023567451,0.066488052,0.173818595,0.422838506,0.911390547,1.848406065,3.885357988,5.591306509,6.931175296,8.536424349
+300,0.005816911,0.017431254,0.049377058,0.130438962,0.324356879,0.706769926,1.50817321,3.298248669,4.536776627,5.612775296,6.950557544
+350,0.004365451,0.013226741,0.03798679,0.105516836,0.260806583,0.574072781,1.243391169,2.799627515,3.881401923,4.889190237,6.155121953
+400,0.003196295,0.010316375,0.031109201,0.087395777,0.217036095,0.475852263,1.057407411,2.419163609,3.43393787,4.330218195,5.45835355
+450,0.00244578,0.007960661,0.024261874,0.068559737,0.172305518,0.390697219,0.878221391,2.016736331,2.906477959,3.78559068,4.924527751
+500,0.001907148,0.006256142,0.019205963,0.054733589,0.141762006,0.324928964,0.737643166,1.705952145,2.560752219,3.345977811,4.367282041
+600,0.001210346,0.004079536,0.012858441,0.037745889,0.10117838,0.24279108,0.569708817,1.353650237,1.982036302,2.549912426,3.280613166
+700,0.000808939,0.00279329,0.00903226,0.027351012,0.072845679,0.174659991,0.418943107,1.013540547,1.560637396,2.073211006,2.752580414
+800,0.000554628,0.001965966,0.006544776,0.020579812,0.05649383,0.141388095,0.342384527,0.824782959,1.276243536,1.700876257,2.265870355
+1000,0.000305265,0.001121663,0.003898465,0.012943702,0.037522571,0.101660926,0.280026885,0.783337382,1.347668047,1.933406553,2.744457604
+1200,0.000155097,0.000590834,0.002140645,0.007530107,0.022016277,0.06020646,0.168403393,0.475456908,0.835316509,1.215303284,1.771799246
+1500,7.02526E-05,0.000276743,0.001047907,0.003957514,0.012165541,0.035334733,0.105171384,0.316921086,0.60860355,0.944208595,1.473147651
SA0P01
r\m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
0.0,0.77822,1.2031,1.6996,2.194,2.5879,2.7894,2.8026,2.8026,2.8026,2.8026,2.8026
diff --git a/src/main/resources/gmm/tables/nga-east-PZCT15_M2ES.dat b/src/main/resources/gmm/tables/nga-east-PZCT15_M2ES.dat
index 95fcb0f32b3ee7b9ef131d9bd2370a189ebada27..ef5d17add16c3e0cfb86b8423ded9b5ad273d014 100644
--- a/src/main/resources/gmm/tables/nga-east-PZCT15_M2ES.dat
+++ b/src/main/resources/gmm/tables/nga-east-PZCT15_M2ES.dat
@@ -34,6 +34,42 @@ r\m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
1000.0,1.2444E-6,4.045E-6,1.2128E-5,3.2906E-5,8.1301E-5,1.8291E-4,3.7859E-4,7.1743E-4,0.0010087,0.0012437,0.0015117
1200.0,3.04E-7,1.0072E-6,3.0524E-6,8.463E-6,2.1465E-5,4.9802E-5,1.0571E-4,2.0525E-4,2.9283E-4,3.6457E-4,4.4745E-4
1500.0,3.7928E-8,1.2946E-7,4.0421E-7,1.1546E-6,3.0169E-6,7.2115E-6,1.5769E-5,3.1545E-5,4.5817E-5,5.7725E-5,7.0999E-5
+PGV
+r\m,4,4.5,5,5.5,6,6.5,7,7.5,7.8,8,8.2
+0,7.707664349,13.27072367,22.52388491,37.67514497,50.41764053,64.36349852,85.04439053,114.8154083,121.5373876,126.4842618,131.5702669
+1,5.339157988,9.665206361,16.3212247,25.69696183,34.3933784,42.78578225,56.56780266,77.67227663,84.11597574,88.81037426,93.71992811
+5,1.457756228,3.331287249,6.950436657,12.98877589,20.0210074,27.43615651,38.61494941,55.74011775,61.73515651,66.14205769,70.80275562
+10,0.674803843,1.567018402,3.412150414,6.768425089,12.02040503,18.99848876,28.48390947,41.95774053,49.79036657,55.61760355,61.96699172
+15,0.374942269,0.890156751,1.999680266,4.17545287,7.970485858,13.77150547,21.54202485,32.5164503,40.00971361,45.47003254,51.55691006
+20,0.234300607,0.570452012,1.341359763,2.900124704,5.823169231,10.51187781,17.04112278,26.61342308,33.7095355,39.2022929,44.91676923
+25,0.168219837,0.418437692,0.986660488,2.169929586,4.446295266,8.16066287,13.62476775,22.54829882,29.13213166,34.60920562,40.98299822
+30,0.130755464,0.326453314,0.775799941,1.712559615,3.540666568,6.594925592,11.50380281,19.44388018,25.7829571,30.91992012,36.96534675
+40,0.084606854,0.21635932,0.526180873,1.191645,2.475414941,4.625759024,8.45751997,15.22727959,20.35568935,24.56219822,29.71744941
+50,0.059117497,0.15500003,0.38541787,0.893077278,1.872115976,3.529267751,6.736000148,12.96362825,17.16728402,20.66299704,24.86460237
+60,0.048886744,0.129393145,0.325088861,0.761715636,1.617228107,3.073141864,5.895560947,11.40280444,15.35408343,18.73181509,22.82340118
+70,0.041115485,0.109911414,0.279018092,0.661825666,1.422145237,2.733924556,5.250720414,10.40221036,14.11685754,17.21826553,20.98787544
+80,0.035204072,0.095320541,0.244825163,0.586305962,1.280567781,2.478747041,4.844250296,9.686435059,13.12127322,16.0290858,19.57081716
+90,0.031339694,0.085311062,0.220564157,0.532609053,1.173067485,2.299773521,4.507038905,9.073156065,12.28096686,14.93154379,18.15655873
+100,0.028193074,0.077186157,0.200832204,0.488295044,1.091764083,2.149968047,4.239144379,8.553141864,11.5033784,14.00290503,17.04687396
+110,0.025760404,0.070753161,0.184999867,0.456116361,1.025155991,2.053804586,4.098048669,8.198609024,11.01552973,13.39149482,16.28801686
+120,0.023418339,0.065311833,0.17292676,0.428619482,0.981007618,1.973779438,3.913797189,7.889311391,10.57609024,12.85428935,15.63151568
+130,0.021422706,0.060036726,0.159826036,0.401797145,0.923849275,1.844078846,3.652998077,7.346865385,9.885104586,12.06163299,14.71902352
+140,0.019436627,0.055392756,0.149491527,0.377716036,0.862276805,1.727284024,3.418099852,6.864659467,9.285601479,11.34831257,13.86946139
+150,0.017882064,0.051205386,0.138890678,0.355740444,0.815972722,1.664211834,3.318667012,6.691384024,9.046443343,11.08526553,13.58102678
+175,0.014085025,0.041129623,0.113695167,0.294761287,0.693225015,1.437015932,2.899418047,5.920155769,7.987146598,9.721223373,11.84265266
+200,0.011320745,0.033541484,0.093466598,0.243588314,0.583195991,1.227201257,2.482196302,5.070241124,6.834999556,8.344338609,10.19973121
+250,0.007865832,0.023567451,0.066488052,0.173818595,0.422838506,0.911390547,1.848406065,3.885357988,5.591306509,6.931175296,8.536424349
+300,0.005816911,0.017431254,0.049377058,0.130438962,0.324356879,0.706769926,1.50817321,3.298248669,4.536776627,5.612775296,6.950557544
+350,0.004365451,0.013226741,0.03798679,0.105516836,0.260806583,0.574072781,1.243391169,2.799627515,3.881401923,4.889190237,6.155121953
+400,0.003196295,0.010316375,0.031109201,0.087395777,0.217036095,0.475852263,1.057407411,2.419163609,3.43393787,4.330218195,5.45835355
+450,0.00244578,0.007960661,0.024261874,0.068559737,0.172305518,0.390697219,0.878221391,2.016736331,2.906477959,3.78559068,4.924527751
+500,0.001907148,0.006256142,0.019205963,0.054733589,0.141762006,0.324928964,0.737643166,1.705952145,2.560752219,3.345977811,4.367282041
+600,0.001210346,0.004079536,0.012858441,0.037745889,0.10117838,0.24279108,0.569708817,1.353650237,1.982036302,2.549912426,3.280613166
+700,0.000808939,0.00279329,0.00903226,0.027351012,0.072845679,0.174659991,0.418943107,1.013540547,1.560637396,2.073211006,2.752580414
+800,0.000554628,0.001965966,0.006544776,0.020579812,0.05649383,0.141388095,0.342384527,0.824782959,1.276243536,1.700876257,2.265870355
+1000,0.000305265,0.001121663,0.003898465,0.012943702,0.037522571,0.101660926,0.280026885,0.783337382,1.347668047,1.933406553,2.744457604
+1200,0.000155097,0.000590834,0.002140645,0.007530107,0.022016277,0.06020646,0.168403393,0.475456908,0.835316509,1.215303284,1.771799246
+1500,7.02526E-05,0.000276743,0.001047907,0.003957514,0.012165541,0.035334733,0.105171384,0.316921086,0.60860355,0.944208595,1.473147651
SA0P01
r\m,4.0,4.5,5.0,5.5,6.0,6.5,7.0,7.5,7.8,8.0,8.2
0.0,0.4458,0.76497,1.1989,1.7161,2.2435,2.6789,2.9215,2.9488,2.9488,2.9488,2.9488