diff --git a/docs/pages/Site-Specification.md b/docs/pages/Site-Specification.md
index 2032f23752936ca1a11a8572a473f6e6024ee3ff..544130a53fc138a8384a7c5155b3058da61c1430 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 22cbd36331752982ce832b4e6d7fd45e1caf1376..ef643803018d3a8fd90b178486a7ff0a4de362a7 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 a0943694b3c23eea527bee0958e589598ca1070c..bb9bc73c7228d8706d13fcd231d4ed37e3d64a38 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/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
index 3425f0a5a3a608d9800b9d92761c45123a173e31..f04c7190b45da51b7725acabb77c9f279d5f4ec7 100644
--- a/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2a-fast/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
[
- { "id": "ASK_14_BASE", "weight": 1.0 }
+ { "id": "ASK_14_VS30_MEASURED", "weight": 1.0 }
]
diff --git a/etc/peer/models/Set2-Case2a-fast/sites.csv b/etc/peer/models/Set2-Case2a-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2a-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
index 3425f0a5a3a608d9800b9d92761c45123a173e31..f04c7190b45da51b7725acabb77c9f279d5f4ec7 100644
--- a/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2a/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
[
- { "id": "ASK_14_BASE", "weight": 1.0 }
+ { "id": "ASK_14_VS30_MEASURED", "weight": 1.0 }
]
diff --git a/etc/peer/models/Set2-Case2a/sites.csv b/etc/peer/models/Set2-Case2a/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2a/sites.csv
+++ b/etc/peer/models/Set2-Case2a/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2b-fast/sites.csv b/etc/peer/models/Set2-Case2b-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2b-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2b/sites.csv b/etc/peer/models/Set2-Case2b/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2b/sites.csv
+++ b/etc/peer/models/Set2-Case2b/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2c-fast/sites.csv b/etc/peer/models/Set2-Case2c-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2c-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2c-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2c/sites.csv b/etc/peer/models/Set2-Case2c/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2c/sites.csv
+++ b/etc/peer/models/Set2-Case2c/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json b/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
index 621c1ab1d988df52a31b7e0c0f55c6cf41de9d6d..b6df255630c09b5c554c1a8c55d138c3913bd9e9 100644
--- a/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
+++ b/etc/peer/models/Set2-Case2d-fast/active-crust/gmm-tree.json
@@ -1,3 +1,3 @@
[
- { "id": "CY_14_BASE", "weight": 1.0 }
+ { "id": "CY_14_VS30_MEASURED", "weight": 1.0 }
]
diff --git a/etc/peer/models/Set2-Case2d-fast/sites.csv b/etc/peer/models/Set2-Case2d-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2d-fast/sites.csv
+++ b/etc/peer/models/Set2-Case2d-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case2d/sites.csv b/etc/peer/models/Set2-Case2d/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case2d/sites.csv
+++ b/etc/peer/models/Set2-Case2d/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3a-fast/sites.csv b/etc/peer/models/Set2-Case3a-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3a-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3a/sites.csv b/etc/peer/models/Set2-Case3a/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3a/sites.csv
+++ b/etc/peer/models/Set2-Case3a/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3b-fast/sites.csv b/etc/peer/models/Set2-Case3b-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3b-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3b/sites.csv b/etc/peer/models/Set2-Case3b/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3b/sites.csv
+++ b/etc/peer/models/Set2-Case3b/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3c-fast/sites.csv b/etc/peer/models/Set2-Case3c-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3c-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3c-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3c/sites.csv b/etc/peer/models/Set2-Case3c/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3c/sites.csv
+++ b/etc/peer/models/Set2-Case3c/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3d-fast/sites.csv b/etc/peer/models/Set2-Case3d-fast/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3d-fast/sites.csv
+++ b/etc/peer/models/Set2-Case3d-fast/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case3d/sites.csv b/etc/peer/models/Set2-Case3d/sites.csv
index f87b4f6c4dcbcc3c5e7fa1083ab095689856a276..4fec53983cdc09e54484ee9d152302cbb009d43b 100644
--- a/etc/peer/models/Set2-Case3d/sites.csv
+++ b/etc/peer/models/Set2-Case3d/sites.csv
@@ -1,7 +1,7 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault3-Site1,-64.91005, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site2,-65.04497, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site3,-65.08995, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site4,-65.13490, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site5,-65.22483, 0.00000,760,false,0.048,0.607
-PEER S2-Fault3-Site6,-65.00900,-0.42718,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault3-Site1,-64.91005, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site2,-65.04497, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site3,-65.08995, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site4,-65.13490, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site5,-65.22483, 0.00000,760,0.048,0.607
+PEER S2-Fault3-Site6,-65.00900,-0.42718,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4a-fast/sites.csv b/etc/peer/models/Set2-Case4a-fast/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4a-fast/sites.csv
+++ b/etc/peer/models/Set2-Case4a-fast/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4a/sites.csv b/etc/peer/models/Set2-Case4a/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4a/sites.csv
+++ b/etc/peer/models/Set2-Case4a/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4b-fast/sites.csv b/etc/peer/models/Set2-Case4b-fast/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4b-fast/sites.csv
+++ b/etc/peer/models/Set2-Case4b-fast/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case4b/sites.csv b/etc/peer/models/Set2-Case4b/sites.csv
index 37f17e6637586ca5384a572aaf78a4731ec480f6..82ec41bbd5f5073c5b5af52c80218a2a7d002c7b 100644
--- a/etc/peer/models/Set2-Case4b/sites.csv
+++ b/etc/peer/models/Set2-Case4b/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault5-Site1,-65.00900, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault5-Site1,-65.00900, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case5a/sites.csv b/etc/peer/models/Set2-Case5a/sites.csv
index a89656bccce20189ff44b4224bc46e1010589184..6d1f6f186dd52882cf8c4d4e6ce33cffd28d2739 100644
--- a/etc/peer/models/Set2-Case5a/sites.csv
+++ b/etc/peer/models/Set2-Case5a/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault6-Site1,-65.13490, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault6-Site1,-65.13490, 0.00000,760,0.048,0.607
diff --git a/etc/peer/models/Set2-Case5b/sites.csv b/etc/peer/models/Set2-Case5b/sites.csv
index a89656bccce20189ff44b4224bc46e1010589184..6d1f6f186dd52882cf8c4d4e6ce33cffd28d2739 100644
--- a/etc/peer/models/Set2-Case5b/sites.csv
+++ b/etc/peer/models/Set2-Case5b/sites.csv
@@ -1,2 +1,2 @@
-name,lon,lat,vs30,vsInf,z1p0,z2p5
-PEER S2-Fault6-Site1,-65.13490, 0.00000,760,false,0.048,0.607
+name,lon,lat,vs30,z1p0,z2p5
+PEER S2-Fault6-Site1,-65.13490, 0.00000,760,0.048,0.607
diff --git a/gradle.properties b/gradle.properties
index 935b741dd56a4eb856d3e652512bd91a6e3106d9..c2233801c9b2ed1202f6f84d904ce39b34aff273 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,7 +11,7 @@ micronautVersion = 3.2.3
micronautRxVersion = 2.1.1
nodePluginVersion = 3.0.1
nodeVersion = 16.3.0
-nshmpLibVersion = 1.2.2
+nshmpLibVersion = 1.2.6
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
index c98ce87010fdb04c897227cfe35d88ebf975834d..0c726e1992079a3b2c71dea971cf165be12eec85 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 a1a2c068400b60b52532e01acb7d912b1dbde6e0..9c653fbea8f7f14180318e92b4b55a48cc4d7c80 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());