From c87063e484324ccfa930f9917386b1e9b71c352e Mon Sep 17 00:00:00 2001
From: Jason Altekruse <jaltekruse@usgs.gov>
Date: Wed, 30 Jun 2021 16:52:42 -0600
Subject: [PATCH] add navigation, fix links, add web services pages (referenced
in Model-Editions.md)
---
docs/README.md | 1 +
docs/pages/Calculation-Configuration.md | 4 +-
docs/pages/Logic-Trees-&-Uncertainty.md | 53 ++++++++--------
docs/pages/Model-Editions.md | 80 ++++++++++++++-----------
docs/pages/NSHMP-Web-Services.md | 12 ++++
docs/pages/Site-Specification.md | 3 +-
docs/pages/USGS-Models.md | 14 ++---
7 files changed, 98 insertions(+), 69 deletions(-)
create mode 100644 docs/pages/NSHMP-Web-Services.md
diff --git a/docs/README.md b/docs/README.md
index 3eba4574a..95e2a6cfb 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -29,6 +29,7 @@ to use *nshmp-haz-v2* as well as underlying model implementation details.
* [USGS Models](./pages/USGS-Models.md)
* [Model Editions](./pages/Model-Editions.md)
* [Logic Trees & Uncertainty](./pages/Logic-Trees-&-Uncertainty.md)
+* [NSHMP Web Services](./pages/NSHMP-Web-Services.md#nshmp-web-services)
## Other Pages & References
diff --git a/docs/pages/Calculation-Configuration.md b/docs/pages/Calculation-Configuration.md
index 3966cfa69..c3d9150dc 100644
--- a/docs/pages/Calculation-Configuration.md
+++ b/docs/pages/Calculation-Configuration.md
@@ -51,7 +51,7 @@ __`performance`__
[url-datatype]: https://earthquake.usgs.gov/nshmp/docs/nshmp-lib/gov/usgs/earthquake/nshmp/calc/DataType.html
[url-sheets]: https://earthquake.usgs.gov/nshmp/docs/nshmp-lib/gov/usgs/earthquake/nshmp/calc/ThreadCount.html
-## Notes
+### Notes
1. `hazard.truncationLevel`: This value is only used if the `hazard.exceedanceModel` requires a
limit (e.g. `TRUNCATION_UPPER_ONLY`)
@@ -59,7 +59,7 @@ __`performance`__
been defined, this value en/disables this feature.
3. `hazard.customImls`: Hazard is computed at default intensity measure levels (IMLs) for every
supported intenisty measure type (IMT), but a user can specify different IMLs as needed (see
- this [example](../../etc/examples/2-custom-config/README.md) and the
+ [example 2](../../etc/examples/2-custom-config/README.md) and the
table of default IMLs, below).
4. `disagg.bins`: This field maps to a data container that specifies the following default ranges
and intervals for distance, magnitude, and epsilon binning: `"bins": { "rMin": 0.0, "rMax":
diff --git a/docs/pages/Logic-Trees-&-Uncertainty.md b/docs/pages/Logic-Trees-&-Uncertainty.md
index 57c05cda5..093ac1981 100644
--- a/docs/pages/Logic-Trees-&-Uncertainty.md
+++ b/docs/pages/Logic-Trees-&-Uncertainty.md
@@ -15,8 +15,8 @@ alternative models.
| Description | 2008 | 2014 | 2018 |
|:----------- |:----- |:---- |:---- |
-| CEUS | __0.1__ : AB_06 (140 bar)<br />__0.1__ : AB_06 (200 bar)<br />__0.1__ : CAMPBELL_03<br />__0.1__ : FRANKEL_96<br />__0.1__ : SILVA_02<br />__0.2__ : SOMERVILLE_01<br />__0.2__ : TORO_97<br />__0.1__ : TP_05 | __0.22__ : AB_06'<br />__0.08__ : ATKINSON_08'<br />__0.11__ : CAMPBELL_03<br />__0.06__ : FRANKEL_96<br />__0.15__ : PEZESHK_11<br />__0.06__ : SILVA_02<br />__0.10__ : SOMERVILLE_01<br />__0.11__ : TORO_97<br />__0.11__ : TP_05 | __0.667__ : NGA_EAST_USGS (17)<br />__0.333__ : NGA_EAST_SEEDS (14)<br />(common aleatory variability) |
-| Sigma Epistemic | _(none)_ | _(no change)_ | __0.2__ : USGS Panel<br />__0.8__ : EPRI |
+| CEUS | __0.1__ : AB_06 (140 bar)<br>__0.1__ : AB_06 (200 bar)<br>__0.1__ : CAMPBELL_03<br>__0.1__ : FRANKEL_96<br>__0.1__ : SILVA_02<br>__0.2__ : SOMERVILLE_01<br>__0.2__ : TORO_97<br>__0.1__ : TP_05 | __0.22__ : AB_06'<br>__0.08__ : ATKINSON_08'<br>__0.11__ : CAMPBELL_03<br>__0.06__ : FRANKEL_96<br>__0.15__ : PEZESHK_11<br>__0.06__ : SILVA_02<br>__0.10__ : SOMERVILLE_01<br>__0.11__ : TORO_97<br>__0.11__ : TP_05 | __0.667__ : NGA_EAST_USGS (17)<br>__0.333__ : NGA_EAST_SEEDS (14)<br>(common aleatory variability) |
+| Sigma Epistemic | _(none)_ | _(no change)_ | __0.2__ : USGS Panel<br>__0.8__ : EPRI |
| Site Aleatory | _(none)_ | _(no change)_ | __0.185, 0.63, 0.185__ : Site ± σ |
---
@@ -25,8 +25,8 @@ alternative models.
| Description | 2008 | 2014 | 2018 |
|:----------- |:----- |:---- |:---- |
-| WUS | __0.3333__ : BA_08<br />__0.3333__ : CB_08<br />__0.3334__ : CY_08 | __0.22__ : ASK_14<br />__0.22__ : BSSA_14<br />__0.22__ : CB_14<br />__0.22__ : CY_14<br />__0.22__ : IDRISS_14 | __0.25__ : ASK_14<br />__0.25__ : BSSA_14<br />__0.25__ : CB_14<br />__0.25__ : CY_14 |
-| Mean Epistemic | NGA-West1 (M,R)<br />__0.185__ : epi+<br />__0.630__ : off<br />__0.185__ : epi- | NGA-West2 (M,R)<br />__0.185__ : epi+<br />__0.630__ : off<br />__0.185__ : epi- | _(no change)_ |
+| WUS | __0.3333__ : BA_08<br>__0.3333__ : CB_08<br>__0.3334__ : CY_08 | __0.22__ : ASK_14<br>__0.22__ : BSSA_14<br>__0.22__ : CB_14<br>__0.22__ : CY_14<br>__0.22__ : IDRISS_14 | __0.25__ : ASK_14<br>__0.25__ : BSSA_14<br>__0.25__ : CB_14<br>__0.25__ : CY_14 |
+| Mean Epistemic | NGA-West1 (M,R)<br>__0.185__ : epi+<br>__0.630__ : off<br>__0.185__ : epi- | NGA-West2 (M,R)<br>__0.185__ : epi+<br>__0.630__ : off<br>__0.185__ : epi- | _(no change)_ |
---
@@ -34,8 +34,8 @@ alternative models.
| Description | 2008 | 2014 | 2018 |
|:----------- |:----- |:---- |:---- |
-| Cascadia<br />(interface) | __0.25__ : AB_03 (global)<br />__0.25__ : YOUNGS_97<br />__0.50__ : ZHAO_06 | __0.1__ : AB_03 (global)<br />__0.3__ : AM_09<br />__0.3__ : BCHYDRO_12<br />__0.3__ : ZHAO_06 | __0.3333__ : AM_09<br />__0.3334__ : BCHYDRO_12<br />__0.3333__ : ZHAO_06 |
-| Cascadia<br />(slab) | __0.25__ : AB_03 (global)<br />__0.25__ : AB_03 (cascadia)<br />__0.50__ : YOUNGS_97 | __0.1665__ : AB_03 (global, mod)<br />__0.1665__ : AB_03 (cascadia, mod)<br />__0.3330__ : BCHYDRO_12<br />__0.3340__ : ZHAO_06 | __0.5__ : BCHYDRO_12<br />__0.5__ : ZHAO_06 |
+| Cascadia<br>(interface) | __0.25__ : AB_03 (global)<br>__0.25__ : YOUNGS_97<br>__0.50__ : ZHAO_06 | __0.1__ : AB_03 (global)<br>__0.3__ : AM_09<br>__0.3__ : BCHYDRO_12<br>__0.3__ : ZHAO_06 | __0.3333__ : AM_09<br>__0.3334__ : BCHYDRO_12<br>__0.3333__ : ZHAO_06 |
+| Cascadia<br>(slab) | __0.25__ : AB_03 (global)<br>__0.25__ : AB_03 (cascadia)<br>__0.50__ : YOUNGS_97 | __0.1665__ : AB_03 (global, mod)<br>__0.1665__ : AB_03 (cascadia, mod)<br>__0.3330__ : BCHYDRO_12<br>__0.3340__ : ZHAO_06 | __0.5__ : BCHYDRO_12<br>__0.5__ : ZHAO_06 |
---
@@ -43,8 +43,8 @@ alternative models.
| Model | Description | 2008 | 2014 | 2018 |
|:----- |:----------- |:---- |:---- |:---- |
-| Deformation | | __1.0__ : GEO | __0.1__ : BIRD<br />__0.8__ : GEO<br />__0.1__ : ZENG | _(no change)_ |
-| Rupture | | __0.5__ : Full<br /> __0.5__ : Partial | _(no change)_ | _(no change)_ |
+| Deformation | | __1.0__ : GEO | __0.1__ : BIRD<br>__0.8__ : GEO<br>__0.1__ : ZENG | _(no change)_ |
+| Rupture | | __0.5__ : Full<br> __0.5__ : Partial | _(no change)_ | _(no change)_ |
| Magnitude Scaling | | __1.0__ : Somerville-01 (area) | _(no change)_ | _(no change)_ |
| Maximum M¹ | Partial: epistemic | __0.2, 0.6, 0.2__ : M ± 0.2 | _(no change)_ | _(no change)_ |
| | Full : epistemic | __0.2, 0.6, 0.2__ : M ± 0.2 | _(no change)_ | _(no change)_ |
@@ -58,7 +58,7 @@ alternative models.
| Model | Description | 2008 | 2014 | 2018 |
|:----- |:----------- |:---- |:---- |:---- |
-| Deformation | | __1.0__ : GEO | __0.1__ : BIRD<br />__0.8__ : GEO<br />__0.1__ : ZENG | _(no change)_ |
+| Deformation | | __1.0__ : GEO | __0.1__ : BIRD<br>__0.8__ : GEO<br>__0.1__ : ZENG | _(no change)_ |
| Rupture | Partial | __0.333__ : IMW, __0.5__ : PNW | _(no change)_ | _(no change)_ |
| | Full | __0.667__ : IMW, __0.5__ : PNW | _(no change)_ | _(no change)_ |
| Magnitude Scaling | | __1.0__ : WC_94 (length) | _(no change)_ | _(no change)_ |
@@ -74,9 +74,9 @@ alternative models.
| Model | Description | 2008 | 2014 | 2018 |
|:----- |:----------- |:---- |:---- |:---- |
-| Maximum M | WUS (exceptions) | __1.0__ : 7.0 | __0.9__ : 7.5 (truncated)<br />__0.1__ : 8.0 (tapered) | _(no change)_ |
-| | CEUS (craton) | __0.1__ : 6.6<br />__0.2__ : 6.8<br />__0.5__ : 7.0<br />__0.2__ : 7.2 | __0.2__ : 6.5<br />__0.5__ : 7.0<br />__0.2__ : 7.5<br />__0.1__ : 8.0 | _(no change)_ |
-| Smoothing | | __1.0__ : Fixed |__0.4__ : Adaptive<br />__0.6__ : Fixed | _(no change)_ |
+| Maximum M | WUS (exceptions) | __1.0__ : 7.0 | __0.9__ : 7.5 (truncated)<br>__0.1__ : 8.0 (tapered) | _(no change)_ |
+| | CEUS (craton) | __0.1__ : 6.6<br>__0.2__ : 6.8<br>__0.5__ : 7.0<br>__0.2__ : 7.2 | __0.2__ : 6.5<br>__0.5__ : 7.0<br>__0.2__ : 7.5<br>__0.1__ : 8.0 | _(no change)_ |
+| Smoothing | | __1.0__ : Fixed |__0.4__ : Adaptive<br>__0.6__ : Fixed | _(no change)_ |
| Magnitude Scaling | CEUS & WUS | __1.0__ : WC_94 (length) | _(no change)_ | _(no change)_ |
| Focal Mechanisms | Spatially Varying | __1.0__ : assigned | _(no change)_ | _(no change)_ |
| Depth (zTor) | WUS, M < 6.5 | __1.0__ : 5.0 km | _(no change)_ | _(no change)_ |
@@ -89,11 +89,11 @@ alternative models.
| Model | 2014 | 2018 |
|:----- |:---- |:---- |
-| Fault | __0.5__ : FM3.1<br /> __0.5__ : FM3.2 | _(no change)_ |
-| Deformation | __0.1__ : ABM<br />__0.3__ : BIRD<br />__0.3__ : GEO<br />__0.3__ : ZENG | _(no change)_ |
-| Scaling Relationship<br />(mag-area & slip-length)| __0.2__ : ELLS_B<br />__0.2__ : ELLS_B (sqrt-L)<br />__0.2__ : HB_08<br />__0.2__ : SHAW_09<br />__0.2__ : SHAW_09 (csd) | _(no change)_ |
-| Slip Distribution | __0.5__ : Tapered<br />__0.5__ : Boxcar | _(no change)_ |
-| M ≥ 5 rate (yrâ»Â¹) | __0.1__ : 6.5<br />__0.6__ : 7.9<br />__0.3__ : 9.6 | _(no change)_ |
+| Fault | __0.5__ : FM3.1<br> __0.5__ : FM3.2 | _(no change)_ |
+| Deformation | __0.1__ : ABM<br>__0.3__ : BIRD<br>__0.3__ : GEO<br>__0.3__ : ZENG | _(no change)_ |
+| Scaling Relationship<br>(mag-area & slip-length)| __0.2__ : ELLS_B<br>__0.2__ : ELLS_B (sqrt-L)<br>__0.2__ : HB_08<br>__0.2__ : SHAW_09<br>__0.2__ : SHAW_09 (csd) | _(no change)_ |
+| Slip Distribution | __0.5__ : Tapered<br>__0.5__ : Boxcar | _(no change)_ |
+| M ≥ 5 rate (yrâ»Â¹) | __0.1__ : 6.5<br>__0.6__ : 7.9<br>__0.3__ : 9.6 | _(no change)_ |
| Inversion Constraint | __1.0__ : UCERF2 (CH) | _(no change)_ |
| Fault Mo Rate | __1.0__ : off | _(no change)_ |
@@ -103,8 +103,8 @@ alternative models.
| Model | 2014 | 2018 |
|:----- |:---- |:---- |
-| Grid: Maximum M | __0.1__ : 7.3<br />__0.8__ : 7.6<br />__0.1__ : 7.9 | _(no change)_ |
-| Grid: Smoothing | __0.5__ : Adaptive<br />__0.5__ : Fixed | _(no change)_ |
+| Grid: Maximum M | __0.1__ : 7.3<br>__0.8__ : 7.6<br>__0.1__ : 7.9 | _(no change)_ |
+| Grid: Smoothing | __0.5__ : Adaptive<br>__0.5__ : Fixed | _(no change)_ |
| Grid: Focal Mechanisms | __1.0__ : assigned | _(no change)_ |
| Magnitude Scaling | __1.0__ : WC_94 (length) | _(no change)_ |
@@ -114,18 +114,23 @@ alternative models.
| Model | 2008 | 2014 | 2018 |
|:----- |:---- |:---- |:---- |
-| Rupture | __0.67__ : Full<br />__0.33__ : Partial | __1.0__ : Full<br />__0.5__ : Partial (segmented)<br />__0.5__ : Partial (unsegmented) | _(no change)_ |
-| Magnitude Scaling | __1.0__ : Youngs et al. (length) | __0.334__ : Strasser et al. (2010)<br />__0.333__ : Murotani et al. (2008)<br />__0.333__ : Papazachos et al. (2004) | _(no change)_ |
+| Rupture | __0.67__ : Full<br>__0.33__ : Partial | __1.0__ : Full<br>__0.5__ : Partial (segmented)<br>__0.5__ : Partial (unsegmented) | _(no change)_ |
+| Magnitude Scaling | __1.0__ : Youngs et al. (length) | __0.334__ : Strasser et al. (2010)<br>__0.333__ : Murotani et al. (2008)<br>__0.333__ : Papazachos et al. (2004) | _(no change)_ |
| Magnitude Uncertainty | __0.2, 0.6, 0.2__ : M±0.2 | _(none)_ | _(no change)_ |
-| Depth | __0.5__ : Base<br />__0.2__ : Bottom<br />__0.2__ : Middle<br />__0.1__ : Top | __0.3__ : Bottom<br />__0.5__ : Middle<br />__0.2__ : Top | _(no change)_ |
-| Slab: Maximum M | __1.0__ : 7.2 | __0.9__ : 7.5<br />__0.1__ : 8.0 | _(no change)_ |
+| Depth | __0.5__ : Base<br>__0.2__ : Bottom<br>__0.2__ : Middle<br>__0.1__ : Top | __0.3__ : Bottom<br>__0.5__ : Middle<br>__0.2__ : Top | _(no change)_ |
+| Slab: Maximum M | __1.0__ : 7.2 | __0.9__ : 7.5<br>__0.1__ : 8.0 | _(no change)_ |
* Full: a.k.a. 'characteristic'
* Partial: a.k.a. 'Gutenberg-Richter' or 'floating'
---
-[**Documentation Index**](../README.md)
+## Related Pages
+
+* [USGS Models](./USGS-Models.md#usgs-models)
+ * [Model Editions](./Model-Editions.md#model-editions)
+ * [Logic Trees & Uncertainty](./Logic-Trees-&-Uncertainty.md#logic-trees-&-uncertainty)
+* [**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
diff --git a/docs/pages/Model-Editions.md b/docs/pages/Model-Editions.md
index c47e2f313..44dba3c5b 100644
--- a/docs/pages/Model-Editions.md
+++ b/docs/pages/Model-Editions.md
@@ -7,10 +7,10 @@ data, or modeling procedures that warrant a model update. Every model the USGS p
associated with a USGS Open-File report or refereed journal article and supporting datasets.
However, layered on top of any given model release are bug-fixes and model improvements.
-With the update to a new codebase, [nshmp-haz](https://github.com/usgs/nshmp-haz), the NSHMP has
-adopted [semantic versioning](http://semver.org) to keep track of different hazard models. For
-any given model region, the first number (or major version) corresponds to a particular release
-or update year. For example, we consider the initial
+With the update to a new codebase, [nshmp-haz-v2](https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2),
+the NSHMP has adopted [semantic versioning](http://semver.org) to keep track of different hazard
+models. For any given model region, the first number (or major version) corresponds to a particular
+release or update year. For example, we consider the initial
[1996 conterminous U.S. NSHM](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#1996)
to be v1.0.0. The second number (or minor version) reflects updates to a particular release that
likely causes small changes to hazard values. The third number reflects non-hazard altering
@@ -19,33 +19,38 @@ hazard.
The USGS NSHMP is committed to supporting current and prior model releases in any given region
via web services. The table below provides a summary of all NSHM releases and their corresponding
-version numbers.
+version numbers. Links to documentation and data for each of the models below are listed on the USGS
+[Seismic Hazard Maps and Site-Specific Data](https://www.usgs.gov/natural-hazards/earthquake-hazards/seismic-hazard-maps-and-site-specific-data)
+page.
+
+TODO: confirm model versions, tags, links (github vs gitlab...), and availability
Region | Year | Version | Static | Dynamic | Notes |
-------|:----:|:-------:|:------:|:-------:|-------|
-Conterminous U.S. | [2014](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2014) | [v4.2.0](https://github.com/usgs/nshmp-model-cous-2014/releases/tag/v4.2.0)<sup>†</sup> | |:small_blue_diamond:| |
-Conterminous U.S. | [2014](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2014) | [v4.1.4](https://github.com/usgs/nshmp-model-cous-2014/releases/tag/v4.1.4)<sup>†</sup> | |:small_blue_diamond:| |
-Conterminous U.S. | [2014](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2014) | [v4.0.0](https://github.com/usgs/nshmp-haz-fortran/releases/tag/nshm2014r1) |:small_blue_diamond:| | ASCE7-16 |
-Conterminous U.S. | [2008](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2008) | v3.3.3 | |:small_blue_diamond:| |
-Conterminous U.S. | [2008](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2008) | [v3.2.0](https://github.com/usgs/nshmp-haz-fortran/releases/tag/nshm2008r3) |:small_blue_diamond:| | |
-Conterminous U.S. | [2008](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2008) | v3.1.0 |:small_blue_diamond:| | ASCE7-10 |
-Conterminous U.S. | [2008](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2008) | v3.0.0 | | | |
-Conterminous U.S. | [2002](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2002) | v2.0.0 | | | |
-Conterminous U.S. | [1996](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#1996) | v1.0.0 | | | |
-Alaska | [2007](https://earthquake.usgs.gov/hazards/hazmaps/ak/index.php#2007) | v2.1.0 | |:small_blue_diamond:| |
-Alaska | [2007](https://earthquake.usgs.gov/hazards/hazmaps/ak/index.php#2007) | v2.0.0 |:small_blue_diamond:| | ASCE7-10 |
-Alaska | [1999](https://earthquake.usgs.gov/hazards/hazmaps/ak/index.php#1999) | v1.0.0 | | | |
-American Samoa | [2012](https://earthquake.usgs.gov/hazards/hazmaps/islands.php#samoapacific) | v1.0.0 | | | |
-Guam | [2012](https://pubs.usgs.gov/of/2012/1015/) | v1.0.0 | | | |
-Hawaii | [2018](https://earthquake.usgs.gov/hazards/hazmaps/islands.php#hi) | v2.0.0 | | TBD | |
-Hawaii | [1998](https://earthquake.usgs.gov/hazards/hazmaps/islands.php#hi) | v1.1.0 | | TBD | |
-Hawaii | [1998](https://earthquake.usgs.gov/hazards/hazmaps/islands.php#hi) | v1.0.0 |:small_blue_diamond:| | ASCE7-10 |
-Puerto Rico & <br/> U.S. Virgin Islands | [2003](https://earthquake.usgs.gov/hazards/hazmaps/islands.php#prvi) | v1.0.0 | | | |
+Conterminous U.S. | 2018 | [v5.0.0](https://code.usgs.gov/ghsc/nshmp/nshm-conus-2018)<sup>†</sup> | |:small_blue_diamond:| |
+Conterminous U.S. | 2014 | [v4.2.0](https://github.com/usgs/nshmp-model-cous-2014/releases/tag/v4.2.0)<sup>†</sup> | |:small_blue_diamond:| |
+Conterminous U.S. | 2014 | [v4.1.4](https://github.com/usgs/nshmp-model-cous-2014/releases/tag/v4.1.4)<sup>†</sup> | |:small_blue_diamond:| |
+Conterminous U.S. | 2014 | [v4.0.0](https://github.com/usgs/nshmp-haz-fortran/releases/tag/nshm2014r1) |:small_blue_diamond:| | ASCE7-16 |
+Conterminous U.S. | 2008 | v3.3.3 | |:small_blue_diamond:| |
+Conterminous U.S. | 2008 | [v3.2.0](https://github.com/usgs/nshmp-haz-fortran/releases/tag/nshm2008r3) |:small_blue_diamond:| | |
+Conterminous U.S. | 2008 | v3.1.0 |:small_blue_diamond:| | ASCE7-10 |
+Conterminous U.S. | 2008 | v3.0.0 | | | |
+Conterminous U.S. | 2002 | v2.0.0 | | | |
+Conterminous U.S. | 1996 | v1.0.0 | | | |
+Alaska | 2007 | v2.1.0 | |:small_blue_diamond:| |
+Alaska | 2007 | v2.0.0 |:small_blue_diamond:| | ASCE7-10 |
+Alaska | 1999 | v1.0.0 | | | |
+American Samoa | 2012 | v1.0.0 | | | |
+Guam | 2012 | v1.0.0 | | | |
+Hawaii | 2018 | v2.0.0 | | TBD | |
+Hawaii | 1998 | v1.1.0 | | TBD | |
+Hawaii | 1998 | v1.0.0 |:small_blue_diamond:| | ASCE7-10 |
+Puerto Rico & <br/> U.S. Virgin Islands | 2003 | v1.0.0 | | | |
<sup>†</sup> __Note on the 2014 Conterminous U.S. NSHM:__ Initial publication of the
-[2014 model](https://earthquake.usgs.gov/hazards/hazmaps/conterminous/index.php#2014) included
-data to support updates to the U.S. Building Code, specifically hazard curves for peak ground
-acceleration (PGA), and 0.2 and 1.0 second spectral accelerations, all at a BC boundary site
+[2014 model](https://www.usgs.gov/natural-hazards/earthquake-hazards/science/2014-united-states-lower-48-seismic-hazard-long-term)
+included data to support updates to the U.S. Building Code, specifically hazard curves for peak
+ground acceleration (PGA), and 0.2 and 1.0 second spectral accelerations, all at a BC boundary site
class with Vs30 = 760 m/s. Some time later, the model was deployed to the Unified Hazard Tool
(UHT) and included support in the Wester U.S. for calculations at sites other than Vs30 = 760 m/s,
consistent with dynamic calculations using the 2008 model. Subsequently, we updated the 2014
@@ -85,24 +90,31 @@ bound to use those values adopted by the U.S. building code, one of the editions
is probably most appropriate. However, if one is bound to use the most up to date source model,
one of the dynamic editions is likely better.
-Dynamic editions are supported through web-services provided by the `nshmp-haz-ws` library
-(this repository). Static editions are supported via a separate set of services. Both are
-documented on the [web services](web-services) page.
+TODO: do we want to reference `nshmp-haz-ws` and is this the correct reference here?
+
+Dynamic editions are supported through web-services provided by the `nshmp-haz-ws` library.
+Static editions are supported via a separate set of services. Both are documented on the
+[web services](./NSHMP-Web-Services.md#nshmp-web-services) page.
## Region specific changes
Changes between editions in model regions are documented in the release notes of the individual
model repositories.
-TODO: Update model links
+TODO: model links currently point to github repos
-* [Conterminous US (2014)](/usgs/nshmp-model-cous-2014/wiki)
-* [Conterminous US (2008)](/usgs/nshmp-model-cous-2008/wiki)
-* [Alaska (2007)](/usgs/nshmp-model-ak-2007/wiki)
+* [Conterminous US (2014)](https://github.com/usgs/nshm-cous-2014)
+* [Conterminous US (2008)](https://github.com/usgs/nshm-cous-2008)
+* [Alaska (2007)](https://github.com/usgs/nshm-ak-2007)
---
-[**Documentation Index**](../README.md)
+## Related Pages
+
+* [USGS Models](./USGS-Models.md#usgs-models)
+ * [Model Editions](./Model-Editions.md#model-editions)
+ * [Logic Trees & Uncertainty](./Logic-Trees-&-Uncertainty.md#logic-trees-&-uncertainty)
+* [**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
diff --git a/docs/pages/NSHMP-Web-Services.md b/docs/pages/NSHMP-Web-Services.md
new file mode 100644
index 000000000..ccd7d2faf
--- /dev/null
+++ b/docs/pages/NSHMP-Web-Services.md
@@ -0,0 +1,12 @@
+# NSHMP Web Services
+
+TODO: this page is referenced in [`Model-Editions.md`](./Model-Editions.md#static-vs-dynamic). Need
+a description of the available web services and static data.
+
+---
+
+[**Documentation Index**](../README.md)
+
+---
+ [U.S. Geological Survey](https://www.usgs.gov)
+National Seismic Hazard Mapping Project ([NSHMP](https://earthquake.usgs.gov/hazards/))
diff --git a/docs/pages/Site-Specification.md b/docs/pages/Site-Specification.md
index b6699d151..fca0e1068 100644
--- a/docs/pages/Site-Specification.md
+++ b/docs/pages/Site-Specification.md
@@ -1,6 +1,5 @@
# Site Specification
-
The sites at which to perform hazard and related calculations may be defined in a variety of
ways. Examples of the file formats described below are available in the resource directory:
[`etc/nshm`](../../etc/nshm/README.md).
@@ -20,7 +19,7 @@ entire string in double quotes.
For any site parameter values that are not supplied on the command line or in the file formats
below, the following defaults are used (see the `site` member of the
-[configuration](./Calculation-Configuration.md) file):
+[configuration parameter](./Calculation-Configuration.md#calculation-configuration-parameters) table):
```text
name: Unnamed
diff --git a/docs/pages/USGS-Models.md b/docs/pages/USGS-Models.md
index 6a686b063..3ad949174 100644
--- a/docs/pages/USGS-Models.md
+++ b/docs/pages/USGS-Models.md
@@ -6,7 +6,7 @@ years. This window is narrowing, however, and updates are also being undertaken
models for states and territories outside the conterminous U.S. These pages describe the models
that are available and some of the history and versions of each. The models are intended for use
with the USGS probabilistic earthquake hazard codebase:
-[*nshmp-haz-v2*](https://github.com/usgs/nshmp-haz).
+[*nshmp-haz-v2*](https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2).
As specified in this documentation, NSHM files are organized by tectonic setting and then further
by source type. For larger models, such as that of the conterminous U.S., sources are commonly
@@ -18,8 +18,8 @@ page for links to all published models.
Each model region has a dedicated repository with version tags marking different model editions:
-* [Conterminous U.S.](/ghsc/nshmp/nshm-conus)
-* [Hawaii](/ghsc/nshmp/nshm-hawaii)
+* [Conterminous U.S.](https://code.usgs.gov/ghsc/nshmp/nshm-conus)
+* [Hawaii](https://code.usgs.gov/ghsc/nshmp/nshm-hawaii)
* Alaska - _update not yet published_
* Guam & Marianas - _update not yet published_
* Puerto Rico & U.S. Virgin Islands - _update not yet published_
@@ -29,10 +29,10 @@ Each model region has a dedicated repository with version tags marking different
## Related Pages
-* [Model Editions](model-editions.md)
-* [Logic Trees & Uncertainty](logic-trees-&-uncertainty.md)
-
-[**Documentation Index**](../README.md)
+* [USGS Models](./USGS-Models.md#usgs-models)
+ * [Model Editions](./Model-Editions.md#model-editions)
+ * [Logic Trees & Uncertainty](./Logic-Trees-&-Uncertainty.md#logic-trees-&-uncertainty)
+* [**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
--
GitLab