From e077533c7f4fd6e3ff46ed8e25873ed4cb1a6b13 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Wed, 18 Nov 2015 08:54:01 -0700
Subject: [PATCH] gmm input metadata mods
---
src/org/opensha2/gmm/GmmInput.java | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/org/opensha2/gmm/GmmInput.java b/src/org/opensha2/gmm/GmmInput.java
index e127a38bc..ca8c6dbbd 100644
--- a/src/org/opensha2/gmm/GmmInput.java
+++ b/src/org/opensha2/gmm/GmmInput.java
@@ -335,6 +335,7 @@ public class GmmInput {
}
private static final String DISTANCE_UNIT = "km";
+ private static final String VELOCITY_UNIT = "m/s";
private static final String ANGLE_UNIT = "°";
/**
@@ -349,94 +350,110 @@ public class GmmInput {
MAG(
"Magnitude",
+ "Mw",
"The moment magnitude of an earthquake",
Optional.<String> absent(),
6.5),
RJB(
"Joyner-Boore Distance",
+ "rJB",
"The shortest distance from a site to the surface projection of a rupture, in kilometers",
Optional.of(DISTANCE_UNIT),
10.0),
RRUP(
"Rupture Distance",
+ "rRup",
"The shortest distance from a site to a rupture, in kilometers",
Optional.of(DISTANCE_UNIT),
10.3),
RX(
"Distance X",
+ "rX",
"The shortest distance from a site to the extended trace a fault, in kilometers",
Optional.of(DISTANCE_UNIT),
10.0),
DIP(
"Dip",
+ "dip",
"The dip of a rupture surface, in degrees",
Optional.of(ANGLE_UNIT),
90.0),
WIDTH(
"Width",
+ "width",
"The width of a rupture surface, in kilometers",
Optional.of(DISTANCE_UNIT),
14.0),
ZTOP(
"Depth",
+ "zTop",
"The depth to the top of a rupture surface, in kilometers and positive-down",
Optional.of(DISTANCE_UNIT),
0.5),
ZHYP(
"Hypocentral Depth",
+ "zHyp",
"The depth to the hypocenter on a rupture surface, in kilometers and positive-down",
Optional.of(DISTANCE_UNIT),
7.5),
RAKE(
"Rake",
+ "rake",
"The rake (or sense of slip) of a rupture surface, in degrees",
Optional.of(ANGLE_UNIT),
0.0),
VS30(
+ "Vs30",
"Vs30",
"The average shear-wave velocity down to 30 meters, in kilometers per second",
- Optional.of("km/s"),
+ Optional.of("m/s"),
760.0),
VSINF(
"Vs30 Inferred",
+ "Inferred",
"Whether Vs30 was measured or inferred",
Optional.<String> absent(),
1.0),
Z1P0(
"Depth to Vs=1.0 km/s",
+ "z1.0",
"Depth to a shear-wave velocity of 1.0 kilometers per second, in kilometers",
Optional.of(DISTANCE_UNIT),
NaN),
Z2P5(
"Depth to Vs=2.5 km/s",
+ "z2.5",
"Depth to a shear-wave velocity of 2.5 kilometers per second, in kilometers",
Optional.of(DISTANCE_UNIT),
NaN);
public final String label;
+ public final String shortLabel;
public final String info;
public final Optional<String> units;
public final double defaultValue;
private Field(
String label,
+ String shortLabel,
String info,
Optional<String> units,
double defaultValue) {
this.label = label;
+ this.shortLabel = shortLabel;
this.info = info;
this.units = units;
this.defaultValue = defaultValue;
--
GitLab