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 319cef48f6e39f2710fd9f41db74aa0577a95393..ba78f7a1c51dcf4a6d788939ee08495334989084 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -607,9 +607,9 @@ public enum Gmm {
WongEtAl_2015.CONSTRAINTS),
/** @see WongEtAl_2015 */
- WONG_15_760(
- WongEtAl_2015.Site760.class,
- WongEtAl_2015.Site760.NAME,
+ WONG_15(
+ WongEtAl_2015.Site.class,
+ WongEtAl_2015.Site.NAME,
WongEtAl_2015.COEFFS_760,
WongEtAl_2015.CONSTRAINTS),
@@ -1322,7 +1322,7 @@ public enum Gmm {
"2020 Active Volcanic (HI)",
List.of(
WONG_15_428,
- WONG_15_760,
+ WONG_15,
ATKINSON_10,
ATKINSON_10_CALDERA,
ASK_14,
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/gmm/WongEtAl_2015.java b/src/main/java/gov/usgs/earthquake/nshmp/gmm/WongEtAl_2015.java
index bdfe590322f516903967668a25e0fcc1649b7a9f..c1b3d053e08f287b17a21b6f4680d89f5a4700d9 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/gmm/WongEtAl_2015.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/gmm/WongEtAl_2015.java
@@ -15,13 +15,17 @@ import static gov.usgs.earthquake.nshmp.gmm.Imt.SA7P5;
import static java.lang.Math.exp;
import static java.lang.Math.log;
+import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
import com.google.common.collect.Range;
+import com.google.common.primitives.Ints;
+import gov.usgs.earthquake.nshmp.data.Interpolator;
import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
/**
@@ -39,13 +43,13 @@ import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
* coefficients for 0.075 s. Spectral periods 4 s and 7.5 s are missing
* coefficients and are also interpolated using adjacent periods.
*
- * <p><b>Implementation update:</b> (October, 2020) Wong et al. provided the
- * USGS with new coefficients for VS30=760 m/s. These have been implemented as
- * separate model; the original model is now referenced as
- * {@link Gmm#WONG_15_428} and the updated version {@link Gmm#WONG_15_760}. In
- * addition, following discussion with the model devlopers, {@code WONG_15_760}
- * uses a fixed sigma of 0.8. The {@code WONG_15_760} model continues to use
- * {@link BooreEtAl_2014} site effect scaling for Vs30 values other than 760.
+ * <p><b>Implementation update:</b> (November, 2020) Wong et al. provided the
+ * USGS with new Vs30-specific coefficients for values of 150, 185, 260, 365,
+ * 428 ,530, 760, 1080, and 1500 m/s. These have been implemented as the primary
+ * model for use in the 2021 Hawaii NSHM update and is referenced as
+ * {@link Gmm#WONG_15}. The original model is now referenced as
+ * {@link Gmm#WONG_15_428}. In addition, following discussion with the model
+ * devlopers, {@code WONG_15} uses a fixed sigma of 0.8.
*
* <p><b>Note:</b> Direct instantiation of {@code GroundMotionModel}s is
* prohibited. Use {@link Gmm#instance(Imt)} to retrieve an instance for a
@@ -61,8 +65,8 @@ import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
* <p><b>Component:</b> average horizontal
*
* @author Peter Powers
+ * @see Gmm#WONG_15
* @see Gmm#WONG_15_428
- * @see Gmm#WONG_15_760
*/
@Beta
public abstract class WongEtAl_2015 implements GroundMotionModel {
@@ -86,18 +90,25 @@ public abstract class WongEtAl_2015 implements GroundMotionModel {
* Developer note: c6 @ 1.995Hz (0.5s) missing negative sign per email from
* Ivan on 07/23/2019.
*/
+ static final CoefficientContainer COEFFS_PUB = new CoefficientContainer("Wong15.csv");
+
+ static final CoefficientContainer COEFFS_150 = new CoefficientContainer("Wong15-150.csv");
+ static final CoefficientContainer COEFFS_185 = new CoefficientContainer("Wong15-185.csv");
+ static final CoefficientContainer COEFFS_260 = new CoefficientContainer("Wong15-260.csv");
+ static final CoefficientContainer COEFFS_365 = new CoefficientContainer("Wong15-365.csv");
static final CoefficientContainer COEFFS_428 = new CoefficientContainer("Wong15-428.csv");
+ static final CoefficientContainer COEFFS_530 = new CoefficientContainer("Wong15-530.csv");
static final CoefficientContainer COEFFS_760 = new CoefficientContainer("Wong15-760.csv");
+ static final CoefficientContainer COEFFS_1080 = new CoefficientContainer("Wong15-1080.csv");
+ static final CoefficientContainer COEFFS_1500 = new CoefficientContainer("Wong15-1500.csv");
- private static final class Coefficients {
+ private static class Coefficients {
final Imt imt;
- final double vRef;
- final double c1, c2, c3, c4, c5, c6, σ;
+ final double c1, c2, c3, c4, c5, c6;
- Coefficients(Imt imt, double vRef, CoefficientContainer cc) {
+ Coefficients(Imt imt, CoefficientContainer cc) {
this.imt = imt;
- this.vRef = vRef;
Map<String, Double> coeffs = cc.get(imt);
c1 = coeffs.get("C1");
c2 = coeffs.get("C2");
@@ -105,20 +116,23 @@ public abstract class WongEtAl_2015 implements GroundMotionModel {
c4 = coeffs.get("C4");
c5 = coeffs.get("C5");
c6 = coeffs.get("C6");
- σ = coeffs.get("sigma");
}
}
- private final Coefficients coeffs;
- private final BooreEtAl_2014 siteDelegate;
+ private static final class Coefficients428 extends Coefficients {
+
+ final double σ;
+
+ Coefficients428(Imt imt, CoefficientContainer cc) {
+ super(imt, cc);
+ σ = cc.get(imt).get("sigma");
+ }
+ }
private final boolean interpolated;
private final GroundMotionModel interpolatedGmm;
- WongEtAl_2015(Coefficients coeffs, Gmm subtype) {
- this.coeffs = coeffs;
- Imt imt = coeffs.imt;
- siteDelegate = (BooreEtAl_2014) Gmm.BSSA_14.instance(imt);
+ WongEtAl_2015(Imt imt, Gmm subtype) {
interpolated = INTERPOLATED_IMTS.containsKey(imt);
interpolatedGmm = interpolated
? new InterpolatedGmm(subtype, imt, INTERPOLATED_IMTS.get(imt))
@@ -127,26 +141,15 @@ public abstract class WongEtAl_2015 implements GroundMotionModel {
@Override
public final ScalarGroundMotion calc(final GmmInput in) {
-
if (interpolated) {
return interpolatedGmm.calc(in);
}
-
- double μ = calcMean(coeffs, in);
- double site = 0.0;
- if (in.vs30 != coeffs.vRef) {
- GmmInput inVsRef = GmmInput.builder().fromCopy(in)
- .vs30(coeffs.vRef)
- .build();
- site = siteDelegate.calc(in).mean() - siteDelegate.calc(inVsRef).mean();
- }
-
- return DefaultScalarGroundMotion.create(
- μ + site,
- coeffs.σ);
+ return calcImplementation(in);
}
- private static final double calcMean(final Coefficients c, final GmmInput in) {
+ abstract ScalarGroundMotion calcImplementation(GmmInput in);
+
+ private static double calcMean(final Coefficients c, final GmmInput in) {
double Mw = in.Mw;
return c.c1 + c.c2 * Mw +
(c.c4 + c.c5 * Mw) * log(in.rJB + exp(c.c3)) +
@@ -154,18 +157,90 @@ public abstract class WongEtAl_2015 implements GroundMotionModel {
}
static final class Site428 extends WongEtAl_2015 {
- static final String NAME = WongEtAl_2015.NAME + " : 428 m/s";
+ static final String NAME = WongEtAl_2015.NAME + " (BSSA site)";
+
+ private static final double VS30_REF = 428.0;
+ private final Coefficients428 coeffs;
+ private final BooreEtAl_2014 siteDelegate;
Site428(Imt imt) {
- super(new Coefficients(imt, 428.0, COEFFS_428), Gmm.WONG_15_428);
+ super(imt, Gmm.WONG_15_428);
+ coeffs = new Coefficients428(imt, COEFFS_PUB);
+ siteDelegate = (BooreEtAl_2014) Gmm.BSSA_14.instance(imt);
+ }
+
+ @Override
+ ScalarGroundMotion calcImplementation(GmmInput in) {
+ double μ = calcMean(coeffs, in);
+ double site = 0.0;
+ if (in.vs30 != VS30_REF) {
+ GmmInput inVsRef = GmmInput.builder().fromCopy(in)
+ .vs30(VS30_REF)
+ .build();
+ site = siteDelegate.calc(in).mean() - siteDelegate.calc(inVsRef).mean();
+ }
+
+ return DefaultScalarGroundMotion.create(
+ μ + site,
+ coeffs.σ);
}
}
- static final class Site760 extends WongEtAl_2015 {
- static final String NAME = WongEtAl_2015.NAME + " : 760 m/s";
+ static final class Site extends WongEtAl_2015 {
+
+ private final Map<Integer, Coefficients> coeffsMap;
+ private final List<Integer> vsKeys;
+ private static final double SIGMA = 0.8;
+
+ Site(Imt imt) {
+ super(imt, Gmm.WONG_15);
+ coeffsMap = Map.of(
+ 150, new Coefficients(imt, COEFFS_150),
+ 185, new Coefficients(imt, COEFFS_185),
+ 260, new Coefficients(imt, COEFFS_260),
+ 365, new Coefficients(imt, COEFFS_365),
+ 428, new Coefficients(imt, COEFFS_428),
+ 530, new Coefficients(imt, COEFFS_530),
+ 760, new Coefficients(imt, COEFFS_760),
+ 1080, new Coefficients(imt, COEFFS_1080),
+ 1500, new Coefficients(imt, COEFFS_1500));
+
+ vsKeys = coeffsMap.keySet().stream()
+ .sorted()
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ ScalarGroundMotion calcImplementation(GmmInput in) {
+ /* clamp vs30 < 150 and vs30 > 1500 */
+ int vsKey = Ints.constrainToRange((int) in.vs30, 150, 1500);
+
+ if (coeffsMap.containsKey(vsKey)) {
+ double μ = calcMean(coeffsMap.get(vsKey), in);
+ return DefaultScalarGroundMotion.create(μ, SIGMA);
+ }
+
+ int vsLoIndex = vsLoIndex(vsKey);
+ int vsLo = vsKeys.get(vsLoIndex);
+ int vsHi = vsKeys.get(vsLoIndex + 1);
+
+ Coefficients coeffsLo = coeffsMap.get(vsLo);
+ Coefficients coeffsHi = coeffsMap.get(vsHi);
+
+ double μLo = calcMean(coeffsLo, in);
+ double μHi = calcMean(coeffsHi, in);
+ double μ = Interpolator.findX(μLo, vsLo, μHi, vsHi, in.vs30);
+
+ return DefaultScalarGroundMotion.create(μ, SIGMA);
+ }
- Site760(Imt imt) {
- super(new Coefficients(imt, 760.0, COEFFS_760), Gmm.WONG_15_760);
+ private int vsLoIndex(int vsKey) {
+ for (int i = 1; i < vsKeys.size(); i++) {
+ if (vsKey < vsKeys.get(i)) {
+ return i - 1;
+ }
+ }
+ return vsKeys.size() - 1;
}
}
}
diff --git a/src/main/resources/gmm/coeffs/Wong15-1080.csv b/src/main/resources/gmm/coeffs/Wong15-1080.csv
new file mode 100755
index 0000000000000000000000000000000000000000..9d1f04829fe293e118a5fce6dd60ad097972410b
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15-1080.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6
+10.0, -9.94467, 2.03274, 5.4, -2.58611, 0.13184, -0.16348
+7.5, 0, 0, 0, 0, 0, 0
+5.0, -2.85757, 1.96038, 5.7, -3.15687, 0.10616, -0.24948
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 9.50447, 1.37435, 6.0, -4.65042, 0.16201, -0.29654
+2.0, 19.42515, 0.78887, 6.1, -5.88408, 0.22405, -0.31785
+1.5, 27.22984, 0.39421, 6.2, -6.87085, 0.26668, -0.32407
+1.0, 37.72668, -0.41228, 6.2, -8.24274, 0.36012, -0.31850
+0.75, 44.39633, -0.89301, 6.2, -9.11520, 0.41483, -0.30422
+0.5, 48.02106, -1.37182, 6.1, -9.61985, 0.47167, -0.27523
+0.4, 53.04999, -1.76242, 6.1, -10.31090, 0.51995, -0.25320
+0.3, 59.63075, -2.36002, 6.1, -11.25182, 0.60028, -0.22461
+0.25, 58.88488, -2.54016, 6.0, -11.20858, 0.62655, -0.20009
+0.2, 63.04949, -2.93622, 6.0, -11.82560, 0.68261, -0.18061
+0.15, 69.46798, -3.57603, 6.0, -12.79463, 0.77593, -0.15330
+0.10, 71.67037, -4.09398, 5.9, -13.25869, 0.86044, -0.12008
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 63.57597, -4.17060, 5.6, -12.39880, 0.90097, -0.09330
+0.03, 54.89888, -3.83474, 5.4, -11.25994, 0.86786, -0.09258
+0.02, 49.10114, -3.52464, 5.3, -10.44304, 0.82905, -0.10110
+0.01, 49.50914, -3.58029, 5.4, -10.45222, 0.83490, -0.11428
+PGA, 49.01306, -3.53963, 5.4, -10.36996, 0.82790, -0.11490
+PGV, 35.32381, -2.50490, 5.2, -8.04105, 0.76843, -0.14424
diff --git a/src/main/resources/gmm/coeffs/Wong15-150.csv b/src/main/resources/gmm/coeffs/Wong15-150.csv
new file mode 100755
index 0000000000000000000000000000000000000000..fe3c24e24b2db8420c2d1dae58b91c8dfae9dd15
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15-150.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6
+10.0, 4.37553, 0.77975, 5.8, -4.59986, 0.30767, -0.14658
+7.5, 0, 0, 0, 0, 0, 0
+5.0, 6.55163, 1.33405, 5.9, -4.46379, 0.19195, -0.22300
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 11.38311, 1.68224, 6.0, -4.85417, 0.10946, -0.26454
+2.0, 30.98126, 0.54258, 6.3, -7.39710, 0.25264, -0.30809
+1.5, 49.92847, -1.04082, 6.5, -9.86362, 0.46506, -0.33988
+1.0, 84.68634, -4.87454, 6.7, -14.29627, 0.96980, -0.37189
+0.75, 119.73380, -8.69895, 6.9, -18.67737, 1.45506, -0.35283
+0.5, 135.07390, -10.27271, 6.9, -20.71831, 1.65558, -0.32696
+0.4, 153.20490, -12.41574, 6.9, -23.23709, 1.95012, -0.32053
+0.3, 233.34520, -20.53758, 7.2, -33.22908, 2.97031, -0.28776
+0.25, 301.79760, -27.35859, 7.4, -41.47969, 3.79423, -0.24674
+0.2, 284.11340, -26.06946, 7.3, -39.59374, 3.66270, -0.21950
+0.15, 223.87440, -21.03829, 7.0, -32.65327, 3.09331, -0.18668
+0.10, 220.67960, -21.50187, 6.9, -32.60587, 3.19304, -0.13747
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 138.46650, -13.70573, 6.4, -22.37661, 2.23038, -0.11380
+0.03, 109.66910, -10.69246, 6.2, -18.53750, 1.82857, -0.13173
+0.02, 104.03920, -9.92014, 6.2, -17.70504, 1.71552, -0.15300
+0.01, 101.61770, -9.58564, 6.2, -17.34384, 1.66611, -0.16184
+PGA, 101.44280, -9.55060, 6.2, -17.31475, 1.66075, -0.16232
+PGV, 52.29073, -3.78249, 5.7, -10.07493, 0.90801, -0.18440
diff --git a/src/main/resources/gmm/coeffs/Wong15-1500.csv b/src/main/resources/gmm/coeffs/Wong15-1500.csv
new file mode 100755
index 0000000000000000000000000000000000000000..246824d5e671cd5a25506fb0d7b5c25a12fd4654
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15-1500.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6
+10.0, -10.49826, 2.09582, 5.4, -2.51426, 0.12288, -0.16307
+7.5, 0, 0, 0, 0, 0, 0
+5.0, -3.07494, 1.97375, 5.7, -3.14119, 0.10461, -0.24902
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 9.83182, 1.28979, 6.0, -4.73407, 0.17553, -0.29387
+2.0, 19.75484, 0.70839, 6.1, -5.96460, 0.23664, -0.31617
+1.5, 27.73978, 0.29543, 6.2, -6.97664, 0.28134, -0.32269
+1.0, 37.47560, -0.37858, 6.2, -8.21498, 0.35451, -0.31819
+0.75, 44.11293, -0.87037, 6.2, -9.08773, 0.41153, -0.30435
+0.5, 47.47013, -1.27662, 6.1, -9.53965, 0.45639, -0.27493
+0.4, 53.04236, -1.78513, 6.1, -10.32908, 0.52354, -0.25306
+0.3, 59.67915, -2.38283, 6.1, -11.27705, 0.60363, -0.22401
+0.25, 58.74831, -2.51538, 6.0, -11.19996, 0.62220, -0.19957
+0.2, 63.04345, -2.93681, 6.0, -11.83945, 0.68231, -0.18005
+0.15, 69.59005, -3.60960, 6.0, -12.83070, 0.78093, -0.15297
+0.10, 72.01244, -4.18625, 5.9, -13.33419, 0.87497, -0.12009
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 64.05569, -4.18264, 5.6, -12.48718, 0.90190, -0.09087
+0.03, 51.68260, -3.48432, 5.3, -10.81647, 0.81431, -0.08616
+0.02, 47.17186, -3.34137, 5.2, -10.20652, 0.80257, -0.09145
+0.01, 51.14855, -3.75480, 5.4, -10.73373, 0.86222, -0.10771
+PGA, 50.38409, -3.69514, 5.4, -10.60943, 0.85235, -0.10911
+PGV, 35.63970, -2.57346, 5.2, -8.12670, 0.78163, -0.13717
diff --git a/src/main/resources/gmm/coeffs/Wong15-185.csv b/src/main/resources/gmm/coeffs/Wong15-185.csv
new file mode 100755
index 0000000000000000000000000000000000000000..fb86879df59675a7e0804770566c9b6a13535b80
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15-185.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6
+10.0, 2.23924, 0.88904, 5.7, -4.32670, 0.29496, -0.14503
+7.5, 0, 0, 0, 0, 0, 0
+5.0, 4.97610, 1.26923, 5.8, -4.27010, 0.20407, -0.22666
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 10.39555, 1.40754, 5.9, -4.75552, 0.15144, -0.26862
+2.0, 17.88831, 1.30809, 6.0, -5.63213, 0.14066, -0.28729
+1.5, 29.04721, 0.80828, 6.2, -7.06492, 0.20046, -0.30768
+1.0, 70.86868, -2.72757, 6.6, -12.54106, 0.67623, -0.35302
+0.75, 106.11160, -6.43004, 6.8, -17.05878, 1.16334, -0.35750
+0.5, 167.80150, -12.39433, 7.1, -24.73777, 1.91219, -0.32696
+0.4, 162.43070, -12.23821, 7.0, -24.23815, 1.90310, -0.30798
+0.3, 182.14450, -14.54356, 7.0, -26.93524, 2.21379, -0.28892
+0.25, 218.53920, -18.39985, 7.1, -31.56796, 2.70736, -0.26152
+0.2, 229.63580, -19.84729, 7.1, -33.07245, 2.90063, -0.23693
+0.15, 221.03660, -19.64746, 7.0, -32.25693, 2.90152, -0.19915
+0.10, 199.45500, -18.55872, 6.8, -29.97464, 2.81452, -0.15835
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 127.56000, -12.18776, 6.3, -20.98351, 2.02746, -0.12309
+0.03, 101.24280, -9.51463, 6.1, -17.44776, 1.66844, -0.13768
+0.02, 104.96560, -9.60834, 6.2, -17.85769, 1.66995, -0.15902
+0.01, 102.08580, -9.21284, 6.2, -17.42784, 1.61145, -0.16875
+PGA, 101.74880, -9.15899, 6.2, -17.37388, 1.60314, -0.16908
+PGV, 49.26893, -3.53262, 5.6, -9.70275, 0.87669, -0.18271
diff --git a/src/main/resources/gmm/coeffs/Wong15-260.csv b/src/main/resources/gmm/coeffs/Wong15-260.csv
new file mode 100755
index 0000000000000000000000000000000000000000..4dd9bdcb8ef9555472c3c3969fc4738258523850
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15-260.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6
+10.0, -4.06428, 1.34282, 5.4, -3.45320, 0.23289, -0.14270
+7.5, 0, 0, 0, 0, 0, 0
+5.0, 2.52438, 1.35767, 5.7, -3.94546, 0.19376, -0.22802
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 11.21896, 1.12792, 5.9, -4.89811, 0.19535, -0.27638
+2.0, 16.13302, 1.01694, 5.9, -5.42645, 0.18666, -0.29415
+1.5, 21.10197, 1.01206, 6.0, -6.00444, 0.17189, -0.29984
+1.0, 30.96416, 0.74999, 6.1, -7.18627, 0.18324, -0.30587
+0.75, 43.71734, -0.26484, 6.2, -8.88793, 0.31740, -0.30885
+0.5, 80.53577, -3.34020, 6.5, -13.82011, 0.73594, -0.31268
+0.4, 112.43970, -6.21106, 6.7, -17.97597, 1.11532, -0.29580
+0.3, 139.22570, -8.85118, 6.8, -21.49511, 1.46421, -0.27930
+0.25, 168.33290, -11.62806, 6.9, -25.29347, 1.82776, -0.25550
+0.2, 197.68610, -14.40394, 7.0, -29.04471, 2.18513, -0.23960
+0.15, 175.79600, -13.42590, 6.8, -26.60735, 2.09247, -0.21223
+0.10, 177.03360, -14.59615, 6.7, -27.09436, 2.27932, -0.16581
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 105.56700, -9.10250, 6.1, -18.07121, 1.59993, -0.12999
+0.03, 91.89919, -7.77002, 6.0, -16.20113, 1.41794, -0.13896
+0.02, 86.55507, -7.07048, 6.0, -15.40218, 1.31405, -0.15396
+0.01, 83.82279, -6.70478, 6.0, -14.98769, 1.25899, -0.16222
+PGA, 83.41772, -6.63195, 6.0, -14.92092, 1.24728, -0.16212
+PGV, 43.61100, -3.09358, 5.4, -9.00818, 0.82445, -0.16302
diff --git a/src/main/resources/gmm/coeffs/Wong15-365.csv b/src/main/resources/gmm/coeffs/Wong15-365.csv
new file mode 100755
index 0000000000000000000000000000000000000000..da40f6f1a3524b2e3ea33a919ae96c3bcbff69a6
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15-365.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6
+10.0, -5.89428, 1.54704, 5.4, -3.18565, 0.20388, -0.14813
+7.5, 0, 0, 0, 0, 0, 0
+5.0, 0.82909, 1.53292, 5.7, -3.69799, 0.16915, -0.23479
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 10.22099, 1.15948, 5.9, -4.76276, 0.19303, -0.28367
+2.0, 19.13934, 0.72139, 6.0, -5.85525, 0.23212, -0.30420
+1.5, 25.40152, 0.53718, 6.1, -6.61504, 0.24338, -0.31135
+1.0, 32.53355, 0.21408, 6.1, -7.43641, 0.26362, -0.31210
+0.75, 43.69998, -0.48336, 6.2, -8.91529, 0.34927, -0.30116
+0.5, 47.13694, -0.88354, 6.1, -9.38070, 0.39279, -0.27345
+0.4, 66.01481, -2.09548, 6.3, -11.92174, 0.55460, -0.26212
+0.3, 84.00746, -3.74371, 6.4, -14.36503, 0.77954, -0.24890
+0.25, 92.99872, -4.78684, 6.4, -15.65712, 0.92627, -0.23303
+0.2, 112.00830, -6.51004, 6.5, -18.24856, 1.16354, -0.22159
+0.15, 138.31690, -9.24763, 6.6, -21.80543, 1.53773, -0.20243
+0.10, 115.28580, -8.43449, 6.3, -19.10105, 1.46438, -0.16934
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 96.17582, -7.83323, 6.0, -16.84412, 1.42371, -0.13404
+0.03, 76.95651, -6.19404, 5.8, -14.21214, 1.20096, -0.13501
+0.02, 72.02564, -5.58468, 5.8, -13.46659, 1.10935, -0.14657
+0.01, 69.57445, -5.26972, 5.8, -13.08968, 1.06122, -0.15310
+PGA, 69.33356, -5.22513, 5.8, -13.04691, 1.05354, -0.15287
+PGV, 44.09953, -3.24840, 5.4, -9.16765, 0.85807, -0.15093
diff --git a/src/main/resources/gmm/coeffs/Wong15-428.csv b/src/main/resources/gmm/coeffs/Wong15-428.csv
old mode 100644
new mode 100755
index 2d601d6407b593f9c9140fc3709e23254f385d16..c4f852c8aab52cc6fe2b2330acc9ddab9a2aea48
--- a/src/main/resources/gmm/coeffs/Wong15-428.csv
+++ b/src/main/resources/gmm/coeffs/Wong15-428.csv
@@ -1,24 +1,24 @@
-T, C1, C2, C3, C4, C5, C6, sigma
-PGV, 39.70192, -2.85255, 5.3, -8.55941, 0.80414, -0.15077, 0.4487
-PGA, 68.52187, -5.09631, 5.8, -12.96010, 1.03629, -0.14898, 0.7803
-0.01, 68.77858, -5.13883, 5.8, -13.00533, 1.04366, -0.14918, 0.7816
-0.02, 65.29077, -4.98649, 5.7, -12.56134, 1.02752, -0.14202, 0.7975
-0.03, 69.46166, -5.48027, 5.7, -13.19430, 1.10188, -0.13149, 0.8194
-0.05, 85.62312, -6.76578, 5.9, -15.41352, 1.27568, -0.13241, 0.8327
-0.075, 0, 0, 0, 0, 0, 0, 0
-0.1, 103.04320, -7.20814, 6.2, -17.48802, 1.29736, -0.16376, 0.8254
-0.15, 108.81360, -6.61834, 6.4, -17.96824, 1.18618, -0.18760, 0.8290
-0.2, 98.22293, -5.32783, 6.4, -16.41981, 1.00088, -0.20822, 0.8381
-0.25, 91.64108, -4.50724, 6.4, -15.47178, 0.88528, -0.22629, 0.8264
-0.3, 73.99161, -2.90241, 6.3, -13.06945, 0.66484, -0.23860, 0.8492
-0.4, 58.53881, -1.71001, 6.2, -10.95674, 0.50386, -0.25817, 0.8412
-0.5, 46.91267, -0.93125, 6.1, -9.36813, 0.40094, -0.27491, 0.8188
-0.75, 43.47321, -0.50426, 6.2, -8.89132, 0.35245, -0.30295, 0.8183
-1.0, 32.93593, 0.08357, 6.1, -7.51731, 0.28394, -0.31387, 0.7954
-1.5, 25.11810, 0.51244, 6.1, -6.58828, 0.24816, -0.31414, 0.8706
-2.0, 21.84053, 0.61910, 6.1, -6.22484, 0.24654, -0.30737, 0.9512
-3.0, 9.41267, 1.23611, 5.9, -4.64883, 0.18193, -0.28698, 1.0442
-4.0, 0, 0, 0, 0, 0, 0, 0
-5.0, -0.08881, 1.63345, 5.7, -3.56561, 0.15429, -0.23807, 1.1854
-7.5, 0, 0, 0, 0, 0, 0, 0
-10.0, -6.91550, 1.66675, 5.4, -3.03522, 0.18615, -0.15158, 1.3092
+T, C1, C2, C3, C4, C5, C6
+10.0, -6.91550, 1.66675, 5.4, -3.03522, 0.18615, -0.15158
+7.5, 0, 0, 0, 0, 0, 0
+5.0, -.08881, 1.63345, 5.7, -3.56561, 0.15429, -0.23807
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 9.41267, 1.23611, 5.9, -4.64883, 0.18193, -0.28698
+2.0, 21.84053, 0.61910, 6.1, -6.22484, 0.24654, -0.30737
+1.5, 25.11810, 0.51244, 6.1, -6.58828, 0.24816, -0.31414
+1.0, 32.93593, 0.08357, 6.1, -7.51731, 0.28394, -0.31387
+0.75, 43.47321, -0.50426, 6.2, -8.89132, 0.35245, -0.30295
+0.5, 46.91267, -0.93125, 6.1, -9.36813, 0.40094, -0.27491
+0.4, 58.53881, -1.71001, 6.2, -10.95674, 0.50386, -0.25817
+0.3, 73.99161, -2.90241, 6.3, -13.06945, 0.66484, -0.23860
+0.25, 91.64108, -4.50724, 6.4, -15.47178, 0.88528, -0.22629
+0.2, 98.22293, -5.32783, 6.4, -16.41981, 1.00088, -0.20822
+0.15, 108.81360, -6.61834, 6.4, -17.96824, 1.18618, -0.18760
+0.10, 103.04320, -7.20814, 6.2, -17.48802, 1.29736, -0.16376
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 85.62312, -6.76578, 5.9, -15.41352, 1.27568, -0.13241
+0.03, 69.46166, -5.48027, 5.7, -13.19430, 1.10188, -0.13149
+0.02, 65.29077, -4.98649, 5.7, -12.56134, 1.02752, -0.14202
+0.01, 68.77858, -5.13883, 5.8, -13.00533, 1.04366, -0.14918
+PGA, 68.52187, -5.09631, 5.8, -12.96010, 1.03629, -0.14898
+PGV, 39.70192, -2.85255, 5.3, -8.55941, 0.80414, -0.15077
diff --git a/src/main/resources/gmm/coeffs/Wong15-530.csv b/src/main/resources/gmm/coeffs/Wong15-530.csv
new file mode 100755
index 0000000000000000000000000000000000000000..a6a455bdee2ec6bfbd23444697f0744447b3fa00
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15-530.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6
+10.0, -8.03767, 1.81000, 5.4, -2.85976, 0.16457, -0.15643
+7.5, 0, 0, 0, 0, 0, 0
+5.0, -1.25751, 1.78877, 5.7, -3.38239, 0.13112, -0.24196
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 8.15232, 1.40183, 5.9, -4.45366, 0.15768, -0.28962
+2.0, 20.94299, 0.69302, 6.1, -6.09092, 0.23685, -0.31168
+1.5, 25.01453, 0.42709, 6.1, -6.57384, 0.26243, -0.31979
+1.0, 38.35402, -0.41740, 6.2, -8.27339, 0.35831, -0.31925
+0.75, 44.88622, -0.88836, 6.2, -9.13036, 0.41238, -0.30586
+0.5, 48.98657, -1.46751, 6.1, -9.70979, 0.48418, -0.27903
+0.4, 54.65042, -2.00377, 6.1, -10.51665, 0.55588, -0.25843
+0.3, 61.09278, -2.53809, 6.1, -11.42838, 0.62602, -0.23021
+0.25, 74.60570, -3.59587, 6.2, -13.28874, 0.77046, -0.21288
+0.2, 80.00266, -4.15288, 6.2, -14.07377, 0.84958, -0.19862
+0.15, 98.80550, -5.92063, 6.3, -16.69061, 1.09728, -0.18137
+0.10, 103.48240, -7.16712, 6.2, -17.57100, 1.29274, -0.15638
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 80.43280, -6.40826, 5.8, -14.76011, 1.23307, -0.12840
+0.03, 71.87675, -5.81419, 5.7, -13.60719, 1.15756, -0.12684
+0.02, 61.90769, -4.87518, 5.6, -12.16475, 1.02174, -0.13495
+0.01, 64.88462, -5.00740, 5.7, -12.54193, 1.03547, -0.14146
+PGA, 64.73113, -4.98090, 5.7, -12.51300, 1.03056, -0.14120
+PGV, 39.64739, -2.89068, 5.3, -8.59420, 0.81631, -0.14725
diff --git a/src/main/resources/gmm/coeffs/Wong15-760.csv b/src/main/resources/gmm/coeffs/Wong15-760.csv
old mode 100644
new mode 100755
index dfbb03d6ee856241eccd0e64c974905d065f6694..32c8318a53091e98de555f0cb33b2ff18729d7df
--- a/src/main/resources/gmm/coeffs/Wong15-760.csv
+++ b/src/main/resources/gmm/coeffs/Wong15-760.csv
@@ -1,24 +1,24 @@
-T, C1, C2, C3, C4, C5, C6, sigma
-PGV, 38.93484, -2.83525, 5.3, -8.54137, 0.81287, -0.14409, 0.449
-PGA, 51.14649, -3.57103, 5.5, -10.59901, 0.82422, -0.12837, 0.8
-0.01, 51.52443, -3.61327, 5.5, -10.66384, 0.83166, -0.12816, 0.8
-0.02, 50.09983, -3.58159, 5.4, -10.50493, 0.83123, -0.11897, 0.8
-0.03, 57.97868, -4.17019, 5.5, -11.65156, 0.91463, -0.10812, 0.8
-0.05, 62.08216, -4.23285, 5.6, -12.16202, 0.91183, -0.10505, 0.8
-0.075, 0, 0, 0, 0, 0, 0, 0.8
-0.1, 71.43771, -4.06123, 5.9, -13.19303, 0.85325, -0.12811, 0.8
-0.15, 67.98064, -3.20709, 6.0, -12.52122, 0.71605, -0.15554, 0.8
-0.2, 67.73399, -2.80825, 6.1, -12.37446, 0.65295, -0.18027, 0.8
-0.25, 63.14175, -2.35722, 6.1, -11.69920, 0.58910, -0.19799, 0.8
-0.3, 57.95681, -1.92831, 6.1, -10.95883, 0.53184, -0.22169, 0.8
-0.4, 52.11226, -1.49083, 6.1, -10.14325, 0.47670, -0.25038, 0.8
-0.5, 47.53404, -1.20048, 6.1, -9.52729, 0.44397, -0.27306, 0.8
-0.75, 44.55770, -.86527, 6.2, -9.13144, 0.40982, -0.30304, 0.8
-1.0, 37.99058, -.39601, 6.2, -8.27053, 0.35640, -0.31746, 0.8
-1.5, 28.17415, 0.28135, 6.2, -7.01483, 0.28296, -0.32196, 0.8
-2.0, 20.33703, 0.67544, 6.1, -6.02319, 0.24061, -0.31542, 0.8
-3.0, 10.20900, 1.28757, 6.0, -4.75429, 0.17465, -0.29404, 0.8
-4.0, 0, 0, 0, 0, 0, 0, 0.8
-5.0, -2.19341, 1.87567, 5.7, -3.25694, 0.11873, -0.24647, 0.8
-7.5, 0, 0, 0, 0, 0, 0, 0.8
-10.0, -9.22402, 1.94021, 5.4, -2.69597, 0.14582, -0.15966, 0.8
+T, C1, C2, C3, C4, C5, C6
+10.0, -9.22402, 1.94021, 5.4, -2.69597, 0.14582, -0.15966
+7.5, 0, 0, 0, 0, 0, 0
+5.0, -2.19341, 1.87567, 5.7, -3.25694, 0.11873, -0.24647
+4.0, 0, 0, 0, 0, 0, 0
+3.0, 10.20900, 1.28757, 6.0, -4.75429, 0.17465, -0.29404
+2.0, 20.33703, 0.67544, 6.1, -6.02319, 0.24061, -0.31542
+1.5, 28.17415, 0.28135, 6.2, -7.01483, 0.28296, -0.32196
+1.0, 37.99058, -0.39601, 6.2, -8.27053, 0.35640, -0.31746
+0.75, 44.55770, -0.86527, 6.2, -9.13144, 0.40982, -0.30304
+0.5, 47.53404, -1.20048, 6.1, -9.52729, 0.44397, -0.27306
+0.4, 52.11226, -1.49083, 6.1, -10.14325, 0.47670, -0.25038
+0.3, 57.95681, -1.92831, 6.1, -10.95883, 0.53184, -0.22169
+0.25, 63.14175, -2.35722, 6.1, -11.69920, 0.58910, -0.19799
+0.2, 67.73399, -2.80825, 6.1, -12.37446, 0.65295, -0.18027
+0.15, 67.98064, -3.20709, 6.0, -12.52122, 0.71605, -0.15554
+0.10, 71.43771, -4.06123, 5.9, -13.19303, 0.85325, -0.12811
+0.075, 0, 0, 0, 0, 0, 0
+0.05, 62.08216, -4.23285, 5.6, -12.16202, 0.91183, -0.10505
+0.03, 57.97868, -4.17019, 5.5, -11.65156, 0.91463, -0.10812
+0.02, 50.09983, -3.58159, 5.4, -10.50493, 0.83123, -0.11897
+0.01, 51.52443, -3.61327, 5.5, -10.66384, 0.83166, -0.12816
+PGA, 51.14649, -3.57103, 5.5, -10.59901, 0.82422, -0.12837
+PGV, 38.93484, -2.83525, 5.3, -8.54137, 0.81287, -0.14409
diff --git a/src/main/resources/gmm/coeffs/Wong15.csv b/src/main/resources/gmm/coeffs/Wong15.csv
new file mode 100644
index 0000000000000000000000000000000000000000..2d601d6407b593f9c9140fc3709e23254f385d16
--- /dev/null
+++ b/src/main/resources/gmm/coeffs/Wong15.csv
@@ -0,0 +1,24 @@
+T, C1, C2, C3, C4, C5, C6, sigma
+PGV, 39.70192, -2.85255, 5.3, -8.55941, 0.80414, -0.15077, 0.4487
+PGA, 68.52187, -5.09631, 5.8, -12.96010, 1.03629, -0.14898, 0.7803
+0.01, 68.77858, -5.13883, 5.8, -13.00533, 1.04366, -0.14918, 0.7816
+0.02, 65.29077, -4.98649, 5.7, -12.56134, 1.02752, -0.14202, 0.7975
+0.03, 69.46166, -5.48027, 5.7, -13.19430, 1.10188, -0.13149, 0.8194
+0.05, 85.62312, -6.76578, 5.9, -15.41352, 1.27568, -0.13241, 0.8327
+0.075, 0, 0, 0, 0, 0, 0, 0
+0.1, 103.04320, -7.20814, 6.2, -17.48802, 1.29736, -0.16376, 0.8254
+0.15, 108.81360, -6.61834, 6.4, -17.96824, 1.18618, -0.18760, 0.8290
+0.2, 98.22293, -5.32783, 6.4, -16.41981, 1.00088, -0.20822, 0.8381
+0.25, 91.64108, -4.50724, 6.4, -15.47178, 0.88528, -0.22629, 0.8264
+0.3, 73.99161, -2.90241, 6.3, -13.06945, 0.66484, -0.23860, 0.8492
+0.4, 58.53881, -1.71001, 6.2, -10.95674, 0.50386, -0.25817, 0.8412
+0.5, 46.91267, -0.93125, 6.1, -9.36813, 0.40094, -0.27491, 0.8188
+0.75, 43.47321, -0.50426, 6.2, -8.89132, 0.35245, -0.30295, 0.8183
+1.0, 32.93593, 0.08357, 6.1, -7.51731, 0.28394, -0.31387, 0.7954
+1.5, 25.11810, 0.51244, 6.1, -6.58828, 0.24816, -0.31414, 0.8706
+2.0, 21.84053, 0.61910, 6.1, -6.22484, 0.24654, -0.30737, 0.9512
+3.0, 9.41267, 1.23611, 5.9, -4.64883, 0.18193, -0.28698, 1.0442
+4.0, 0, 0, 0, 0, 0, 0, 0
+5.0, -0.08881, 1.63345, 5.7, -3.56561, 0.15429, -0.23807, 1.1854
+7.5, 0, 0, 0, 0, 0, 0, 0
+10.0, -6.91550, 1.66675, 5.4, -3.03522, 0.18615, -0.15158, 1.3092