From 3a1667b308b91b187d17c038993d13bfd8346c92 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 14 Nov 2022 14:25:59 -0700
Subject: [PATCH] matlab and doc edits
---
docs/pages/Site-Specification.md | 5 ++---
etc/matlab/gmmExample.m | 1 -
etc/matlab/response_spectra.m | 8 +++-----
.../gov/usgs/earthquake/nshmp/DisaggCalc.java | 19 +++++++++----------
.../earthquake/nshmp/www/meta/MetaUtil.java | 1 -
5 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/docs/pages/Site-Specification.md b/docs/pages/Site-Specification.md
index 2032f2375..544130a53 100644
--- a/docs/pages/Site-Specification.md
+++ b/docs/pages/Site-Specification.md
@@ -15,9 +15,9 @@ defaults are used:
```text
name: Unnamed
vs30: 760.0
- vsInf: true
z1p0: null (GMM will use default basin depth model)
z2p5: null (GMM will use default basin depth model)
+ zSed: null
```
For basin depth parameters `z1p0` and `z2p5`, a `null` value indicates that a GMM should use
@@ -27,7 +27,7 @@ it's 'default' basin depth scale factor, which is usually included in it's Vs30
* Header row must identify columns.
* Valid and [optional] column names are:
- `[name,] lon, lat [, vs30] [, vsInf] [, z1p0] [, z2p5]`
+ `[name,] lon, lat [, vs30] [, z1p0] [, z2p5]`
* At a minimum, `lon` and `lat` must be defined.
* Columns can be in any order and any missing fields will be populated with the default values
listed above.
@@ -57,7 +57,6 @@ A site list is expected as a `FeatureCollection` of `Point` features. For exampl
"properties": {
"title": "Oakland CA",
"vs30": 760.0,
- "vsInf": true,
"z1p0": 0.048,
"z2p5": 0.607
}
diff --git a/etc/matlab/gmmExample.m b/etc/matlab/gmmExample.m
index 22cbd3633..ef6438030 100644
--- a/etc/matlab/gmmExample.m
+++ b/etc/matlab/gmmExample.m
@@ -49,7 +49,6 @@ input.zTop = 1.0; % in km
input.zHyp = 6.0; % in km
input.rake = 0.0; % in degrees
input.vs30 = 760.0; % in m/s
-input.vsInf = true; % boolean
input.z2p5 = NaN; % in km; NaN triggers default basin depth model
input.z1p0 = NaN; % in km; NaN triggers default basin depth model
diff --git a/etc/matlab/response_spectra.m b/etc/matlab/response_spectra.m
index a0943694b..bb9bc73c7 100644
--- a/etc/matlab/response_spectra.m
+++ b/etc/matlab/response_spectra.m
@@ -31,13 +31,12 @@ rJB = 10;
rRup = 10.012;
rX = 10;
vs30 = 760;
-vsInf = true;
zHyp = 7.5;
zTop = 0.5;
url = createUrl( ...
urlbase, gmms, ...
- Mw, dip, rake, width, rJB, rRup, rX, vs30, vsInf, zHyp, zTop);
+ Mw, dip, rake, width, rJB, rRup, rX, vs30, zHyp, zTop);
%% Call web service
% Open a browser window with the web service URL to show the JSON response
@@ -116,7 +115,7 @@ set(l, 'Interpreter', 'none')
function url = createUrl( ...
urlbase, gmms, ...
- Mw, dip, rake, width, rJB, rRup, rX, vs30, vsInf, zHyp, zTop)
+ Mw, dip, rake, width, rJB, rRup, rX, vs30, zHyp, zTop)
url = urlbase;
for i = 1:size(gmms, 2)
@@ -135,7 +134,6 @@ function url = createUrl( ...
"&rRup=" + num2str(rRup) + ...
"&rX=" + num2str(rX) + ...
"&vs30=" + num2str(vs30) + ...
- "&vsInf=" + string(vsInf) + ...
"&zHyp=" + num2str(zHyp) + ...
"&zTop=" + num2str(zTop);
-end
\ No newline at end of file
+end
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
index c98ce8701..0c726e199 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
@@ -70,34 +70,34 @@ public class DisaggCalc {
/**
* Entry point for the disaggregation of probabilisitic seismic hazard.
*
- * <p>Two approaches to disaggregation of seimic hazard are possible with this
- * application. In the first approach, the 'sites' file is the same as it
+ * <p> Two approaches to disaggregation of seimic hazard are possible with
+ * this application. In the first approach, the 'sites' file is the same as it
* would be for a hazard calculation, and disaggregation is performed for all
* configured intensity measures at the 'returnPeriod' (in years) of interest
* specified in the config file (default = 2475 years, equivalent to 2% in 50
* years).
*
- * <p>In the second approach, the sites file includes columns for each
+ * <p> In the second approach, the sites file includes columns for each
* spectral period or other intensity measure and the target ground motion
* level to disaggregate for each. For example, the target values could be a
* risk-targeted spectral accelerations, or they could be ground motion levels
* precomputed for a specific return period.
*
- * <p>Note that the first approach will do the full hazard calculation and
+ * <p> Note that the first approach will do the full hazard calculation and
* compute hazard curves from which the target disaggregation ground motion
* level will be determined. In the second approach, the ground motion targets
* are known and the time consuming hazard curve calculation can be avoided.
*
- * <p>Please refer to the nshmp-haz <a
+ * <p> Please refer to the nshmp-haz <a
* href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/docs">
* docs</a> for comprehensive descriptions of source models, configuration
* files, site files, and hazard calculations.
*
- * @see <a
- * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md">
+ * @see <a href=
+ * "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/blob/main/docs/pages/Building-&-Running.md">
* nshmp-haz Building & Running</a>
- * @see <a
- * href="https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples">
+ * @see <a href=
+ * "https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples">
* example calculations</a>
*/
public static void main(String[] args) {
@@ -224,7 +224,6 @@ public class DisaggCalc {
Site.Key.LAT,
Site.Key.LON,
Site.Key.VS30,
- Site.Key.VS_INF,
Site.Key.Z1P0,
Site.Key.Z2P5);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java
index a1a2c0684..9c653fbea 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/MetaUtil.java
@@ -39,7 +39,6 @@ public final class MetaUtil {
JsonObject json = new JsonObject();
json.add("location", loc);
json.addProperty("vs30", site.vs30());
- json.addProperty("vsInferred", site.vsInferred());
json.addProperty("z1p0", Double.isNaN(site.z1p0()) ? null : site.z1p0());
json.addProperty("z2p5", Double.isNaN(site.z2p5()) ? null : site.z2p5());
--
GitLab