diff --git a/docs/README.md b/docs/README.md
index fcf5ab4e0f5b0e006ac6ab89dcbb8ab624eae00d..df638f0cc21a3633f3b8285e44952bc42182cded 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -3,7 +3,7 @@
***nshmp-haz*** is a U.S. Geological Survey ([USGS](https://www.usgs.gov)) developed software stack
that supports probabilistic seismic hazard (PSHA) and related analyses. It is maintained by the
National Seismic Hazard Model Project ([NSHMP](https://earthquake.usgs.gov/hazards/)) within the
-USGS's earthquake hazards program ([EHP](http://earthquake.usgs.gov)).
+USGS [Earthquake Hazards Program](http://earthquake.usgs.gov).
*nshmp-haz* supports high performance seismic hazard calculations required to generate detailed
maps over large areas and supports a variety of web services and applications related to
@@ -18,8 +18,8 @@ use *nshmp-haz* as well as underlying model implementation details.
* [Developer Basics](./pages/Developer-Basics.md)
* [Calculation Configuration](./pages/Calculation-Configuration.md)
* [Site Specification](./pages/Site-Specification.md)
- * [Examples](../../etc/examples)
- * [Web Services](./pages/Web-Services.md)
+ * [Using Docker](./pages/Using-Docker.md)
+ * See also the [examples](../../etc/examples) directory
* [Hazard Model](./pages/Hazard-Model.md)
* [Model Structure](./pages/Model-Structure.md)
* [Model Files](./pages/Model-Files.md)
diff --git a/docs/pages/About-the-NSHMP.md b/docs/pages/About-the-NSHMP.md
index 54d1297ad82570ff8f21271163570e29c90a794f..042f137bbdeeda0fc20ac08cd6eb20c62bc666cc 100644
--- a/docs/pages/About-the-NSHMP.md
+++ b/docs/pages/About-the-NSHMP.md
@@ -18,7 +18,7 @@ considered in other industries such as real estate lending. A 9-member steering
academic and industry experts provides technical oversight and recommendations to the NSHMP.
An NSHM defines the set of likely earthquake sources and their rates in a particular region. Given
-parameters of the earhtquake source and a site of interest, ground motion models (GMMs) are used
+parameters of the earthquake source and a site of interest, ground motion models (GMMs) are used
to estimate ground shaking from the set of earthquakes. The NSHMP routinely updates NSHMs for the
U.S. and its territories to consider the best available science.
diff --git a/docs/pages/Building-&-Running.md b/docs/pages/Building-&-Running.md
index 8464fb14d48b867f701a17c770c59e4294996aed..df8228892ee2eae40d3e76d3dbe7624769906415 100644
--- a/docs/pages/Building-&-Running.md
+++ b/docs/pages/Building-&-Running.md
@@ -1,18 +1,6 @@
# Building & Running
-## Related Pages
-
-* [Building & Running](./Building-&-Running.md#building-&-running)
- * [Developer Basics](./Developer-Basics.md#developer-basics)
- * [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration)
- * [Site Specification](./Site-Specification.md#site-specification)
- * [Examples](../../etc/examples)
- * [Web Services](./Web-Services.md)
-
-## Build & Run Options
-
-* [Build and run locally](#build-and-run-locally)
-* [Run with Docker](#run-with-docker)
+[TOC]
## Build and Run Locally
@@ -21,8 +9,8 @@ Building and running *nshmp-haz* requires prior installation of Git and Java. Pl
### Building
-Navigate to a location on your system where you want *nshmp-haz* code to reside, clone the
-repository, and compile:
+*nshmp-haz* uses the [Gradle](https://gradle.org/) build tool. Navigate to a location on your
+system where you want *nshmp-haz* code to reside, clone the repository, and compile:
```bash
cd /path/to/project/directory
@@ -36,206 +24,108 @@ This creates a single file, `build/libs/nshmp-haz.jar` that may be used for haza
users using the native command prompt). This executes any tasks (e.g. `assemble`) after
downloading all required dependencies, including Gradle itself.
-### Computing Hazard
+### Running
-The `HazardCalc` program computes hazard curves at one or more sites for a variety of intensity
-measures. For example:
-
-```bash
-java -cp path/to/nshmp-haz.jar gov.usgs.earthquake.nshmp.HazardCalc model sites [config]
-```
-
-At a minimum, the hazard source [model](./Hazard-Model.md) and the [site](./Site-Specification.md)(s)
-at which to perform calculations must be specified. The source model should specified a path to a
-directory. A single site may be specified with a string; multiple sites must be specified using
-either a comma-delimited (CSV) or [GeoJSON](http://geojson.org) file. The path to a custom
-[configuration](./Calculation-Configuration.md) file containing user-specific settings may optionally
-be supplied as a third argument. It can be used to override any calculation settings; if absent
-[default](./Calculation-Configuration.md) values are used.
+*nshmp-haz* applications may be run from the command line or as a local web service. Command line
+applications are recommended for long running hazard and disaggregation calculations, but most
+users will find the web service endpoints to be more flexible. Web services return
+[JSON](https://www.json.org/json-en.html) responses that can be parsed by most programming
+languages and data analaysis and visualization programs (e.g. Matlab).
-See the [examples](../../etc/examples) directory for more details (or
-[on GitLab](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples))
+### Web Services
-### Computing Disaggregations
-
-Like `HazardCalc`, the `DisaggCalc` program performs disaggregations at one or more sites for a
-variety of intensity measures. The return period for the disaggregation is defined in the config,
-see [`disagg.returnPeriod`](./Calculation-Configuration.md#calculation-configuration-parameters).
-Example:
+To run *nshmp-haz* web services:
```bash
-java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.DisaggCalc model sites [config]
+./gradlew run
+# or './gradlew run -t' to recompile and relaunch when code changes
```
-Disaggregations build on and output `HazardCalc` results along with other disaggregation specific
-files. Disaggregations also have some independent
-[configuration](./Calculation-Configuration.md#calculation-configuration-parameters) options.
-
-## Run with [Docker](https://docs.docker.com/install/)
-
-nshmp-haz is available as a public image from [Docker hub](https://hub.docker.com/r/usgs/nshmp-haz)
-with tags:
-
-* `latest`: Refers to the latest updates from the main or production branch
-* `development-latest`: Refers to forks of the repository.
-* `staging-latest`: Latest updates associated with the
-[main](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main) branch
-* `production-latest`: Latest stable release associated with the
-[production](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/production) branch
-
-To ensure you have the latest *nshmp-haz* update associated with a specific tag,
-always first pull the image from Docker:
+By default, when the web services start up, they load the 2018 NSHM for the conterminous U.S.
+To use a different model run the web services using Java and specify model path:
```bash
-docker pull usgs/nshmp-haz:<tag>
-```
-
-> Replace `<tag>` with one of the above tags.
-
-Example:
-
-```bash
-docker pull usgs/nshmp-haz:production-latest
+./gradlew assemble
+java -jar build/libs/nshmp-haz.jar --model=path/to/model
```
-### Docker Memory on Mac
+After startup, web services and documentation are available at <http://localhost:8080/>.
-By default, Docker Desktop for Mac is set to use 2 GB runtime memory. To run *nshmp-haz*, the
-memory available to Docker must be [increased](https://docs.docker.com/docker-for-mac/#advanced)
-to a minimum of 4 GB.
+See the [Matlab](../../etc/matlab) directory for examples of how to call the web services. To
+run the ground motion model (GMM) web services, please use the
+[*nshmp-haz-ws*](https://code.usgs.gov/ghsc/nshmp/nshmp-ws) repository.
-### Run nshmp-haz in Docker
+### Command Line Hazard Calculation
-The *nshmp-haz* application may be run as a Docker container which mitigates the need to install
-Git, Java, or other dependencies besides Docker. A public image is available
-from [Docker hub](https://hub.docker.com/r/usgs/nshmp-haz)
-which can be run with:
+The `HazardCalc` program computes hazard curves at one or more sites for a variety of intensity
+measures. For example:
```bash
-# Pull docker image
-docker pull usgs/nshmp-haz:latest
-
-# Run docker image
-docker run \
- --env CLASS_NAME=<DisaggCalc | HazardCalc | RateCalc> \
- --env IML=<NUMBER> \
- --env RETURN_PERIOD=<NUMBER> \
- --volume /absolute/path/to/sites/file:/app/sites.<geojson | csv> \
- --volume /absolute/path/to/config/file:/app/config.json \
- --volume /absolute/path/to/output:/app/output \
- usgs/nshmp-haz
+java -cp path/to/nshmp-haz.jar gov.usgs.earthquake.nshmp.HazardCalc model sites [config]
```
-Where:
-
-* `CLASS_NAME` is the nshmp-haz class to run:
- * [DisaggCalc](../../src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java)
- * [HazardCalc](../../src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java)
- * [RateCalc](../../src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java)
-* Other arguments (local files mapped to files within the Docker container with `:/app/...`):
- * (required) The absolute path to a [USGS model (NSHM)](./USGS-Models.md)
- * Example: `$(pwd)/nshm-hawaii:/app/model`
- * (required) The absolute path to a GeoJSON or CSV [site(s)](./Site-Specification.md) file
- * CSV example: `$(pwd)/my-csv-sites.csv:/app/sites.csv`
- * GeoJSON example: `$(pwd)/my-geojson-sites.geojson:/app/sites.geojson`
- * (required) The absolute path to an output directory
- * Example: `$(pwd)/my-hazard-output:/app/output`
- * (optional) The absolute path to a [configuration](./Calculation-Configuration.md) file
- * Example: `$(pwd)/my-custom-config.json:/app/config.json`
-
-### Docker Examples
-
-#### [`HazardCalc`](../../src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java) Example
+At a minimum, the hazard source [model](./Hazard-Model.md) and the
+[site](./Site-Specification.md)(s) at which to perform calculations must be specified. The source
+model should specified a path to a directory. A single site may be specified with a string;
+multiple sites must be specified using either a comma-delimited (CSV) or
+[GeoJSON](http://geojson.org) file. The path to a custom
+[configuration](./Calculation-Configuration.md) file containing user-specific settings may
+optionally be supplied as a third argument. It can be used to override any calculation settings;
+if absent [default](./Calculation-Configuration.md) values are used.
-The following example runs the `HazardCalc` program in nshmp-haz with the
-[nshm-hawaii](https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git) model and the
-assumption a GeoJSON [site](./Site-Specification.md) file exists named `sites.geojson`.
+See the [examples](../../etc/examples) directory for more details.
-```bash
-# Download Hawaii NSHM
-git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git
-
-# Pull image
-docker pull usgs/nshmp-haz:latest
-
-# Run nshmp-haz HazardCalc
-docker run \
- --env CLASS_NAME="HazardCalc" \
- --volume "$(pwd)/nshm-hawaii:/app/model" \
- --volume "$(pwd)/sites.geojson" \
- --volume "$(pwd)/hawaii-hazard-output:/app/output" \
- usgs/nshmp-haz
-```
+### Command Line Disaggregation Calculation
-#### [`DisaggCalc`](../../src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java) Example
-
-The following example runs the `DisaggCalc` program in nshmp-haz with the
-[nshm-hawaii](https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git) model and the
-assumption a GeoJSON [site](./Site-Specification.md) file exists named `sites.geojson`.
+Like `HazardCalc`, the `DisaggCalc` program performs disaggregations at one or more sites for a
+variety of intensity measures. The return period for the disaggregation is defined in the config,
+see [`disagg.returnPeriod`](./Calculation-Configuration.md#calculation-configuration-parameters).
+Example:
```bash
-# Download Hawaii NSHM
-git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git
-
-# Pull image
-docker pull usgs/nshmp-haz:latest
-
-# Run nshmp-haz DisaggCalc
-docker run \
- --env CLASS_NAME="DisaggCalc" \
- --env RETURN_PERIOD=475 \
- --volume "$(pwd)/nshm-hawaii:/app/model" \
- --volume "$(pwd)/sites.geojson" \
- --volume "$(pwd)/hawaii-disagg-output:/app/output" \
- usgs/nshmp-haz:latest
+java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.DisaggCalc model sites [config]
```
-#### [`RateCalc`](../../src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java) Example
-
-The following example runs the `RateCalc` program in nshmp-haz with the
-[nshm-hawaii](https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git) model and the
-assumption a GeoJSON [site](./Site-Specification.md) file exists named `sites.geojson`.
+Disaggregations build on and output `HazardCalc` results along with other disaggregation specific
+files. Disaggregations also have some independent
+[configuration](./Calculation-Configuration.md#calculation-configuration-parameters) options.
-```bash
-# Download Hawaii NSHM
-git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git
-
-# Pull image
-docker pull usgs/nshmp-haz:latest
-
-# Run nshmp-haz RateCalc
-docker run \
- --env CLASS_NAME="RateCalc" \
- --volume "$(pwd)/nshm-hawaii:/app/model" \
- --volume "$(pwd)/sites.geojson" \
- --volume "$(pwd)/hawaii-rate-output:/app/output" \
- usgs/nshmp-haz
-```
+## Customizing Code
-### Run Customization
+Whereas *nshmp-haz* contains code to run command line applications and web services, model
+loading and hazard calculations are handled in the dependent library
+[*nshmp-lib*](https://code.usgs.gov/ghsc/nshmp/nshmp-lib). To use a local, modified version of
+*nshmp-lib*, set an environment variable `NSHMP_LIB_LOCAL=true` and *nshmp-haz*
+will look for *nshmp-lib* in a directory adjacent to *nshmp-haz*. If *nshmp-lib* is located
+somewhere else, modify the path specified in
+[`gradle/dependencies.gradle`](../../gradle/dependencies.gradle). When using a local version
+of *nshmp-lib*, first build the *nshmp-lib* project using `./gradlew fatJar` so that
+required dependencies are included.
-When running *nshmp-haz* with Docker the maximum JVM memory size can
-be set with the environment flag (-e, -env):
+Summary of steps to check out and start running code for local development:
```bash
-docker run \
- --env JAVA_MEMORY=<MEMORY> \
- ...
- usgs/nshmp-haz
-
-# Example
-docker run \
- --env JAVA_MEMORY="12g" \
- ...
- usgs/nshmp-haz
+# --> Set a NSHMP_LIB_LOCAL=true environment variable on your system
+cd yourProjectDirectory
+git clone https://code.usgs.gov/ghsc/nshmp/nshmp-lib.git
+cd nshmp-lib
+./gradlew fatJar
+cd ..
+git clone https://code.usgs.gov/ghsc/nshmp/nshmp-haz.git
+cd nshmp-haz
+./gradlew run
```
-Where:
-
-* `JAVA_MEMORY` is the maximum memory for the JVM (default: 8g)
-
---
+## Related Pages
+
+* [Building & Running](./Building-&-Running.md#building-&-running)
+ * [Developer Basics](./Developer-Basics.md#developer-basics)
+ * [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration)
+ * [Site Specification](./Site-Specification.md#site-specification)
+ * [Using Docker](./Using-Docker.md#using-docker)
+ * See also the [examples](../../etc/examples) directory
* [**Documentation Index**](../README.md)
---
diff --git a/docs/pages/Calculation-Configuration.md b/docs/pages/Calculation-Configuration.md
index 097e8d5920e0c6c435c45b261826c3fcde7822b4..0ba6e1faa5fb9725015765502fef5ed5133c6869 100644
--- a/docs/pages/Calculation-Configuration.md
+++ b/docs/pages/Calculation-Configuration.md
@@ -13,7 +13,7 @@ may be overridden. See [building and running](./Building-&-Running.md) and the
Parameter | Type | Default | Notes |
--------- | ---- | ------- | ----- |
-__`hazard`__
+**`hazard`**
`.exceedanceModel` |`String` | `"TRUNCATION_3SIGMA_UPPER"`| [`ExceedanceModel`][url-exceedance]
`.truncationLevel` |`Double` | `3.0` | [1](#notes)
`.imts` |`String[]` | `["PGV","PGA","SA0P01","SA0P02",`<br>`"SA0P03","SA0P05","SA0P075",`<br>`"SA0P1","SA0P15","SA0P2","SA0P25",`<br>`"SA0P3","SA0P4","SA0P5","SA0P75",`<br>`"SA1P0","SA1P5","SA2P0","SA3P0",`<br>`"SA4P0","SA5P0","SA7P5","SA10P0"]` | [`Imt`][url-imt]
@@ -23,25 +23,25 @@ __`hazard`__
`.useSiteData` |`Boolean` | `true` | Enable site data (e.g. basin depths)
`.customImls` |`Map<String, Double[]>` | `{}` (empty object) | [2](#notes)
`.valueFormat` |`String` | `"ANNUAL_RATE"` | [`ValueFormat`][url-valueformat]
-__`gmm`__
+**`gmm`**
`.dampingRatio` |`Double` | `0.05` (5%) | Limited to range [0.005..0.3] 0.5% to 30%
`.sigmaScale` |`Double` | `1.0` (100%, no scaling) | Limited to range [0.5..1.0] 50% to 100%
`.vertical` |`Boolean` | `false` | Compute vertical ground motions
-__`disagg`__
+**`disagg`**
`.returnPeriod` |`Double` | `2475` |
`.bins` |`Object` | | [4](#notes)
`.contributorLimit` |`Double` | `0.1` | [5](#notes)
-__`rate`__
+**`rate`**
`.bins` |`Object` | | [6](#notes)
`.distance` |`Double` | `20` km
`.distributionFormat` |`String` | `"INCREMENTAL"` | [`DistributionFormat`][url-distribution]
`.timespan` |`Double` | `30` years
`.valueFormat` |`String` | `"ANNUAL_RATE"` | [`ValueFormat`][url-valueformat]
-__`output`__ |
+**`output`** |
`.directory` |`String` | `hazout`
`.dataTypes` |`String[]` | `["TOTAL","MAP"]` | [`DataType`][url-datatype]
`.returnPeriods` |`Double[]` | `[475,975,2475,10000]` | [`ReturnPeriods`][url-returnperiods]
-__`performance`__
+**`performance`**
`.optimizeGrids` |`Boolean` | `true` | [7](#notes)
`.smoothGrids` |`Boolean` | `true` | [8](#notes)
`.systemPartition` |`Integer` | `1000` | [9](#notes)
@@ -109,9 +109,9 @@ T ≤ 10 s | 0.000333, 0.000499, 0.000749, 0.00112, 0.00169, 0.00253, <br>0.00
* [Developer Basics](./Developer-Basics.md#developer-basics)
* [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration)
* [Site Specification](./Site-Specification.md#site-specification)
- * [Examples](../../etc/examples) (or
- [on GitLab](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples))
-* [__Documentation Index__](../README.md)
+ * [Using Docker](./Using-Docker.md#using-docker)
+ * See also the [examples](../../etc/examples) directory
+* [**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
diff --git a/docs/pages/Code-Versions.md b/docs/pages/Code-Versions.md
index 801a9b66faf3a8eef92d1605d50b02a7a16b6d39..973190a4bbfd150422780efe85fe0f415ad19db4 100644
--- a/docs/pages/Code-Versions.md
+++ b/docs/pages/Code-Versions.md
@@ -1,35 +1,35 @@
# Code Versions
The static datasets of USGS NSHMs prior to 2014 were computed using Fortran (see
-[_nshmp-haz-fortran_](https://github.com/usgs/nshmp-haz-fortran])). The static datasets for the
+[*nshmp-haz-fortran*](https://github.com/usgs/nshmp-haz-fortran])). The static datasets for the
2014 Conterminous U.S. NSHM were computed using the Fortran codes and
[OpenSHA](https://opensha.org/) (for the California portion of the model). The dynamic versions
of the 2008 and 2014 Conterminous U.S. models were then implemented in the 1st version of
-[_nshmp-haz_](https://github.com/usgs/nshmp-haz) (on GitHub). This updated Java codebase uses XML
+[*nshmp-haz*](https://github.com/usgs/nshmp-haz) (on GitHub). This updated Java codebase uses XML
source models and supports the web services behind the dynamic calculations of the [Unified Hazard
Hazard Tool](https://earthquake.usgs.gov/hazards/interactive/) (UHT).
-The 2nd version of _nshmp-haz_ (this repository) supercedes prior codebases. The development of this
+The 2nd version of *nshmp-haz* (this repository) supercedes prior codebases. The development of this
version involved a significant refactoring of both the computational code and source model format.
The source models are now defined using JSON, GeoJSON, and CSV files to better reflect the
underlying logic trees and support uncertainty analysis.
-## Transitioning from _nshmp-haz_ v1 to v2
+## Transitioning from *nshmp-haz* v1 to v2
NSHMs are very detailed and migrating from one format to another is not trivial and prone to error.
Moreover, approximations (e.g. using 3.1415 for Pi rather than the the value built into most
languages) can yield different results. When multiple such small changes exist, deciphering what
is giving rise to differences in results can be challenging.
-To document the transition from _nshmp-haz_ v1 to v2, we here attach comparison maps at four return
+To document the transition from *nshmp-haz* v1 to v2, we here attach comparison maps at four return
periods (475, 975, 2475, and 10,000 year) for the 2018 Conterminous U.S. model. Maps are included
for PGA and 3 spectral periods ( 0.2 s, 1 s, and 5 s). There are no differences in the Central &
Eastern U.S. and differences in the WUS are <<1%. The difference in hazard in the vicinity of
-Salt Lake City arises from the cluster models in _nshmp-haz_ v1 not being able to consider the
+Salt Lake City arises from the cluster models in *nshmp-haz* v1 not being able to consider the
additional epistemic uncertainty added to the the NGA-West2 ground motion models.
We continue to investigate the cause of other differences but they are small enough that we are
-comfortable moving forward deploying _nshmp-haz_ v2 codes and models to our public web services and
+comfortable moving forward deploying *nshmp-haz* v2 codes and models to our public web services and
applications. This repository includes end-to-end tests for supported NSHMs that may be run
on demand.
diff --git a/docs/pages/Developer-Basics.md b/docs/pages/Developer-Basics.md
index 17da9de70699c0cb144dd0f8a3c47899975c393a..346ace6479fb6f141107d9f25728f5cbe9df3691 100644
--- a/docs/pages/Developer-Basics.md
+++ b/docs/pages/Developer-Basics.md
@@ -50,15 +50,6 @@ cd /directory/for/code
git clone https://code.usgs.gov/ghsc/nshmp/nshmp-haz.git
```
-## Eclipse Integration (Optional)
-
-Eclipse provides automatic compilation, syntax highlighting, and integration with Git, among
-other useful features. To build or modify *nshmp-haz* using [Eclipse](http://www.eclipse.org/),
-install the [Eclipse IDE for Java Developers](https://www.eclipse.org/downloads/packages/) or
-[Eclipse IDE for Enterprise Java and Web Developers](https://www.eclipse.org/downloads/packages/),
-if you plan on developing web services. Import the project into Eclipse: `File > Import >
-Gradle > Existing Gradle Project`
-
---
## Related Pages
@@ -67,8 +58,8 @@ Gradle > Existing Gradle Project`
* [Developer Basics](./Developer-Basics.md#developer-basics)
* [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration)
* [Site Specification](./Site-Specification.md#site-specification)
- * [Examples](../../etc/examples) (or
- [on GitLab](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples))
+ * [Using Docker](./Using-Docker.md#using-docker)
+ * See also the [examples](../../etc/examples) directory
* [**Documentation Index**](../README.md)
---
diff --git a/docs/pages/Functional-PSHA.md b/docs/pages/Functional-PSHA.md
index 0b936d6c172bf47d1b0d0bce55f18878a22204d5..b797d8f6a26d0db7a363a56f5d0b4c4726de4557 100644
--- a/docs/pages/Functional-PSHA.md
+++ b/docs/pages/Functional-PSHA.md
@@ -29,17 +29,17 @@ in magnitude, *M*, and distance, *R*). This formulation relies on models of grou
give the probability that an intensity measure level of interest will be exceeded conditioned on
the occurrence of a particular earthquake. Such models are commonly referred to as:
-* __Intensity measure relationships__
-* __Attenuation relationships__
-* __Ground motion prediction equations (GMPEs)__
-* __Ground motion models (GMMs)__
+* **Intensity measure relationships**
+* **Attenuation relationships**
+* **Ground motion prediction equations (GMPEs)**
+* **Ground motion models (GMMs)**
The parameterization of modern models (e.g. NGA-West2; Bozorgnia et al., 2014) extends to much
more than magnitude and distance, including, but not limited to:
-* __Multiple distance metrics__ (e.g. rJB, rRup, rX, rY)
-* __Fault geometry__ (e.g. dip, width, rupture depth, hypocentral depth)
-* __Site characteristics__ (e.g. basin depth terms, site type or Vs30 value)
+* **Multiple distance metrics** (e.g. rJB, rRup, rX, rY)
+* **Fault geometry** (e.g. dip, width, rupture depth, hypocentral depth)
+* **Site characteristics** (e.g. basin depth terms, site type or Vs30 value)
## Simple, yes, but used for so much more…
@@ -119,10 +119,10 @@ foreach IMT {
Break the traditional PSHA formulation down into discrete steps and preserve the data associated
with each step:
-* __[1]__ Source & Site parameterization
-* __[2]__ Ground motion calculation (mean and standard deviation only)
-* __[3]__ Exceedance curve calculation (per source)
-* __[4]__ Recombine
+* **[1]** Source & Site parameterization
+* **[2]** Ground motion calculation (mean and standard deviation only)
+* **[3]** Exceedance curve calculation (per source)
+* **[4]** Recombine
Whereas the traditional pipeline looks something like this:
@@ -132,9 +132,9 @@ The functional pipeline can be processed stepwise:
-__Need a disaggregation?__ Revisit and parse the results of steps 1 and 2
+**Need a disaggregation?** Revisit and parse the results of steps 1 and 2
-__Need a response spectra?__ Spawn more calculations, one for each IMT, at step 2.
+**Need a response spectra?** Spawn more calculations, one for each IMT, at step 2.
## Benefits
@@ -161,7 +161,7 @@ __Need a response spectra?__ Spawn more calculations, one for each IMT, at step
---
-[__Documentation Index__](../README.md)
+[**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
diff --git a/docs/pages/Ground-Motion-Models.md b/docs/pages/Ground-Motion-Models.md
index 4419608b253ecbb12e63dbf91aee99498d324aec..cb69268a8757f50219ed9686a8918dc5b8fb33e7 100644
--- a/docs/pages/Ground-Motion-Models.md
+++ b/docs/pages/Ground-Motion-Models.md
@@ -5,7 +5,7 @@ the occurrence of various earthquakes. The following tables list the GMMs suppor
is not uncommon for a GMM to have multiple concrete implementations. For instance, most subduction
GMMs, as published, support both interface and intraslab events.
-[[_TOC_]]
+[TOC]
## GMM Configuration
@@ -44,7 +44,7 @@ The following sample `gmm-config.json` file applies the NGA-West 2 epistemic unc
## GMM Uncertainty Models
-_nshmp-haz_ supports additional epistemic uncertainty models derived from the PEER NGA-West 1
+*nshmp-haz* supports additional epistemic uncertainty models derived from the PEER NGA-West 1
and PEER NGA-West 2 projects. These models both have factors for distance (`Rrup`) bins
Rrup < 10 km, 10 km <= Rrup, < 30 km, and 30 km <= Rrup, and for magnitude bins M < 6.0, 6.0 <=
M < 7.0, and 7.0 <= M. These models can be applied within the `gmm-config.json` file as shown in
@@ -52,14 +52,14 @@ the [GMM Uncertainty](#gmm-uncertainty) section above.
## GMMs By Tectonic Setting
-GMMs available in _nshmp-haz_ are tabulated by tectonic setting below. See the javadocs for the
+GMMs available in *nshmp-haz* are tabulated by tectonic setting below. See the javadocs for the
[GMM Package](https://earthquake.usgs.gov/nshmp/docs/nshmp-lib/gov/usgs/earthquake/nshmp/gmm/package-summary.html)
for implementation details of each GMM and comprehensive lists of GMM IDs.
### Active Crust GMMs
Reference | ID | Component | Notes
-:---------|:--:|:---------:|:------:
+:---------|:---|:----------|:------:
**NGA-West 2**
[Abrahamson et al., 2014](http://dx.doi.org/10.1193/070913EQS198M) | ASK_14<br>ASK_14_BASIN | RotD50 |
[Boore et al., 2014](http://dx.doi.org/10.1193/070113EQS184M) | BSSA_14<br>BSSA_14_BASIN | RotD50 |
@@ -93,7 +93,7 @@ NGA-East<br>[Goulet et al., 2017](https://peer.berkeley.edu/sites/default/files/
[Shahjouei and Pezeshk, 2016](http://dx.doi.org/10.1785/0120140367) | NGA_EAST_SEED_SP16 | RotD50 | 3
**Other**
[Atkinson, 2008](http://dx.doi.org/10.1785/0120070199)<br>[Atkinson & Boore, 2011](http://dx.doi.org/10.1785/0120100270) | ATKINSON_08_PRIME | horizontal | 4
-[Atkinson & Boore, 2006](http://dx.doi.org/10.1785/0120050245) | _AB\_06\_\*<br>140BAR\|200BAR<br>none\|\_AB\|\_J_ | horizontal | 4
+[Atkinson & Boore, 2006](http://dx.doi.org/10.1785/0120050245) | AB_06_*<br>140BAR \| 200BAR<br>none \| \_AB \| \_J | horizontal | 4
[Atkinson & Boore, 2006](http://dx.doi.org/10.1785/0120050245)<br>[Atkinson & Boore, 2011](http://dx.doi.org/10.1785/0120100270) | AB_06_PRIME | horizontal | 4
[Campbell, 2003](http://dx.doi.org/10.1785/0120020002) | CAMPBELL_03<br>CAMPBELL_03_AB<br>CAMPBELL_03_J | Geometric mean | 4
[Frankel et al., 1996](https://pubs.usgs.gov/of/1996/532/) | FRANKEL_96<br>FRANKEL_96_AB<br>FRANKEL_96_J | not specified | 4
@@ -112,30 +112,28 @@ for individual NGA-East component model IDs
### Subduction GMMs
-_Note: See the [GMM javadocs](https://earthquake.usgs.gov/nshmp/docs/nshmp-lib/gov/usgs/earthquake/nshmp/gmm/Gmm.html)
-for a comprehensive list of GMM IDs._
+*Note: See the [GMM javadocs](https://earthquake.usgs.gov/nshmp/docs/nshmp-lib/gov/usgs/earthquake/nshmp/gmm/Gmm.html)
+for a comprehensive list of GMM IDs.*
Reference | ID | Component | Notes
:---------|:---|:----------|:------:
**NGA-Subduction**
-[Abrahamson & Gülerce, 2020](https://peer.berkeley.edu/sites/default/files/2020_25.pdf) | _AG\_20\_\*<br>GLOBAL\|CASCADIA\|ALASKA<br>INTERFACE\|SLAB<br>no basin\|\_BASIN_ | RotD50
-[Kuehn et al., 2020](https://peer.berkeley.edu/sites/default/files/2020_04_kuehn_final.pdf) | _KBCG\_20\_\*<br>GLOBAL\|CASCADIA\|ALASKA<br>INTERFACE\|SLAB<br>no basin\|\_BASIN_ | RotD50
-[Parker et al., 2020](https://peer.berkeley.edu/sites/default/files/2020_03_parker_final.pdf) | _PSHAB\_20\_\*<br>GLOBAL\|CASCADIA\|ALASKA<br>INTERFACE\|SLAB<br>no basin\|\_BASIN_ | RotD50
+[Abrahamson & Gülerce, 2020](https://peer.berkeley.edu/sites/default/files/2020_25.pdf) | AG_20_*<br>GLOBAL \| CASCADIA \| ALASKA<br>INTERFACE \| SLAB<br> (none) \| \_BASIN | RotD50
+[Kuehn et al., 2020](https://peer.berkeley.edu/sites/default/files/2020_04_kuehn_final.pdf) | KBCG_20_*<br>GLOBAL \| CASCADIA \| ALASKA<br>INTERFACE \| SLAB<br>(none) \| \_BASIN | RotD50
+[Parker et al., 2020](https://peer.berkeley.edu/sites/default/files/2020_03_parker_final.pdf) | PSHAB_20_*<br>GLOBAL \| CASCADIA \| ALASKA<br>INTERFACE \| SLAB<br>(none) \|\_BASIN | RotD50
**Other**
-[Atkinson & Boore, 2003](http://dx.doi.org/10.1785/0120020156) | _AB\_03\*<br>GLOBAL\|CASCADIA<br>INTERFACE\|SLAB<br>none\|\_LOW_SAT_| horizontal |
+[Atkinson & Boore, 2003](http://dx.doi.org/10.1785/0120020156) | AB_03_*<br>GLOBAL \| CASCADIA<br>INTERFACE \| SLAB<br> (none) \| \_LOW_SAT| horizontal |
[Atkinson & Macias, 2009](http://dx.doi.org/10.1785/0120080147) | AM_09_INTERFACE<br>AM_09_INTERFACE_BASIN | Geometric mean | 1
-BC Hydro<br>[Abrahamson et al., 2016](http://dx.doi.org/10.1193/051712EQS188MR) | _BCHYDRO\_12\_\*<br>INTERFACE\|SLAB<br>none\|\_BASIN<br>none\|\_BACKARC_ | Geometric mean |
-BC Hydro NGA<br>[Abrahamson et al., 2018](https://peer.berkeley.edu/sites/default/files/2018_02_abrahamson_9.10.18.pdf)² | _BCHYDRO\_18\_NGA\_\*<br>INTERFACE\|SLAB<br>none\|\_NO_EPI_ | Geometric mean | 3
+BC Hydro<br>[Abrahamson et al., 2016](http://dx.doi.org/10.1193/051712EQS188MR) | BCHYDRO_12_*<br>INTERFACE \| SLAB<br> (none) \| \_BASIN<br>(none) \| \_BACKARC | Geometric mean |
+BC Hydro NGA<br>[Abrahamson et al., 2018](https://peer.berkeley.edu/sites/default/files/2018_02_abrahamson_9.10.18.pdf)² | BCHYDRO_18_NGA_*<br>INTERFACE \| SLAB<br> (none) \| \_NO_EPI | Geometric mean | 3
[McVerry et al., 2000](http://doi.org/10.5459/BNZSEE.39.1.1-58) | MCVERRY_00_INTERFACE<br>MCVERRY_00_SLAB<br>MCVERRY_00_VOLCANIC | Max-horizontal,<br>also supports geometric mean | 4
[Youngs et al., 1997](http://dx.doi.org/10.1785/gssrl.68.1.58) | YOUNGS_97_INTERFACE<br>YOUNGS_97_SLAB | Geometric mean |
-[Zhao et al., 2006](http://dx.doi.org/10.1785/0120050122) | _ZHAO\_06\_\*<br>INTERFACE\|SLAB<br>none\|\_BASIN_ | Geometric mean |
-[Zhao et al., 2016](http://dx.doi.org/10.1785/0120150034)<br>[Zhao et al., 2016](http://dx.doi.org/10.1785/0120150056) | ZHAO_16_INTERFACE<br>ZHAO_16_SLAB<br>_ZHAO_16_UPPER_MANTLE_ | Geometric mean<br>(random orientation) | 5
+[Zhao et al., 2006](http://dx.doi.org/10.1785/0120050122) | ZHAO_06_*<br>INTERFACE \| SLAB<br> (none) \| \_BASIN | Geometric mean |
¹ Interface only
² Likely to be superseded by the final EQ Spectra paper
³ Calibrated for Cascadia use only
â´ New Zealand model, does not correspond directly with US site class model
-âµ Subduction Slab and Interface
### Regional and Specialized GMMs
diff --git a/docs/pages/Magnitude-Frequency-Distributions.md b/docs/pages/Magnitude-Frequency-Distributions.md
index 365758f1398e11c08e0bfa9ae578605ad9a183e1..743e0535184195b379bf55912a2feee022de1dcc 100644
--- a/docs/pages/Magnitude-Frequency-Distributions.md
+++ b/docs/pages/Magnitude-Frequency-Distributions.md
@@ -5,7 +5,7 @@ capable of generating, otherwise known as a magnitude-frequency distribution (MF
types of MFDs supported in a hazard model are described below. Unless otherwise noted, all the
members listed in the JSON examples below are required.
-[[_TOC_]]
+[TOC]
## Single
diff --git a/docs/pages/Model-Editions.md b/docs/pages/Model-Editions.md
index 206a5de5641af0303b0bcd23770a1b739535462f..fb9923317a5466cdfa0d84c0369072e0694a2472 100644
--- a/docs/pages/Model-Editions.md
+++ b/docs/pages/Model-Editions.md
@@ -46,7 +46,7 @@ Hawaii | 1998 | 1.1.0 | | TBD | |
Hawaii | 1998 | 1.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
+<sup>†</sup> **Note on the 2014 conterminous U.S. NSHM:** Initial publication of the
[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
@@ -99,7 +99,7 @@ one of the dynamic editions is likely better.
* [Model Editions](./Model-Editions.md#model-editions)
* [Logic Trees & Uncertainty](./Logic-Trees-&-Uncertainty.md#logic-trees-&-uncertainty)
* [Code Versions](./Code-Versions.md#code-versions)
-* [__Documentation Index__](../README.md)
+* [**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
diff --git a/docs/pages/Model-Files.md b/docs/pages/Model-Files.md
index 347935dd0c9ff96f8cd04cf9bde1a7bd746b3b48..36cc69f821e21e64d1b2979522a6cdd0f2f5ae34 100644
--- a/docs/pages/Model-Files.md
+++ b/docs/pages/Model-Files.md
@@ -4,7 +4,7 @@ A variety of logic tree, configuration, and data files that are common to all mo
types are described below and on related pages for specific model components, for example, ground
motion models (GMMs) or magnitude-frequency distributions (MFDs).
-[[_TOC_]]
+[TOC]
## Model and Calculation Configuration
@@ -81,7 +81,7 @@ or its children will be processed; any standalone sources will be ignored. For e
**source-group.json:** A specialized form of logic tree that describes model branches that are
additive and therefore does not include weights. Examples from the NSHM for the conterminous U.S.
NSHM include the Cascadia segmented and partial-rupture models, and the New Madrid 1500-yr cluster
-branches. The branch objects in a source group _may_ include an optional `scale` member that can
+branches. The branch objects in a source group *may* include an optional `scale` member that can
be used to impose a probability of occurrence or other scaling requred by a NSHM. If absent, the
`scale` value is one.
@@ -99,7 +99,7 @@ be used to impose a probability of occurrence or other scaling requred by a NSHM
```
**tree-info.json:** Top level source trees and groups must be accompanied by a file that contains
-a unique integer ID for the logic tree. This file _may_ also include a `name` field that, if
+a unique integer ID for the logic tree. This file *may* also include a `name` field that, if
present, will be used instead of the enclosing directory name, but it is not required.
```json
@@ -124,7 +124,7 @@ For example:
```
See the [ground motion models](./Ground-Motion-Models.md) page for details on GMMs supported in
-_nshmp-haz_ and the related `gmm-config.json` files that governs GMM behavior.
+*nshmp-haz* and the related `gmm-config.json` files that governs GMM behavior.
### MFD Logic Trees
@@ -151,7 +151,7 @@ source-tree branches.
How MFDs are intialized (or realized) depends on the presence and contents of `mfd-config.json` and
`rate-tree.json` files. See the
[magnitude frequency distributions](./Magnitude-Frequency-Distributions.md) page for details on
-these files and the types of MFDs supported in _nshmp-haz_.
+these files and the types of MFDs supported in *nshmp-haz*.
## Rupture Sets
diff --git a/docs/pages/Model-Structure.md b/docs/pages/Model-Structure.md
index 7af9614f651144e7cac763a1821d63663a66ae4a..20e324791be3bc9133392630b0102386b4aec5a2 100644
--- a/docs/pages/Model-Structure.md
+++ b/docs/pages/Model-Structure.md
@@ -6,7 +6,7 @@ self describing and represent logic trees and other relationships between source
(JSON), source geometry (GeoJSON features), and earthquake rate data (CSV). JSON is well-suited
for representing model data and relationships and is supported in most programming languages.
-[[_TOC_]]
+[TOC]
## Directory Structure
diff --git a/docs/pages/Site-Specification.md b/docs/pages/Site-Specification.md
index 544130a53fc138a8384a7c5155b3058da61c1430..3b7990ed0d80c67de5d8add86722439e27f6c8d9 100644
--- a/docs/pages/Site-Specification.md
+++ b/docs/pages/Site-Specification.md
@@ -4,7 +4,7 @@ The sites at which to perform hazard and related calculations may be defined in
ways. Examples of the file formats described below are available in the resource directory:
[`etc/nshm`](../../etc/nshm/README.md).
-__Note on Coordinates:__ *nshmp-haz* supports longitude and latitude values in the closed
+**Note on Coordinates:** *nshmp-haz* supports longitude and latitude values in the closed
ranges `[-360° ‥ 360°]` and `[-90° ‥ 90°]`. However, mixing site and/or source
coordinates across the antimeridian (the -180° to 180° transition) will yield unexpected results.
For Pacific models and calculations, always use positive or negative longitudes exclusively.
@@ -104,9 +104,9 @@ outside the 'calculation' polygon are set to zero. For an example, see the
* [Developer Basics](./Developer-Basics.md#developer-basics)
* [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration)
* [Site Specification](./Site-Specification.md#site-specification)
- * [Examples](../../etc/examples) (or
- [on GitLab](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples))
-* [__Documentation Index__](../README.md)
+ * [Using Docker](./Using-Docker.md#using-docker)
+ * See also the [examples](../../etc/examples) directory
+* [**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
diff --git a/docs/pages/Source-Types.md b/docs/pages/Source-Types.md
index 76d90b847cbb4d1ab2e1444c3106429b7e12a4a6..ddaa27b71989f2129eece8ddff5eaab11ab3f108 100644
--- a/docs/pages/Source-Types.md
+++ b/docs/pages/Source-Types.md
@@ -10,17 +10,17 @@ represent models of smoothed seismicity in both crustal and subduction intraslab
may also be used for fault zones where there is a history of large earthquakes but the fault
geometry itself is unknown or very poorly defined.
-[[_TOC_]]
+[TOC]
-Source models for use with _nshmp-haz_ are defined using [JSON](https://www.json.org) and
-[GeoJSON](https://geojson.org). _nshmp-haz_ makes determinations about how to represent a source
+Source models for use with *nshmp-haz* are defined using [JSON](https://www.json.org) and
+[GeoJSON](https://geojson.org). *nshmp-haz* makes determinations about how to represent a source
based on a GeoJSON geometry type in conjunction with supporting JSON configuration files. Example
source configuration files, `*-config.json`, are provided with each source type description.
Configuration files must be fully specified with `null` JSON member values used to specify 'do
nothing' where appropriate. Any configuration member value in ALL_CAPS indicates the value is one
of a fixed number of options commonly referred to as an enum.
-__Note on Coordinates:__ _nshmp-haz_ supports longitude and latitude values in the closed ranges
+**Note on Coordinates:** *nshmp-haz* supports longitude and latitude values in the closed ranges
`[-360°‥360°]` and `[-90°‥90°]`. Note, however, that mixing site and/or source coordinates across
the antimeridian (the -180° to 180° transition) will yield unexpected results. For Pacific models
and calculations, always use positive or negative longitudes exclusively.
@@ -43,7 +43,7 @@ Grid sources are represented in a model using a logic tree with a `rupture-sets.
ruptures on each branch. Because gridded seismicity models may be governed by regionally
varying MFD properties (e.g. `mMax`), rupture sets for grids are defined in a JSON array.
-__rupture-sets.json__: Defines an array of one or more rupture sets. Multiple rupture sets are
+**rupture-sets.json**: Defines an array of one or more rupture sets. Multiple rupture sets are
used to model regional differences in MFD properties such as maximum magnitude. The `feature`
member points to the ID of a geojson feature (in the `grid-sources/features` directory) that
defines the bounds of the gridded seismicity source. A grid rupture set `mfd-tree` is never
@@ -62,7 +62,7 @@ defined inline and always points to a tree in a
]
```
-__grid-config.json__: A `grid-depth-map` defines a mapping of magnitude ranges to logic trees of
+**grid-config.json**: A `grid-depth-map` defines a mapping of magnitude ranges to logic trees of
depth distributions. The map can use arbitrary names as keys, but the magnitude ranges defined by
each member must be non-overlapping. The magnitude ranges are interpreted as closed (inclusive) –
open (exclusive), e.g. [mMin..mMax). `maxDepth` constrains the maximum depth of any pseudo fault
@@ -107,7 +107,7 @@ to upper-right). While most gridded rate files contain columns of longitude, lat
some may contain depth values (intraslab sources), maximum magnitude caps, or other values. Scaled
spatial PDFs are the preferred approach to modeling regional rate variations, however it is also
possible to define explicit MFDs at each grid node. To do so, the `spatial-pdf` member
-of a __rupture-sets.json__ is replaced with `grid-mfds`. See
+of a **rupture-sets.json** is replaced with `grid-mfds`. See
`2018 CONUS NSHM > active-crust > grid-sources` for examples of both approaches.
## Zone Sources
@@ -149,7 +149,7 @@ directly.
}
```
-__zone-config.json:__ Zone source model configuration is identical to a grid source configuration.
+**zone-config.json:** Zone source model configuration is identical to a grid source configuration.
```json
{
@@ -188,7 +188,7 @@ they occur in multiple locations on the fault surface with appropriately scaled
associated with finite fault models may be explicitly defined or derived from slip rates.
Fault rupture rates may be modeled using explicitly defined MFDs or logic trees of slip rate.
-__fault-source.geojson__: Defines the geometry and properties of a single source. In the example
+**fault-source.geojson**: Defines the geometry and properties of a single source. In the example
below the presence of a `rate-map` property indicates MFDs should be constructed from the supplied
slip rates and using the weights defined in a `rate-tree.json`.
@@ -235,7 +235,7 @@ slip rates and using the weights defined in a `rate-tree.json`.
}
```
-__fault-config.json__: Controls the point spacing on a gridded surface used to realize the fault
+**fault-config.json**: Controls the point spacing on a gridded surface used to realize the fault
geometry as well as define the models to use for magnitude scaling and rupture floating. Dip
variations and an associated slip-rate scaling model are also supported for normal faults.
@@ -249,9 +249,9 @@ variations and an associated slip-rate scaling model are also supported for norm
}
```
-__rupture-set.json__: When a fault source is represented with a logic tree a
-`rupture-set.json` defines the ruptures for each branch. A rupture set _may_ also define custom
-properties and _may_ also contain a `sections` member that defines the fault sections for the
+**rupture-set.json**: When a fault source is represented with a logic tree a
+`rupture-set.json` defines the ruptures for each branch. A rupture set *may* also define custom
+properties and *may* also contain a `sections` member that defines the fault sections for the
rupture set (see note on fault section stitching, [below](#fault-section-stitching)).
```json
@@ -272,10 +272,10 @@ rupture set (see note on fault section stitching, [below](#fault-section-stitchi
When multiple sections are defined for a rupture, the ruptures must be defined in an order that
preserves the U.S. structural geology right-hand-rule. When stitched together, repeated locations
at the enpoints of adjacent sections, if present, are removed. The properties of the first section
-govern the properties of the stitched fault, however, a rupture-set _may_ include a properties
+govern the properties of the stitched fault, however, a rupture-set *may* include a properties
member, the contents of which will override the properties of the first stitched section. Although
it would be better to have geometric properties of stitched sections be calculated dynamically,
-the current approach preserves support for past models. A rupture-set _may_ also include a
+the current approach preserves support for past models. A rupture-set *may* also include a
`coordinates` member that can be used to represent a smoothed trace geometry where stitched
sections do not share common endpoints.
@@ -287,9 +287,9 @@ as the joint probability of exceeding ground motions from each independent event
a cluster may only have an mfd-tree composed of `Mfd.Type.SINGLE` MFDs and the mfd-trees must
match across all sources in a cluster (i.e. each mfd-tree has the same IDs and weights).
-__cluster-set.json__ A specialized type of rupture set, this file defines the array of fault
+**cluster-set.json** A specialized type of rupture set, this file defines the array of fault
rupture sets that make up a 'cluster'. As with fault sources, the nested rupture sets in a cluster
-set _may_ define `properties` and `sections` members.
+set *may* define `properties` and `sections` members.
```json
{
@@ -320,13 +320,13 @@ This specialized fault source type supports inversion based rupture rate estimat
on a fault network such as that used for UCERF3 in the 2014 and 2018 NSHMs for the conterminous
U.S. Fault system source sets require three files: `rupture_set.json`, `sections.geojson`, and
`ruptures.csv` that are placed together within folders defining branches of a fault system
-logic tree. Note that system sources _may_ have complementary gridded seismicity source models
+logic tree. Note that system sources *may* have complementary gridded seismicity source models
with matching logic trees.
-__rupture-set.json__: Provides identifying information for the ruptures defined in the adjacant
+**rupture-set.json**: Provides identifying information for the ruptures defined in the adjacant
sections and ruptures files.
-__sections.geojson__: defines a feature collection of the fault sections in a fault network.
+**sections.geojson**: defines a feature collection of the fault sections in a fault network.
Because fault sections are derived by dividing larger faults into subsections, section features
contain several properties that differ from standalone fault section source models (e.g.
`dip-direction`).
@@ -362,7 +362,7 @@ contain several properties that differ from standalone fault section source mode
}
```
-__ruptures.csv__: Defines the properties of every rupture. The last column in a rupture file
+**ruptures.csv**: Defines the properties of every rupture. The last column in a rupture file
defines the ordered array of participating fault section IDs using the shorthand
`1127:1131-2411:2412`. Colons denote continous ranges of sections and hyphens denote breaks.
@@ -389,7 +389,7 @@ using an `slab-config.json` file.
* [Magnitude Frequency Distributions (MFDs)](./Magnitude-Frequency-Distributions.md#magnitude-frequency-distributions)
* [Rupture Scaling Relations](./Rupture-Scaling-Relations.md#rupture-scaling-relations)
* [Ground Motion Models (GMMs)](./Ground-Motion-Models.md#ground-motion-models)
-* [__Documentation Index__](../README.md)
+* [**Documentation Index**](../README.md)
---
 [U.S. Geological Survey](https://www.usgs.gov)
diff --git a/docs/pages/Using-Docker.md b/docs/pages/Using-Docker.md
new file mode 100644
index 0000000000000000000000000000000000000000..501d12566a66914f746aea275f4fb7b739fab7d8
--- /dev/null
+++ b/docs/pages/Using-Docker.md
@@ -0,0 +1,267 @@
+# Using [Docker](https://docs.docker.com/install/)
+
+*nshmp-haz* is available as a public image from
+[Docker hub](https://hub.docker.com/r/usgs/nshmp-haz) with tags:
+
+* `latest`: Refers to the latest updates from the main or production branch
+* `development-latest`: Refers to forks of the repository.
+* `staging-latest`: Latest updates associated with the
+[main](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main) branch
+* `production-latest`: Latest stable release associated with the
+[production](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/production) branch
+
+To ensure you have the latest *nshmp-haz* update associated with a specific tag,
+always first pull the image from Docker:
+
+```bash
+docker pull usgs/nshmp-haz:<tag>
+```
+
+> Replace `<tag>` with one of the above tags.
+
+Example:
+
+```bash
+docker pull usgs/nshmp-haz:production-latest
+```
+
+## Docker Memory on Mac
+
+By default, Docker Desktop for Mac is set to use 2 GB runtime memory. To run *nshmp-haz*, the
+memory available to Docker must be [increased](https://docs.docker.com/docker-for-mac/#advanced)
+to a minimum of 4 GB.
+
+## Run *nshmp-haz* in Docker
+
+```bash
+# Pull docker image
+docker pull usgs/nshmp-haz:latest
+
+# Run docker image
+docker run \
+ --env CLASS_NAME=<DisaggCalc | HazardCalc | RateCalc> \
+ --env IML=<NUMBER> \
+ --env RETURN_PERIOD=<NUMBER> \
+ --volume /absolute/path/to/sites/file:/app/sites.<geojson | csv> \
+ --volume /absolute/path/to/config/file:/app/config.json \
+ --volume /absolute/path/to/output:/app/output \
+ usgs/nshmp-haz
+```
+
+Where:
+
+* `CLASS_NAME` is the nshmp-haz class to run:
+ * [DisaggCalc](../../src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java)
+ * [HazardCalc](../../src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java)
+ * [RateCalc](../../src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java)
+* Other arguments (local files mapped to files within the Docker container with `:/app/...`):
+ * (required) The absolute path to a [USGS model (NSHM)](./USGS-Models.md)
+ * Example: `$(pwd)/nshm-hawaii:/app/model`
+ * (required) The absolute path to a GeoJSON or CSV [site(s)](./Site-Specification.md) file
+ * CSV example: `$(pwd)/my-csv-sites.csv:/app/sites.csv`
+ * GeoJSON example: `$(pwd)/my-geojson-sites.geojson:/app/sites.geojson`
+ * (required) The absolute path to an output directory
+ * Example: `$(pwd)/my-hazard-output:/app/output`
+ * (optional) The absolute path to a [configuration](./Calculation-Configuration.md) file
+ * Example: `$(pwd)/my-custom-config.json:/app/config.json`
+
+## Examples
+
+### [`HazardCalc`](../../src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java) Example
+
+The following example runs the `HazardCalc` program in nshmp-haz with the
+[nshm-hawaii](https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git) model and the
+assumption a GeoJSON [site](./Site-Specification.md) file exists named `sites.geojson`.
+
+```bash
+# Download Hawaii NSHM
+git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git
+
+# Pull image
+docker pull usgs/nshmp-haz:latest
+
+# Run nshmp-haz HazardCalc
+docker run \
+ --env CLASS_NAME="HazardCalc" \
+ --volume "$(pwd)/nshm-hawaii:/app/model" \
+ --volume "$(pwd)/sites.geojson" \
+ --volume "$(pwd)/hawaii-hazard-output:/app/output" \
+ usgs/nshmp-haz
+```
+
+### [`DisaggCalc`](../../src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java) Example
+
+The following example runs the `DisaggCalc` program in nshmp-haz with the
+[nshm-hawaii](https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git) model and the
+assumption a GeoJSON [site](./Site-Specification.md) file exists named `sites.geojson`.
+
+```bash
+# Download Hawaii NSHM
+git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git
+
+# Pull image
+docker pull usgs/nshmp-haz:latest
+
+# Run nshmp-haz DisaggCalc
+docker run \
+ --env CLASS_NAME="DisaggCalc" \
+ --env RETURN_PERIOD=475 \
+ --volume "$(pwd)/nshm-hawaii:/app/model" \
+ --volume "$(pwd)/sites.geojson" \
+ --volume "$(pwd)/hawaii-disagg-output:/app/output" \
+ usgs/nshmp-haz:latest
+```
+
+### [`RateCalc`](../../src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java) Example
+
+The following example runs the `RateCalc` program in nshmp-haz with the
+[nshm-hawaii](https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git) model and the
+assumption a GeoJSON [site](./Site-Specification.md) file exists named `sites.geojson`.
+
+```bash
+# Download Hawaii NSHM
+git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-hawaii.git
+
+# Pull image
+docker pull usgs/nshmp-haz:latest
+
+# Run nshmp-haz RateCalc
+docker run \
+ --env CLASS_NAME="RateCalc" \
+ --volume "$(pwd)/nshm-hawaii:/app/model" \
+ --volume "$(pwd)/sites.geojson" \
+ --volume "$(pwd)/hawaii-rate-output:/app/output" \
+ usgs/nshmp-haz
+```
+
+## Run Customization
+
+When running *nshmp-haz* with Docker the maximum JVM memory size can
+be set with the environment flag (-e, -env):
+
+```bash
+docker run \
+ --env JAVA_MEMORY=<MEMORY> \
+ ...
+ usgs/nshmp-haz
+
+# Example
+docker run \
+ --env JAVA_MEMORY="12g" \
+ ...
+ usgs/nshmp-haz
+```
+
+Where:
+
+* `JAVA_MEMORY` is the maximum memory for the JVM (default: 8g)
+
+## Run *nshmp-haz* web services in Docker
+
+### Build and Run Docker Locally
+
+The Docker image may be built with the provided web service [Dockerfile](../../ws.Dockerfile).
+
+```bash
+cd /path/to/nshmp-haz
+
+# Build docker image
+docker build -f ws.Dockerfile -t nshmp-haz-ws .
+
+# Run Docker image
+docker run -p 8080:8080 -v "path/to/model:/model" nshmp-haz-ws
+```
+
+Web service runs on [http://localhost:8080/](http://localhost:8080/)
+
+The hazard model is read in via Docker volumes.
+
+#### Local Docker Example with NSHM
+
+```bash
+# Build docker image
+cd /path/to/nshmp-haz
+docker build -f ws.Dockerfile -t nshmp-haz-ws .
+
+# Download NSHM CONUS
+cd ..
+git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-conus
+
+# Run web services
+docker run -p 8080:8080 -v "$(pwd):/model" nshmp-haz-ws
+```
+
+Open browser to [http://localhost:8080/](http://localhost:8080/).
+
+### Run from Container Registry
+
+A public Docker image is avaialable from [Docker hub](https://hub.docker.com/r/usgs/nshmp-haz-ws).
+
+There are 4 main tags:
+
+* `latest`: Refers to the latest updates from the main or production branch
+* `development-latest`: Refers to forks of the repository.
+* `staging-latest`: Refers to the
+[main](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main) branch and is the latest updates
+* `production-latest`: Refers to the
+[production](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/production) branch and is stable
+
+```bash
+# Pull image
+docker pull usgs/nshmp-haz-ws:latest
+
+# Run
+docker run -p 8080:8080 -v "/path/to/model:/model" usgs/nshmp-haz-ws
+```
+
+Web service runs on [http://localhost:8080/](http://localhost:8080/)
+
+The hazard model is read in via Docker volumes.
+
+#### Container Registry Example with NSHM
+
+```bash
+# Pull image
+docker pull usgs/nshmp-haz-ws:latest
+
+# Download NSHM CONUS
+cd ..
+git clone https://code.usgs.gov/ghsc/nshmp/nshms/nshm-conus
+
+# Run web services
+docker run -p 8080:8080 -v "$(pwd):/model" usgs/nshmp-haz-ws
+```
+
+Open browser to [http://localhost:8080/](http://localhost:8080/).
+
+### Java Memory
+
+When running **nshmp-haz** web services with Docker
+the initial (Xms) and maximum (Xmx) JVM memory sizes can
+be set with the environment flag (-e, -env):
+
+```bash
+docker run -p <PORT>:8080 -e JAVA_OPTS="-Xms<INITIAL> -Xmx<MAX>" -d usgs/nshmp-haz-ws
+
+# Example
+docker run -p 8080:8080 -e JAVA_OPTS="-Xms1g -Xmx8g" -d usgs/nshmp-haz-ws
+```
+
+Where `<INITIAL>` and `<MAX >`should be set to the desired initial and maximum memory sizes,
+respectively.
+
+---
+
+## Related Pages
+
+* [Building & Running](./Building-&-Running.md#building-&-running)
+ * [Developer Basics](./Developer-Basics.md#developer-basics)
+ * [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration)
+ * [Site Specification](./Site-Specification.md#site-specification)
+ * [Using Docker](./Using-Docker.md#using-docker)
+ * See also the [examples](../../etc/examples) directory
+* [**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/etc/examples/README.md b/etc/examples/README.md
index 75b377a93b08ca4cdd70acdb7520248aadbc5e9c..21de19b155e0a32322d1b0487aa237e4651f8d11 100644
--- a/etc/examples/README.md
+++ b/etc/examples/README.md
@@ -1,6 +1,10 @@
# Examples
-These examples are designed to be executed locally while following the READMEs on GitLab.
+These examples are designed to be executed locally while following the READMEs on GitLab and
+assumes the reader has successfully downloaded and built the code as described in the
+[documentation](../../docs/README.md). Because each example builds on prior concepts, we recommend
+stepping through all the examples in order.
+
All examples avoid a lengthy call to Java and the `HazardCalc` program by using the following
system alias:
@@ -8,8 +12,6 @@ system alias:
alias hazard='java -cp /path/to/nshmp-haz/build/libs/nshmp-haz.jar gov.usgs.earthquake.nshmp.HazardCalc'
```
-Because each example builds on prior concepts, it is best step through all the examples, however quickly.
-
<!-- markdownlint-disable MD001 -->
#### Start: [Example 1 – A simple hazard calculation](1-hazard-curve/README.md)
diff --git a/gradle.properties b/gradle.properties
index 04ae04e2d10f92e45bc0d81598dffd799e627f7d..90f78f7a1f65502f5ffd6d0bd1a2686d3fe61663 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.10
+nshmpLibVersion = 1.2.13
nshmpWsUtilsVersion = 0.3.11
openApiVersion = 4.0.0
shadowVersion = 7.1.2
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index c28d21571745e00278cc65dc94d7e396e7f1f4aa..11c2ead627a716c70f4ecccbdec81ef355105031 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -1,4 +1,3 @@
-
dependencies {
// NSHMP
diff --git a/nshms.yml b/nshms.yml
index a3a2c9975aad5e793312fe004d113aeed02dedf4..09e19f18a8d444c187c72013f0d4232ae661a254 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -5,7 +5,7 @@ nshms:
# Alaska 2023 NSHM
-
repo: nshm-alaska
- tag: 3.a.1
+ tag: 3.a.2
year: 2023
deployments:
development:
@@ -32,7 +32,7 @@ nshms:
# CONUS 2023 NSHM
-
repo: nshm-conus
- tag: 6.a.4
+ tag: 6.b.0
year: 2023
deployments:
development:
diff --git a/package-lock.json b/package-lock.json
index dc72624ba1f9b5786382c12356add218736ccc4b..fd03b78e351745759edce1f4fbeb016a832b3d8b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
"requires": true,
"packages": {
"": {
- "name": "nshmp-haz",
"version": "2.0.0",
"devDependencies": {
"markdownlint-cli": "^0.31.1",
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
index 0c726e1992079a3b2c71dea971cf165be12eec85..6275df2b5570c0374f7cf15b94c3908bb7ad8664 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
@@ -260,7 +260,7 @@ public class DisaggCalc {
.splitToList(line)
.stream()
.skip(colsToSkip)
- .mapToDouble(Double::valueOf)
+ .mapToDouble(Double::parseDouble)
.toArray();
EnumMap<Imt, Double> imtImlMap = new EnumMap<>(Imt.class);
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java
index bb5733e2f5a2bface8609b837c11ce001a6d092e..a93b41304d3235fdc054c93b4ccfde8d1adc9260 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java
@@ -107,7 +107,7 @@ public class HazardMaps {
double[] imls = header.subList(headerCount, header.size())
.stream()
- .mapToDouble(Double::valueOf)
+ .mapToDouble(Double::parseDouble)
.toArray();
StringBuilder mapHeader = new StringBuilder(siteStr);
@@ -176,7 +176,7 @@ public class HazardMaps {
double[] rates = elements
.stream()
.skip(headerCount)
- .mapToDouble(Double::valueOf)
+ .mapToDouble(Double::parseDouble)
.toArray();
for (double returnPeriod : returnPeriods) {
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
index c835d3209e39f2f4a619fd3bfc4cbda4fc88bdaa..843110517c9d3d7110220d3ced6ad14ba88a8a69 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/source/FeaturesService.java
@@ -54,10 +54,11 @@ public class FeaturesService {
*
* @param schemas The Swagger schemas
*/
+ @SuppressWarnings("rawtypes")
public static void featureTypeSchema(Map<String, Schema> schemas) {
var schema = new Schema<FeatureType>();
schema.setType(SchemaTypeUtil.STRING_TYPE);
- featureTypes().stream().forEach(featureType -> schema.addEnumItemObject(featureType));
+ featureTypes().forEach(featureType -> schema.addEnumItemObject(featureType));
schemas.put(
String.format(
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
index 647349e49e0c4c000207b8f4a3b771db3d33c0e6..e06a0af2db8518bd28735d32241573b8dfb96e1a 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-ANCHORAGE_AK.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 1.0221196929934415,
- 0.7568362098895002,
- 0.5415556815266754,
- 0.3731188009379423,
- 0.24854072445881029,
- 0.15812161976934738,
- 0.09799592759613591,
- 0.05802454271363121,
- 0.033010740441887045,
- 0.017813170167071322,
- 0.009054725609152499,
- 0.004316535982054749,
- 0.001929479187450045,
- 8.094425774968294E-4,
- 3.172776572297354E-4,
- 1.1455694034468094E-4,
- 3.551325848622694E-5,
- 8.996873223693952E-6,
- 1.6160643732893123E-6,
+ 1.1492381474251436,
+ 0.860431497977819,
+ 0.6226411872986266,
+ 0.4339399774075828,
+ 0.29236974934848337,
+ 0.1880960140165419,
+ 0.1177370680030112,
+ 0.07032843449164865,
+ 0.04030393289363885,
+ 0.021868423386721476,
+ 0.011139900997978925,
+ 0.00528697252330429,
+ 0.0023274603439309557,
+ 9.486057313219511E-4,
+ 3.568087040994083E-4,
+ 1.229532164673634E-4,
+ 3.64712268834144E-5,
+ 9.023826105548502E-6,
+ 1.6165851397667318E-6,
3.900555624274174E-8
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.24534881206187034,
- 0.170937681407194,
- 0.1146528939812809,
- 0.07355687631631276,
- 0.04468221276803907,
- 0.025759199698012488,
- 0.013954903282611827,
- 0.0071945275662236375,
- 0.003568417863455468,
- 0.0017308776768193603,
- 8.446339702297981E-4,
- 4.1263275905858174E-4,
- 1.9077746563450355E-4,
- 7.987163200250538E-5,
- 2.712313641787931E-5,
- 7.19460083883458E-6,
- 1.0955133034605005E-6,
+ 0.28618425487894666,
+ 0.1989852749443714,
+ 0.13303776197561623,
+ 0.08501088515663598,
+ 0.05139715593458863,
+ 0.02945807121782052,
+ 0.015824475296409617,
+ 0.008052038587601663,
+ 0.003915633895358978,
+ 0.0018497174852252897,
+ 8.77577407911863E-4,
+ 4.1943499018529644E-4,
+ 1.916386842628611E-4,
+ 7.993237956471305E-5,
+ 2.7127497176100676E-5,
+ 7.1948280777929645E-6,
+ 1.0955173066305445E-6,
1.1557908106466981E-8,
0.0,
0.0
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.4168998975376297,
- 1.1037206624387923,
- 0.8364721945277009,
- 0.6133615013934622,
- 0.43393638316093275,
- 0.2954991327970844,
- 0.19326290324002912,
- 0.1204160774213196,
- 0.07173483971361698,
- 0.040732154837247424,
- 0.022106255566791806,
- 0.011167385467538744,
- 0.005329057615201931,
- 0.0023049512397327943,
- 9.019815237020081E-4,
- 3.088774702010837E-4,
- 9.039857046548625E-5,
- 2.1449513767557622E-5,
- 3.783179943387137E-6,
- 4.2017369934961143E-7
+ 1.5403776949754917,
+ 1.213104639010862,
+ 0.9300985834054234,
+ 0.6902675744511094,
+ 0.4944016823019988,
+ 0.34096793626700844,
+ 0.22595434003526135,
+ 0.14275102534316525,
+ 0.08625225797974491,
+ 0.04965375703715634,
+ 0.02727671378723898,
+ 0.013908096071285217,
+ 0.006665118621212825,
+ 0.002875307747158469,
+ 0.0011126940002184396,
+ 3.7281965176629283E-4,
+ 1.0529017164326357E-4,
+ 2.366603837494213E-5,
+ 3.91157373766831E-6,
+ 4.22855872731712E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.804812626025941,
- 1.4583188290065412,
- 1.1431876326971184,
- 0.872893625200475,
- 0.6425192493378192,
- 0.4605201812114678,
- 0.31841876967587784,
- 0.21134174461364252,
- 0.1348202125114297,
- 0.08236423357042125,
- 0.04825099588001969,
- 0.02704671709403067,
- 0.014430844230789181,
- 0.00726309274302965,
- 0.003406960522520374,
- 0.0014662505360771912,
- 5.761304530613601E-4,
- 2.0487878813522519E-4,
- 6.426268823607274E-5,
- 1.7505036390451968E-5
+ 1.9384227618601426,
+ 1.5806727047652482,
+ 1.2526254412769762,
+ 0.9677328209586519,
+ 0.7212941360527043,
+ 0.5235256882496431,
+ 0.3666865565204522,
+ 0.24666742384098428,
+ 0.15955909555148245,
+ 0.09888545309113692,
+ 0.05876033502777916,
+ 0.03338078077200467,
+ 0.018015725426199898,
+ 0.00914244052328411,
+ 0.004303080264259478,
+ 0.001845294997797307,
+ 7.154758119910541E-4,
+ 2.478670895465427E-4,
+ 7.459249153245084E-5,
+ 1.9180378646377954E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
index c57649728123b8ff95fb8a267be2b201718fb27f..b26aa6be7bfd0d64c5d8ed78b334ffd8d33dbcba 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-FAIRBANKS_AK.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.4072134998400029,
- 0.30436980613912357,
- 0.2190724771029124,
- 0.1501372966736322,
- 0.0974840220886623,
- 0.058725194686371725,
- 0.03350752776654483,
- 0.017811267463156585,
- 0.00897326426512317,
- 0.0042590288249059974,
- 0.0018874905813181147,
- 7.649315708148877E-4,
- 2.751945665318732E-4,
- 8.425501229816555E-5,
- 2.0566855474905327E-5,
- 3.7829327436930823E-6,
- 4.611462161058796E-7,
- 2.6138298940342154E-8,
- 4.221308903735045E-10,
+ 0.48377964515157906,
+ 0.36045326075340334,
+ 0.25823011538728635,
+ 0.17611958820362977,
+ 0.11391274088509135,
+ 0.06845154232598628,
+ 0.03901155563262176,
+ 0.02072554110061665,
+ 0.010436079834220765,
+ 0.004950497924778306,
+ 0.0021941664065421402,
+ 8.907942933651294E-4,
+ 3.218198904518687E-4,
+ 9.925963452023162E-5,
+ 2.453205786725899E-5,
+ 4.576669924808237E-6,
+ 5.546233410528799E-7,
+ 3.091753696787031E-8,
+ 4.925818123098905E-10,
0.0
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.141190020039448,
- 0.09800521483586633,
- 0.06422835311901853,
- 0.039550318365805213,
- 0.0227134352009639,
- 0.012260450209300586,
- 0.006194639758527739,
- 0.0029788957120298705,
- 0.0013549114471257243,
- 5.63199674575581E-4,
- 2.0622149570378737E-4,
- 6.303620606767123E-5,
- 1.4659564334641634E-5,
- 2.1923390741432505E-6,
- 9.347441005783682E-8,
- 5.982374815501449E-9,
- 1.1316603475383259E-10,
+ 0.15707279265102672,
+ 0.10804505384824427,
+ 0.07023171322762901,
+ 0.04294024724848731,
+ 0.02451464768228447,
+ 0.01317298465052058,
+ 0.006632647785067121,
+ 0.003179709229838032,
+ 0.0014413944088665206,
+ 5.968993067875066E-4,
+ 2.1772656438376746E-4,
+ 6.633584397734821E-5,
+ 1.540296332752602E-5,
+ 2.3190918908410385E-6,
+ 1.0753005468286456E-7,
+ 6.9633529884388424E-9,
+ 1.3067997430972305E-10,
0.0,
0.0,
0.0
@@ -107,33 +107,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.5033203618504524,
- 0.38378590675578694,
- 0.2840615871172558,
- 0.20256231378624157,
- 0.13854604817659918,
- 0.09068690933612163,
- 0.05682253413792459,
- 0.033859625302021884,
- 0.01920939363790771,
- 0.010241491837159512,
- 0.00509756489430511,
- 0.0022874176315446945,
- 9.37648978106047E-4,
- 3.297645410083194E-4,
- 9.709234020813263E-5,
- 2.1894421158987233E-5,
- 3.2733133252537715E-6,
- 2.2084514205066382E-7,
- 3.69733962413712E-9,
+ 0.5999549095986747,
+ 0.46099204851528613,
+ 0.34349963291443636,
+ 0.2464222021339232,
+ 0.16947815959268175,
+ 0.1114889130897114,
+ 0.0701356981039457,
+ 0.04189713096174978,
+ 0.023798083297879465,
+ 0.012704761509444204,
+ 0.006341807055318555,
+ 0.00285891024088726,
+ 0.001177620790023971,
+ 4.157004220914989E-4,
+ 1.224787596099698E-4,
+ 2.7545744111623133E-5,
+ 4.094775703360882E-6,
+ 2.7264885018181473E-7,
+ 4.369414378472442E-9,
0.0
]
},
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.6314390654417186,
- 0.4974021175063632,
- 0.37903816520182776,
- 0.28045106491970606,
- 0.19893348134539368,
- 0.1367635915756908,
- 0.09030958816925524,
- 0.05711860156085922,
- 0.0346840599805935,
- 0.020049780157481087,
- 0.010945326240734068,
- 0.005577639047535389,
- 0.0026251655304376626,
- 0.0011250806002609727,
- 4.2852263253707776E-4,
- 1.3932390835862246E-4,
- 3.6924517385687E-5,
- 7.26521056537453E-6,
- 8.240279566317358E-7,
- 3.219418866881072E-8
+ 0.7424583278574219,
+ 0.5900408979545374,
+ 0.45361048882669774,
+ 0.33842434057343745,
+ 0.24196364090426783,
+ 0.16753040780602735,
+ 0.11130439531031236,
+ 0.07072141553658651,
+ 0.0430594042631741,
+ 0.024922699106719043,
+ 0.01362010194706936,
+ 0.006954648056894348,
+ 0.0032832813296962593,
+ 0.0014117121189455332,
+ 5.389553183746012E-4,
+ 1.7529458272750397E-4,
+ 4.635769384654834E-5,
+ 9.078498576275985E-6,
+ 1.0195733078425598E-6,
+ 3.871252217142176E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
index 1eeac90c979350121aca925c1efeec4dc95705b2..876991fb4a45cd535244908da55398c13c7f386a 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-JUNEAU_AK.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.3015950265603547,
- 0.23313498793712745,
- 0.17229592969483115,
- 0.1197681042014497,
- 0.07734967592734886,
- 0.04497377947075894,
- 0.02377148316878828,
- 0.01104050967670243,
- 0.004522345465323323,
- 0.0016010908622349099,
- 4.8774030556791094E-4,
- 1.2619104699843642E-4,
- 2.8253611198141284E-5,
- 5.803679001924566E-6,
- 1.2413205479667903E-6,
- 2.458673942362414E-7,
- 3.0010711126505834E-8,
- 1.6778908535399452E-9,
- 2.6599874012235748E-11,
+ 0.3463409788622023,
+ 0.2629285212226204,
+ 0.19100577225967771,
+ 0.13076301139412344,
+ 0.08337813349925169,
+ 0.047962888446025864,
+ 0.025141444609498194,
+ 0.0116043925820243,
+ 0.0047366703456522136,
+ 0.0016776010659666225,
+ 5.143567898744554E-4,
+ 1.3535534063906113E-4,
+ 3.130192314805608E-5,
+ 6.728719206668238E-6,
+ 1.4785825271163757E-6,
+ 2.9262273663461874E-7,
+ 3.546947292013255E-8,
+ 1.958521257019237E-9,
+ 3.072711071484722E-11,
0.0
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.14645702521636478,
- 0.10496024092387925,
- 0.07060408671613981,
- 0.044499187720523116,
- 0.02599118796793904,
- 0.013947056438910988,
- 0.006645568381647449,
- 0.002765229568772248,
- 9.724010837966014E-4,
- 2.7369045060151676E-4,
- 5.754606622418008E-5,
- 7.4741324131608625E-6,
- 5.828586013721846E-7,
- 5.121122690546473E-8,
- 5.412184693122626E-9,
- 3.845639650833265E-10,
- 7.1774495593409734E-12,
+ 0.15407537072892244,
+ 0.10951241496797232,
+ 0.07312513255434765,
+ 0.045777827075695936,
+ 0.026575575488568287,
+ 0.01418904131245537,
+ 0.006735410394215425,
+ 0.0027960008745299765,
+ 9.823112678142049E-4,
+ 2.767028267668077E-4,
+ 5.8409836659385066E-5,
+ 7.697923634410533E-6,
+ 6.305873696237638E-7,
+ 5.910280089514317E-8,
+ 6.269368183563811E-9,
+ 4.4362799925639904E-10,
+ 8.2282052546027E-12,
0.0,
0.0,
0.0
@@ -107,33 +107,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.323089666911539,
- 0.24758491393186052,
- 0.18129421092721176,
- 0.12541059096895307,
- 0.08063496374843171,
- 0.047282547683076624,
- 0.02488097259816519,
- 0.011457071080104164,
- 0.004588560436210724,
- 0.001610352711493845,
- 5.315086369828394E-4,
- 1.7531305177478885E-4,
- 6.389789563374478E-5,
- 2.206453565668007E-5,
- 6.461228066363385E-6,
- 1.4429346461701171E-6,
- 2.1368296275588822E-7,
- 1.4300133029433948E-8,
- 2.3543498351249564E-10,
+ 0.38588792735268296,
+ 0.29169181634096886,
+ 0.21024651625386007,
+ 0.14303905241576215,
+ 0.09058385480635861,
+ 0.0525016609016191,
+ 0.02744137330432235,
+ 0.012631185767372747,
+ 0.005103408310287765,
+ 0.001829361649303553,
+ 6.238262224418692E-4,
+ 2.1268209893357393E-4,
+ 7.846387171506557E-5,
+ 2.7067879303579683E-5,
+ 7.906371964364534E-6,
+ 1.7607129704369102E-6,
+ 2.596744936339496E-7,
+ 1.7216536557179972E-8,
+ 2.7454111357798576E-10,
0.0
]
},
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.3792131148368769,
- 0.30181405146496404,
- 0.22931058810266364,
- 0.16637705775837555,
- 0.11284293663738658,
- 0.07150188131224736,
- 0.04125857873501409,
- 0.021301164908803624,
- 0.0098096179879395,
- 0.0040149838866093595,
- 0.001500429762067158,
- 5.416006239123889E-4,
- 1.997950272500286E-4,
- 7.697685554584058E-5,
- 2.8606608965471786E-5,
- 9.238493263119112E-6,
- 2.4275734626944018E-6,
- 4.7233560452756187E-7,
- 5.3061493457882E-8,
- 2.0667973094345883E-9
+ 0.45867450452345887,
+ 0.361467336535617,
+ 0.2712703821783725,
+ 0.19410701505251213,
+ 0.12978490542071433,
+ 0.0812511421345725,
+ 0.04648700252298603,
+ 0.023911014030141984,
+ 0.011038079978765575,
+ 0.004565418449280248,
+ 0.0017402884091994482,
+ 6.44617139269577E-4,
+ 2.432224009747154E-4,
+ 9.447322260266001E-5,
+ 3.5056214752020526E-5,
+ 1.1288189451674183E-5,
+ 2.9569688446471335E-6,
+ 5.731561890831766E-7,
+ 6.392724576463867E-8,
+ 2.440843310238544E-9
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
index e0f1d80d9147b822a344cd0da96a367d789eef15..c15a007c6023bb74cd65eda87724d5b7ff576d29 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-KODIAK_AK.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.8404344847740731,
- 0.5865271837685091,
- 0.40077601205070534,
- 0.2686256341005822,
- 0.17784797486652504,
- 0.11496764881574145,
- 0.07389886292556469,
- 0.046276925571919536,
- 0.028254584135954903,
- 0.016546067701155173,
- 0.00922363864079834,
- 0.004894322471912662,
- 0.0024847262234650876,
- 0.0012033330429449104,
- 5.451069517804273E-4,
- 2.2465843011823172E-4,
- 7.779047269157512E-5,
- 2.1560546784107914E-5,
- 4.297563314411423E-6,
+ 1.013363770697143,
+ 0.7157263495102535,
+ 0.49388607531763884,
+ 0.33312112437031244,
+ 0.22082387121435032,
+ 0.1420083075063264,
+ 0.09018213475559324,
+ 0.055426247505065786,
+ 0.033072604205579004,
+ 0.018891844724655087,
+ 0.010271016726300363,
+ 0.0053179137698314855,
+ 0.0026371845292627216,
+ 0.0012509098509137881,
+ 5.57437137795543E-4,
+ 2.2712211354682785E-4,
+ 7.807289110366278E-5,
+ 2.1568977490089235E-5,
+ 4.297636858607089E-6,
2.0536860114937204E-7
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.2194273060802746,
- 0.15283351695987885,
- 0.10338599689603978,
- 0.06773900202765581,
- 0.04270157085753944,
- 0.025986498160931536,
- 0.015142326022505264,
- 0.008569769216601592,
- 0.004774730001466273,
- 0.0026437161581966263,
- 0.0014576995573262442,
- 7.785320955490772E-4,
- 3.806610405676785E-4,
- 1.6361077258660305E-4,
- 5.676871634838762E-5,
- 1.5492378109298344E-5,
- 2.5085933415318417E-6,
+ 0.2665241893378751,
+ 0.18398253181635946,
+ 0.12288622831278118,
+ 0.07917105234045582,
+ 0.04887166544555736,
+ 0.029042776551652216,
+ 0.01650308881075483,
+ 0.009116040973178124,
+ 0.004970148332366398,
+ 0.0027043296000873085,
+ 0.0014736665546919397,
+ 7.819246798578659E-4,
+ 3.8117416438598347E-4,
+ 1.6365877970741933E-4,
+ 5.677189941798098E-5,
+ 1.5492589085135303E-5,
+ 2.508597142326327E-6,
4.6794816200387055E-8,
0.0,
0.0
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.1526360101507866,
- 0.8242677755204995,
- 0.5724216698759004,
- 0.38665318603516846,
- 0.25580418632614244,
- 0.1669917190923498,
- 0.10826996058607878,
- 0.06966876439301932,
- 0.04474810668352218,
- 0.028372099194081898,
- 0.01747269034455005,
- 0.01006095660086972,
- 0.005461026366001407,
- 0.002718309096507743,
- 0.001243177200852946,
- 5.066328325684451E-4,
- 1.788173328312059E-4,
- 5.214644381372611E-5,
- 1.1811557183445908E-5,
- 1.7439765654126134E-6
+ 1.3408345317846213,
+ 0.969899648652021,
+ 0.6815022215051317,
+ 0.46524328325364817,
+ 0.3101530470092898,
+ 0.2030258644454533,
+ 0.13114161490243953,
+ 0.0834401180727227,
+ 0.05262701206773796,
+ 0.032627530733747044,
+ 0.019644320131005266,
+ 0.011076561294631897,
+ 0.005902286614616158,
+ 0.0028874304111664454,
+ 0.0012997016678065582,
+ 5.221788098917305E-4,
+ 1.8208195153742915E-4,
+ 5.256921644361611E-5,
+ 1.1831027933405245E-5,
+ 1.7443720122117333E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.624109805998459,
- 1.2226460694208237,
- 0.8852266647677006,
- 0.6224599283648596,
- 0.42265481046237,
- 0.28327427121041515,
- 0.18693970102390237,
- 0.12184687818492583,
- 0.07904956202588341,
- 0.050954651205685805,
- 0.03246859527951131,
- 0.020126398309652047,
- 0.011912189665911333,
- 0.006651750924812484,
- 0.003495161166830058,
- 0.0017239536203457354,
- 7.991881555788581E-4,
- 3.450207051401536E-4,
- 1.340094076792947E-4,
- 4.540586206164031E-5
+ 1.8672361871120091,
+ 1.4190482838281584,
+ 1.0391078344778282,
+ 0.7395198683086204,
+ 0.5080993239683914,
+ 0.34374237360406884,
+ 0.22806090638156648,
+ 0.14859422601942798,
+ 0.09570461068770232,
+ 0.06082527313629742,
+ 0.038026930643226105,
+ 0.02308611594695648,
+ 0.013392666580648067,
+ 0.007340237305517689,
+ 0.003788292187797305,
+ 0.0018355124789115119,
+ 8.363489278524868E-4,
+ 3.5544840173417096E-4,
+ 1.3627984255064113E-4,
+ 4.5729067746378144E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
index 0d67f8029b6c806c9e9c9c63713955b5c0123279..906d3eef8e56dd1677da3922e9fca22fb490dd58 100644
--- a/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
+++ b/src/test/resources/e2e/nshm-alaska-2023/nshm-alaska-2023-2023-VALDEZ_AK.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.6299046045387079,
- 0.47447226903822487,
- 0.3472524457399274,
- 0.24406991152590884,
- 0.16427354033205788,
- 0.10440205619829115,
- 0.0642067847189413,
- 0.03784518162183598,
- 0.02174681810913368,
- 0.012126464959081575,
- 0.006535734075632212,
- 0.00338878219835901,
- 0.001686908873556229,
- 8.039192819979946E-4,
- 3.62084844135578E-4,
- 1.5078791747733279E-4,
- 5.424868371095319E-5,
- 1.607420839877202E-5,
- 3.630056256889395E-6,
+ 0.7629889045557231,
+ 0.5721241530015008,
+ 0.4163837838736407,
+ 0.2912203846997569,
+ 0.19537948637734961,
+ 0.12396769532121754,
+ 0.0761616148802313,
+ 0.044802441441200776,
+ 0.025632607275670936,
+ 0.014182490228387473,
+ 0.007553310345164416,
+ 0.003850543156791848,
+ 0.0018741699485498983,
+ 8.69542085468047E-4,
+ 3.8105133622572216E-4,
+ 1.550112402819662E-4,
+ 5.481289058323633E-5,
+ 1.6098652742273404E-5,
+ 3.6301729250574216E-6,
3.0408995435738497E-7
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.22577318382621897,
- 0.16130606326878966,
- 0.1096139780203185,
- 0.07065031112174791,
- 0.04290057946319363,
- 0.024680899810424282,
- 0.013379137641091445,
- 0.006958567840004404,
- 0.003535786494134302,
- 0.0017932370931140337,
- 9.280505991274705E-4,
- 4.8337625605757243E-4,
- 2.3980897907655206E-4,
- 1.0757623759359718E-4,
- 3.960287135238021E-5,
- 1.1686186094137888E-5,
- 2.332387409099905E-6,
+ 0.2575681078683554,
+ 0.18228477251286343,
+ 0.12286236172382821,
+ 0.07862860365973191,
+ 0.047441433442063405,
+ 0.027128089778643893,
+ 0.014604457306753103,
+ 0.007525798272088874,
+ 0.00377322426666045,
+ 0.0018798151245613358,
+ 9.546277458247886E-4,
+ 4.898796499184478E-4,
+ 2.4094287427296827E-4,
+ 1.076971009833143E-4,
+ 3.960806331677194E-5,
+ 1.1686498687445723E-5,
+ 2.332392972990725E-6,
7.542593136976315E-8,
0.0,
0.0
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.7376671406508765,
- 0.5561553801958472,
- 0.4091719495481542,
- 0.2914540583196555,
- 0.20082742430695427,
- 0.1343320131066038,
- 0.08768308703415115,
- 0.05579571413678135,
- 0.034906991056160235,
- 0.021423636877114426,
- 0.0128576364041758,
- 0.0073065920793854615,
- 0.003941887700405337,
- 0.0019443960684773875,
- 8.781898164577589E-4,
- 3.5468336748532364E-4,
- 1.26299103310793E-4,
- 3.846806757155577E-5,
- 9.57872312572373E-6,
- 1.7201496031478442E-6
+ 0.8971269314597337,
+ 0.678938397812923,
+ 0.5008941313096592,
+ 0.3577250842872677,
+ 0.24713308234516454,
+ 0.16561137626161326,
+ 0.10808657738956243,
+ 0.0685454162972931,
+ 0.042556336633459556,
+ 0.02580275530700313,
+ 0.015245594657295343,
+ 0.008506777542978112,
+ 0.004500902177338201,
+ 0.0021729902421629196,
+ 9.589972822737611E-4,
+ 3.7802294879788167E-4,
+ 1.3140834527926805E-4,
+ 3.914681073388893E-5,
+ 9.609971456839646E-6,
+ 1.7208604438350094E-6
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.9727668166079745,
- 0.7517151180955417,
- 0.5654313022599589,
- 0.41563562327908227,
- 0.29543203036023835,
- 0.20601569228325545,
- 0.14010249137606132,
- 0.09287316167820703,
- 0.06034489091038432,
- 0.03843144022815171,
- 0.024034854065640578,
- 0.014672419913492713,
- 0.008637317275395346,
- 0.004830539433518881,
- 0.002534974503521233,
- 0.001237415913408027,
- 5.638637758239706E-4,
- 2.4006673144048437E-4,
- 9.389944336290087E-5,
- 3.274313174624873E-5
+ 1.1735054342097104,
+ 0.9139674436311953,
+ 0.6922252706374098,
+ 0.5118543190379689,
+ 0.36571237190168554,
+ 0.25605373063484804,
+ 0.17456652376021248,
+ 0.11575158414203722,
+ 0.07500806336976393,
+ 0.04746662888567671,
+ 0.029383813204709845,
+ 0.01769931699211108,
+ 0.010259455264138087,
+ 0.0056414230100924586,
+ 0.00290538313881707,
+ 0.0013877547971993549,
+ 6.167947433201406E-4,
+ 2.5562375219072953E-4,
+ 9.740097954236462E-5,
+ 3.324155685868453E-5
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
index 211a5abfcb496f1befae72517bf4c3b7bce77a03..721e62a33568dcf285e27c7d3871f14566898126 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-BOSTON_MA.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.020784550979940128,
+ 0.020784550979940135,
0.013752036153143974,
0.008853912425965713,
- 0.005504502737593538,
+ 0.005504502737593541,
0.0032956032209899917,
- 0.0018514963923265217,
+ 0.001851496392326522,
9.931435977960567E-4,
- 4.956595518220794E-4,
- 2.3401548992797762E-4,
- 1.0471944598011255E-4,
+ 4.956595518220796E-4,
+ 2.340154899279777E-4,
+ 1.0471944598011258E-4,
4.508421273772284E-5,
- 1.889630156023541E-5,
+ 1.8896301560235418E-5,
7.725874681605789E-6,
- 3.0391435785521572E-6,
- 1.1170515811344102E-6,
- 3.745132401726645E-7,
- 1.075296239780416E-7,
- 2.5960707366581502E-8,
+ 3.039143578552158E-6,
+ 1.1170515811344104E-6,
+ 3.7451324017266463E-7,
+ 1.0752962397804165E-7,
+ 2.596070736658151E-8,
4.917918081492094E-9,
- 6.50338376685779E-10
+ 6.503383766857791E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -70,25 +70,25 @@
],
"ys": [
0.003849668670011357,
- 0.002507866418331777,
+ 0.0025078664183317764,
0.0015597948853785957,
- 9.157017059864713E-4,
- 5.001931310456335E-4,
+ 9.157017059864714E-4,
+ 5.001931310456336E-4,
2.547249918503188E-4,
1.194486623970574E-4,
- 5.232735935686702E-5,
- 2.156118337115127E-5,
+ 5.232735935686701E-5,
+ 2.1561183371151274E-5,
8.4003477208669E-6,
- 3.14699581817278E-6,
- 1.142023685405199E-6,
- 3.9303700685767165E-7,
- 1.2947742656347803E-7,
+ 3.1469958181727807E-6,
+ 1.1420236854051995E-6,
+ 3.9303700685767176E-7,
+ 1.2947742656347805E-7,
3.7186688126926624E-8,
- 9.324871744942211E-9,
- 1.877882948712356E-9,
- 2.8466329320775234E-10,
- 2.6974731510803595E-11,
- 1.0385526508492283E-12
+ 9.324871744942213E-9,
+ 1.8778829487123563E-9,
+ 2.8466329320775244E-10,
+ 2.69747315108036E-11,
+ 1.0385526508492285E-12
]
},
"Peak Ground Acceleration": {
@@ -107,33 +107,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.03915433626110455,
- 0.028874987776381138,
- 0.020883581441243287,
- 0.014675088491569475,
- 0.009966398305490464,
+ 0.039154336261104566,
+ 0.02887498777638114,
+ 0.02088358144124329,
+ 0.014675088491569479,
+ 0.009966398305490466,
0.006525399875535824,
0.0041221943891111765,
0.0025039012846601923,
0.0014759816292745382,
- 8.455590549998979E-4,
- 4.7443786929523266E-4,
- 2.5614908673281044E-4,
+ 8.455590549998984E-4,
+ 4.744378692952328E-4,
+ 2.5614908673281055E-4,
1.357929724979682E-4,
- 6.854218948534532E-5,
- 3.291803684798865E-5,
- 1.4569587193494355E-5,
- 5.782794746110381E-6,
- 1.9737183250309444E-6,
- 5.657594675445634E-7,
+ 6.854218948534535E-5,
+ 3.291803684798866E-5,
+ 1.4569587193494363E-5,
+ 5.782794746110383E-6,
+ 1.973718325030945E-6,
+ 5.657594675445636E-7,
1.2462940285422407E-7
]
},
@@ -162,25 +162,25 @@
],
"ys": [
0.06054799387340501,
- 0.04501093716568888,
+ 0.0450109371656889,
0.03238422553470724,
0.022605947101161115,
0.01506013117511144,
0.009690757366506483,
0.005957079199326996,
- 0.00349010751115822,
- 0.0019627024343097255,
- 0.0010598138716072611,
- 5.526846406248314E-4,
+ 0.003490107511158219,
+ 0.001962702434309726,
+ 0.0010598138716072614,
+ 5.526846406248316E-4,
2.787643997578851E-4,
- 1.3582948573407556E-4,
- 6.359388081275606E-5,
- 2.8287825293638214E-5,
- 1.1707073491487447E-5,
- 4.4199232564301465E-6,
- 1.4745471754128641E-6,
- 4.1424535992947286E-7,
- 9.342364439170645E-8
+ 1.358294857340756E-4,
+ 6.359388081275608E-5,
+ 2.828782529363822E-5,
+ 1.170707349148745E-5,
+ 4.419923256430147E-6,
+ 1.4745471754128643E-6,
+ 4.1424535992947296E-7,
+ 9.342364439170646E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
index 65fc783b780d917aabc13b7bf65422ee05d0ee47..0dd5f89df3effefa04920b8a699bb141d5a7d926 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-CHICAGO_IL.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.01767550023787112,
- 0.011804993270225161,
+ 0.017675500237871122,
+ 0.011804993270225165,
0.007916670756587604,
- 0.00534914724804457,
+ 0.005349147248044571,
0.003631390427708422,
0.0023844055384784854,
0.0014870231028831253,
- 8.355484214788522E-4,
- 4.146065777693268E-4,
- 1.7579111278565783E-4,
- 6.240935342700551E-5,
- 1.824083214413613E-5,
+ 8.355484214788528E-4,
+ 4.146065777693269E-4,
+ 1.7579111278565786E-4,
+ 6.24093534270055E-5,
+ 1.8240832144136128E-5,
4.4149279640637774E-6,
- 9.994457044956118E-7,
- 2.485513364750663E-7,
- 7.726459746150786E-8,
- 2.1210423184880136E-8,
- 4.860565864414977E-9,
+ 9.99445704495612E-7,
+ 2.485513364750664E-7,
+ 7.726459746150788E-8,
+ 2.121042318488014E-8,
+ 4.860565864414978E-9,
8.641052442615079E-10,
- 1.0633132855584105E-10
+ 1.0633132855584107E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -70,24 +70,24 @@
],
"ys": [
0.004904504983066266,
- 0.0037556118245414046,
+ 0.003755611824541405,
0.002900685498117759,
- 0.0021972569063650723,
- 0.0015714972511203793,
+ 0.002197256906365073,
+ 0.0015714972511203789,
0.0010317853455482512,
- 5.988137176440331E-4,
- 2.999898092710794E-4,
+ 5.98813717644033E-4,
+ 2.9998980927107953E-4,
1.2636087757687212E-4,
- 4.3341537270629574E-5,
- 1.1727951025836873E-5,
+ 4.334153727062959E-5,
+ 1.172795102583687E-5,
2.3832470064242068E-6,
- 3.5209264942037663E-7,
- 3.785179659277222E-8,
- 5.963076928168123E-9,
+ 3.5209264942037684E-7,
+ 3.7851796592772213E-8,
+ 5.963076928168122E-9,
1.4910332126633127E-9,
- 3.14178873723765E-10,
- 5.251118966478055E-11,
- 5.968234937924543E-12,
+ 3.1417887372376505E-10,
+ 5.2511189664780556E-11,
+ 5.968234937924545E-12,
3.1469632224157163E-13
]
},
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
0.02270915099639857,
0.01551640012938908,
- 0.01063565058866354,
- 0.007250987342509732,
- 0.004847475264828738,
- 0.0031114243186504235,
- 0.0018782779132334618,
+ 0.010635650588663541,
+ 0.007250987342509733,
+ 0.004847475264828739,
+ 0.003111424318650424,
+ 0.0018782779132334622,
0.001050022497993213,
- 5.534113089259502E-4,
+ 5.534113089259504E-4,
2.81605357092695E-4,
- 1.4369489671881906E-4,
- 7.346403339083293E-5,
- 3.832529799905896E-5,
- 1.943156997427037E-5,
+ 1.4369489671881908E-4,
+ 7.346403339083295E-5,
+ 3.832529799905897E-5,
+ 1.9431569974270375E-5,
9.421592539610684E-6,
4.1976884388553816E-6,
- 1.669627977065477E-6,
- 5.688244700978394E-7,
- 1.6230550529800462E-7,
- 3.5499549032952975E-8
+ 1.6696279770654772E-6,
+ 5.688244700978396E-7,
+ 1.6230550529800464E-7,
+ 3.549954903295298E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,24 +162,24 @@
],
"ys": [
0.04184772415672416,
- 0.028519812182555622,
+ 0.028519812182555625,
0.01902862263652819,
0.012597694078764632,
- 0.008183488070776037,
- 0.0052563265681882425,
- 0.003237883245763997,
- 0.001863531680168195,
- 9.907119514822526E-4,
- 4.830130551236982E-4,
- 2.1935879450693258E-4,
+ 0.008183488070776035,
+ 0.005256326568188243,
+ 0.0032378832457639973,
+ 0.0018635316801681949,
+ 9.907119514822528E-4,
+ 4.830130551236983E-4,
+ 2.1935879450693267E-4,
9.551470151347582E-5,
- 4.124782682724971E-5,
+ 4.1247826827249706E-5,
1.7924007974639768E-5,
- 7.69163382946073E-6,
- 3.129256114185963E-6,
- 1.1644839692951632E-6,
- 3.815542517446424E-7,
- 1.0444941528551554E-7,
+ 7.691633829460732E-6,
+ 3.129256114185964E-6,
+ 1.1644839692951635E-6,
+ 3.8155425174464243E-7,
+ 1.0444941528551557E-7,
2.2656380775801956E-8
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
index f83c052f3551b86ae63c3f78595cff562a2eb805..8564b1025910a23fb7018c01e8dfe4696afeb0a2 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-LOS_ANGELES_CA.json
@@ -3,44 +3,44 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
0.6366574720501088,
- 0.4718037479196399,
+ 0.47180374791963997,
0.336364557146257,
- 0.23117962261923944,
+ 0.2311796226192394,
0.15426255108470943,
0.09868641697941964,
- 0.061682269839009964,
+ 0.06168226983900997,
0.037095482704419605,
0.021775137700280892,
0.012418053525144834,
0.006834724125143083,
0.0035759571677002966,
0.0017322386889934245,
- 7.490722245704206E-4,
+ 7.490722245704205E-4,
2.781308992738419E-4,
- 8.555251892469371E-5,
+ 8.55525189246937E-5,
1.9638736883809428E-5,
- 2.9639317351150696E-6,
+ 2.96393173511507E-6,
2.2713550419680115E-7,
2.172828515836533E-9
]
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,9 +69,9 @@
0.7929925155296614
],
"ys": [
- 0.1684437724485485,
+ 0.16844377244854847,
0.11829589663275786,
- 0.08101452065128259,
+ 0.08101452065128258,
0.05406282717487072,
0.035127313944556586,
0.02246250359719528,
@@ -82,11 +82,11 @@
0.0011102558974719061,
4.306689571156029E-4,
1.3931953053831388E-4,
- 3.783374572908093E-5,
+ 3.7833745729080926E-5,
8.044063188459818E-6,
1.3835389066707896E-6,
1.5518435606411874E-7,
- 7.362387772322911E-9,
+ 7.36238777232291E-9,
8.557445185989779E-13,
0.0
]
@@ -107,10 +107,10 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
@@ -118,15 +118,15 @@
0.7850465833348313,
0.6149388088135578,
0.46880770081149936,
- 0.34810417974850305,
- 0.252326595582187,
+ 0.348104179748503,
+ 0.25232659558218706,
0.17814867226367861,
0.12154240052962642,
0.07901532677500141,
0.04903288877565289,
0.02903200372417984,
0.016462922915925538,
- 0.008728254448989729,
+ 0.00872825444898973,
0.004380357672598145,
0.001967488906616791,
7.622024986858485E-4,
@@ -161,23 +161,23 @@
1.998773638612381
],
"ys": [
- 0.9277678999858487,
- 0.7537480330381081,
- 0.5931923233025839,
+ 0.9277678999858486,
+ 0.753748033038108,
+ 0.5931923233025838,
0.45540482519284387,
0.3391134734752599,
- 0.2480905374176591,
+ 0.24809053741765913,
0.1766116798966622,
- 0.1212300246443606,
+ 0.12123002464436061,
0.07985280215586492,
0.050147609948821836,
0.030081503068165788,
0.01724538444217736,
- 0.009432364207667703,
+ 0.009432364207667705,
0.004883172427187242,
0.002333377346825734,
9.819488750632801E-4,
- 3.4760702120873095E-4,
+ 3.476070212087309E-4,
9.771982942272988E-5,
1.9713363600257578E-5,
2.3576513888748996E-6
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
index 79d39bb03e3385d31738ac99684c1228b9cec86b..50f06aaa26e7414f7dc7c35c5619dde05085e6b1 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_MADRID_MO.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.05460474620644812,
+ 0.05460474620644813,
0.039322200263679656,
- 0.027742521888583595,
- 0.019256487920663257,
- 0.013309032474447957,
- 0.009158100387208452,
- 0.006469954492673557,
- 0.004711825464791654,
- 0.00361441996860359,
+ 0.0277425218885836,
+ 0.019256487920663253,
+ 0.013309032474447955,
+ 0.009158100387208453,
+ 0.006469954492673558,
+ 0.004711825464791655,
+ 0.0036144199686035917,
0.0029237508993505785,
- 0.0024589761818590043,
- 0.002072470767532479,
- 0.0016635058660181767,
- 0.001206920974532014,
- 7.580051949212136E-4,
- 4.0281368863859246E-4,
- 1.747374387292787E-4,
- 6.14366486371895E-5,
- 1.660370716466393E-5,
- 3.281988579552932E-6
+ 0.002458976181859004,
+ 0.0020724707675324784,
+ 0.0016635058660181762,
+ 0.0012069209745320141,
+ 7.580051949212137E-4,
+ 4.0281368863859235E-4,
+ 1.7473743872927874E-4,
+ 6.143664863718949E-5,
+ 1.660370716466394E-5,
+ 3.2819885795529324E-6
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.01118335095019382,
+ 0.011183350950193821,
0.00820850133786319,
0.006125994378655951,
- 0.004704029030923133,
- 0.003744509775095578,
- 0.0031134253259270826,
+ 0.004704029030923134,
+ 0.0037445097750955793,
+ 0.0031134253259270835,
0.0026896900327019677,
0.0023879637030226153,
0.002117544110718752,
- 0.0018011501748482464,
- 0.0014173471729516552,
- 0.001006813017595508,
- 6.301951022408455E-4,
- 3.44478169914051E-4,
+ 0.001801150174848246,
+ 0.001417347172951655,
+ 0.0010068130175955078,
+ 6.301951022408453E-4,
+ 3.444781699140508E-4,
1.561396083486973E-4,
- 5.8874162884499284E-5,
- 1.7483012613921882E-5,
+ 5.887416288449928E-5,
+ 1.7483012613921875E-5,
3.8576776780498505E-6,
5.776336202494065E-7,
- 3.6035648979050635E-8
+ 3.6035648979050615E-8
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.11111072621136198,
+ 0.111110726211362,
0.09432125494016416,
- 0.07822805599600459,
- 0.06292369383675941,
- 0.04897014435727336,
- 0.03694215394316334,
+ 0.07822805599600462,
+ 0.06292369383675943,
+ 0.048970144357273364,
+ 0.036942153943163344,
0.027163843299139248,
- 0.01953787756874624,
- 0.013915832488455513,
- 0.009887221698272162,
- 0.007094041349666845,
- 0.0051464353161795075,
- 0.003865608590322207,
- 0.00298376664089472,
- 0.002326071147545305,
- 0.0017237133487967337,
+ 0.019537877568746243,
+ 0.01391583248845552,
+ 0.009887221698272164,
+ 0.007094041349666849,
+ 0.005146435316179507,
+ 0.0038656085903222065,
+ 0.0029837666408947206,
+ 0.0023260711475453035,
+ 0.0017237133487967345,
0.00112653887918541,
6.015982295191784E-4,
2.510477911128341E-4,
- 7.632592705118942E-5
+ 7.632592705118941E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.13557175676510383,
- 0.11487697773688868,
- 0.0947333692215918,
- 0.07576523916620488,
- 0.05806165639924289,
- 0.043077020760732714,
- 0.030893330875149033,
- 0.02154336192618488,
- 0.01480267705425384,
- 0.010119114510192404,
- 0.006988258677940673,
+ 0.13557175676510386,
+ 0.11487697773688867,
+ 0.09473336922159183,
+ 0.0757652391662049,
+ 0.0580616563992429,
+ 0.04307702076073273,
+ 0.030893330875149037,
+ 0.021543361926184883,
+ 0.014802677054253845,
+ 0.010119114510192408,
+ 0.006988258677940676,
0.00495471722552012,
0.003663126515262554,
0.002832444396585899,
- 0.002237940845752876,
- 0.0017164930070629656,
- 0.0011926180558950769,
- 6.965535536645008E-4,
- 3.2111317564048023E-4,
- 1.1269789534198825E-4
+ 0.0022379408457528773,
+ 0.001716493007062966,
+ 0.0011926180558950762,
+ 6.96553553664501E-4,
+ 3.2111317564048007E-4,
+ 1.1269789534198826E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
index 8e052db4a28ff6c40e5df1186c6cf559f4b8c4ea..d623559b6fbc695718bfec7e43b77e72815fe1a0 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-NEW_YORK_NY.json
@@ -3,44 +3,44 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.018666421015364292,
- 0.012277714382170499,
+ 0.018666421015364296,
+ 0.012277714382170502,
0.007819753747405414,
0.004783588386662286,
- 0.0028112191687725894,
- 0.0015540453407317347,
+ 0.0028112191687725903,
+ 0.001554045340731735,
8.285075887238437E-4,
- 4.1827330817572424E-4,
- 2.047796180654526E-4,
- 9.768413828648056E-5,
- 4.5829796515008224E-5,
+ 4.1827330817572434E-4,
+ 2.0477961806545262E-4,
+ 9.768413828648058E-5,
+ 4.582979651500823E-5,
2.1108151934584483E-5,
- 9.40307880873417E-6,
- 3.952177823009205E-6,
+ 9.403078808734168E-6,
+ 3.952177823009206E-6,
1.52393681070903E-6,
- 5.283693302216127E-7,
- 1.553244886867919E-7,
- 3.807576669004163E-8,
+ 5.283693302216128E-7,
+ 1.5532448868679193E-7,
+ 3.807576669004164E-8,
7.285190754922316E-9,
9.71330593082485E-10
]
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.0036839290291613555,
+ 0.0036839290291613563,
0.0023350507514869807,
0.001402579620737425,
7.930112908299474E-4,
- 4.1808903382999866E-4,
- 2.0733134457052307E-4,
- 9.623213274255234E-5,
+ 4.1808903382999877E-4,
+ 2.0733134457052304E-4,
+ 9.623213274255235E-5,
4.2792093503938167E-5,
- 1.8488428033840786E-5,
- 7.785121676935123E-6,
- 3.2094244668835695E-6,
- 1.278872119889617E-6,
- 4.764036574053829E-7,
- 1.6510378239619124E-7,
+ 1.848842803384079E-5,
+ 7.785121676935125E-6,
+ 3.20942446688357E-6,
+ 1.2788721198896174E-6,
+ 4.76403657405383E-7,
+ 1.651037823961913E-7,
4.934185476859842E-8,
- 1.2738983551119938E-8,
- 2.6202525850572684E-9,
- 4.048583749596045E-10,
- 3.9044866281994814E-11,
- 1.53244519278671E-12
+ 1.273898355111994E-8,
+ 2.620252585057269E-9,
+ 4.048583749596044E-10,
+ 3.904486628199482E-11,
+ 1.5324451927867105E-12
]
},
"Peak Ground Acceleration": {
@@ -107,33 +107,33 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.029878942979656185,
+ 0.02987894297965619,
0.021699314985705948,
- 0.01562734517684146,
- 0.011107491120984695,
+ 0.015627345176841466,
+ 0.011107491120984697,
0.0077765862922841225,
0.0053497753310025545,
- 0.0036068398003160375,
- 0.002364766212564209,
- 0.0015114836562529477,
- 9.383042482967953E-4,
- 5.67261288303205E-4,
- 3.277563019042573E-4,
- 1.837902668533268E-4,
- 9.707147245294277E-5,
- 4.821670939105442E-5,
+ 0.003606839800316038,
+ 0.00236476621256421,
+ 0.001511483656252948,
+ 9.383042482967955E-4,
+ 5.672612883032051E-4,
+ 3.2775630190425736E-4,
+ 1.8379026685332684E-4,
+ 9.707147245294275E-5,
+ 4.821670939105443E-5,
2.1867540425618328E-5,
- 8.832673455739918E-6,
+ 8.83267345573992E-6,
3.054523154324783E-6,
- 8.84797873298568E-7,
+ 8.847978732985681E-7,
1.9672786782893157E-7
]
},
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.048301983959234095,
+ 0.0483019839592341,
0.03504973561764059,
- 0.02474405245474288,
- 0.01709523430471773,
+ 0.024744052454742885,
+ 0.017095234304717735,
0.011415111740065452,
- 0.007482577963101016,
+ 0.007482577963101015,
0.0047698738556462535,
0.002948091284747602,
- 0.0017725798590443333,
- 0.0010323738247512593,
- 5.823000408387338E-4,
- 3.169405845714303E-4,
- 1.6560745740360768E-4,
- 8.238484623559815E-5,
+ 0.0017725798590443338,
+ 0.0010323738247512595,
+ 5.823000408387339E-4,
+ 3.1694058457143036E-4,
+ 1.656074574036077E-4,
+ 8.238484623559817E-5,
3.852324830287548E-5,
- 1.6575499019099988E-5,
+ 1.657549901909999E-5,
6.439186747078615E-6,
2.192582065492888E-6,
- 6.249719391706647E-7,
+ 6.24971939170665E-7,
1.4238886738032342E-7
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
index 64cf362a87bd424cc01dfa35c5fc5910b4eeee95..bafa93fbacb40d09fbb220fed30ff634ac6fcc9a 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-RENO_NV.json
@@ -3,42 +3,42 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.5639424382793681,
+ 0.5639424382793682,
0.41970430872704,
- 0.29963556317003365,
+ 0.2996355631700337,
0.20436506496344023,
0.13386011296908937,
0.08340469061324253,
0.05072763584783538,
- 0.029703320886451754,
+ 0.02970332088645175,
0.016962428614047866,
- 0.009368748098138395,
+ 0.009368748098138393,
0.004942501068704084,
0.002420101079214425,
- 0.0010564988095787104,
+ 0.0010564988095787106,
3.945561117465654E-4,
1.2048922319737728E-4,
- 2.8266770250121338E-5,
+ 2.8266770250121335E-5,
4.252380705836177E-6,
4.4029329263288646E-7,
2.573585831849357E-8,
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,23 +69,23 @@
0.7929925155296614
],
"ys": [
- 0.1619520024002511,
+ 0.16195200240025112,
0.11197070315750861,
0.07461644808670248,
0.04806931482649302,
- 0.029904421907731286,
+ 0.029904421907731293,
0.018097205110430375,
0.010526649862628145,
- 0.0058497036090659794,
+ 0.005849703609065979,
0.0030248691579733374,
- 0.001398899091725516,
+ 0.0013988990917255157,
5.607903420664931E-4,
1.884917390363045E-4,
- 5.034839107343867E-5,
- 1.033150576172653E-5,
+ 5.034839107343866E-5,
+ 1.0331505761726529E-5,
1.5403732253339458E-6,
1.766940560506774E-7,
- 9.230578884022919E-9,
+ 9.230578884022922E-9,
0.0,
0.0,
0.0
@@ -107,30 +107,30 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.6547357887817038,
+ 0.6547357887817037,
0.5154175476805015,
0.3956456162265481,
- 0.29463778537314556,
+ 0.2946377853731455,
0.21261726439098355,
0.14856083770157558,
- 0.1002311229879195,
+ 0.10023112298791949,
0.06449394268051883,
0.03938928323399141,
- 0.022644338964053445,
+ 0.022644338964053448,
0.012321069753420741,
0.006191664090278571,
0.0028672800399024167,
0.001131585475187518,
3.666664317975439E-4,
- 9.021209601637857E-5,
+ 9.021209601637859E-5,
1.523566711127091E-5,
1.4539154793262797E-6,
6.099357830874233E-8,
@@ -164,11 +164,11 @@
0.7737520693137596,
0.626158058671475,
0.4943026693905384,
- 0.3815237316109364,
+ 0.38152373161093633,
0.2849928378328236,
- 0.20811270361164622,
+ 0.20811270361164624,
0.14726293268062962,
- 0.10033741214019079,
+ 0.1003374121401908,
0.06562437576887947,
0.04081755703105158,
0.02407438562720991,
@@ -177,7 +177,7 @@
0.003434334658947344,
0.0014729955574711105,
5.304815215680369E-4,
- 1.532501046018872E-4,
+ 1.5325010460188717E-4,
3.2864405116884194E-5,
4.5541957008082325E-6,
3.3625843088903307E-7
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
index f5f90240d59c510aae39e008a824eb94ef73d1c1..14f35cdc2ca7befbb18070c9f8d24d5fb6a6eb70 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SALT_LAKE_CITY_UT.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
0.10141210582180435,
0.07447849798602046,
0.05330127231316856,
- 0.037102818795138215,
+ 0.03710281879513821,
0.025232028167263762,
- 0.016610346496346337,
- 0.010874067593129604,
+ 0.01661034649634634,
+ 0.010874067593129606,
0.00708922479836808,
0.004735625457686324,
- 0.0032494647560939506,
- 0.0022454952268110224,
- 0.0014914478772558568,
- 8.988552768687258E-4,
- 4.6566809395121077E-4,
- 1.9882970591587773E-4,
- 6.785029212800547E-5,
+ 0.003249464756093951,
+ 0.002245495226811023,
+ 0.001491447877255857,
+ 8.988552768687257E-4,
+ 4.6566809395121093E-4,
+ 1.9882970591587768E-4,
+ 6.78502921280055E-5,
1.6876651512201572E-5,
2.653741741725593E-6,
1.731813940276621E-7,
- 1.0355704040041718E-10
+ 1.035570404004172E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -70,25 +70,25 @@
],
"ys": [
0.033387015764916865,
- 0.02465096645560166,
+ 0.024650966455601664,
0.01764423071929716,
0.012269680846161648,
0.008337057201618096,
- 0.005635024432572455,
- 0.003789132702355024,
+ 0.005635024432572454,
+ 0.0037891327023550246,
0.0025149123784953846,
- 0.0015863429059217106,
+ 0.0015863429059217115,
9.014315449747967E-4,
- 4.4140296504165366E-4,
- 1.7921117169766222E-4,
+ 4.4140296504165355E-4,
+ 1.7921117169766217E-4,
5.7541181003569944E-5,
- 1.422452687769223E-5,
- 2.2078569144162738E-6,
+ 1.4224526877692225E-5,
+ 2.2078569144162733E-6,
1.888075384391226E-7,
- 2.916565870061635E-9,
- 1.3533194681297855E-11,
- 1.4761223207476851E-12,
- 7.365315902026216E-14
+ 2.916565870061634E-9,
+ 1.3533194681297857E-11,
+ 1.4761223207476853E-12,
+ 7.36531590202622E-14
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.1304710025872074,
- 0.09849712329595017,
- 0.07246017969843055,
- 0.05191828655903308,
+ 0.13047100258720737,
+ 0.09849712329595019,
+ 0.07246017969843056,
+ 0.05191828655903307,
0.03636526505318483,
- 0.024993217741374762,
- 0.016900968071016344,
- 0.011231650127527283,
- 0.007452801108191979,
- 0.005017181957434341,
+ 0.024993217741374765,
+ 0.01690096807101634,
+ 0.011231650127527281,
+ 0.007452801108191978,
+ 0.005017181957434342,
0.0034705679298442814,
0.002402368539815233,
- 0.0016078002266633952,
- 9.514053815001429E-4,
- 4.656644721669267E-4,
- 1.7536330043880214E-4,
- 4.811667218966292E-5,
- 8.632653500921545E-6,
- 8.008388400062673E-7,
- 2.2680106464068337E-8
+ 0.0016078002266633948,
+ 9.514053815001428E-4,
+ 4.656644721669266E-4,
+ 1.753633004388021E-4,
+ 4.8116672189662925E-5,
+ 8.632653500921544E-6,
+ 8.008388400062674E-7,
+ 2.268010646406833E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -166,21 +166,21 @@
0.09802333688436565,
0.0720099099078939,
0.05129669394322607,
- 0.036065852329150376,
- 0.024916005816203582,
+ 0.03606585232915037,
+ 0.02491600581620359,
0.01691309964162624,
0.011363408680915814,
- 0.007619737320678116,
+ 0.007619737320678117,
0.00518641999113049,
- 0.0036115560598548218,
- 0.00253928053666354,
- 0.0017305585661145013,
- 0.0010724055561078668,
- 5.639609734298517E-4,
- 2.395686745195439E-4,
- 7.882123713799232E-5,
- 1.86758419895919E-5,
- 2.701116080577684E-6
+ 0.003611556059854821,
+ 0.0025392805366635405,
+ 0.0017305585661145017,
+ 0.0010724055561078666,
+ 5.639609734298514E-4,
+ 2.3956867451954396E-4,
+ 7.882123713799233E-5,
+ 1.8675841989591893E-5,
+ 2.7011160805776843E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
index f282faf7a36286b04287fab47a7626608bcfa154..b115702a4fb11f0f2e2a2b93f7af3cac3a36201f 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SAN_FRANCISCO_CA.json
@@ -3,33 +3,33 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
0.5831008919911462,
0.4284199090706749,
- 0.30432995173186517,
- 0.20991504534178365,
+ 0.3043299517318651,
+ 0.20991504534178368,
0.14211631298661964,
0.09374868521078619,
- 0.061383844950437326,
+ 0.06138384495043732,
0.039071093308164724,
0.024201671562405724,
0.014386438506911663,
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,18 +69,18 @@
0.7929925155296614
],
"ys": [
- 0.15758937503731724,
- 0.11247692685397598,
- 0.07946884297427433,
+ 0.15758937503731726,
+ 0.11247692685397596,
+ 0.07946884297427434,
0.05560574371886311,
0.03824085383493095,
0.02585465059626231,
- 0.01705053462827973,
+ 0.017050534628279736,
0.011010094459237604,
0.006875269673181763,
0.004031893488663087,
- 0.002153405881721273,
- 0.001013260773576697,
+ 0.002153405881721278,
+ 0.0010132607735766973,
4.0392561747766895E-4,
1.357315165926373E-4,
3.5070265791185964E-5,
@@ -107,17 +107,17 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
0.7094470259373502,
0.5498428629048978,
- 0.41551231478349365,
+ 0.4155123147834937,
0.3063031193282665,
0.22104888785899784,
0.15688910340717468,
@@ -126,8 +126,8 @@
0.04928602923975804,
0.030791659709764246,
0.018082373041434497,
- 0.009607207734429657,
- 0.004562768246986615,
+ 0.009607207734429656,
+ 0.004562768246986616,
0.0017919912792970505,
5.570645285749892E-4,
1.2499276983585092E-4,
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.8463434568144551,
- 0.6798282480043855,
+ 0.846343456814455,
+ 0.6798282480043856,
0.529575106126662,
0.4029924331123037,
0.2978878788706715,
0.21720849261933428,
- 0.15561695133652084,
- 0.10937917498336788,
+ 0.15561695133652087,
+ 0.10937917498336787,
0.07525155479744264,
0.05001008517906983,
0.031720239807918466,
- 0.018914948303394893,
+ 0.018914948303394897,
0.010396290099441215,
0.005116134863810127,
0.002168905715322163,
7.537255830739884E-4,
2.043519900756787E-4,
- 3.950315353965147E-5,
+ 3.950315353965148E-5,
4.114149996331726E-6,
- 1.1332666265240457E-7
+ 1.1332666265240459E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
index 84a5bf24f17ddea50e5bbda8089533bbabf23839..60e08a3b75b79add1c166d7d7ad4b3fc3cba3a38 100644
--- a/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2018/nshm-conus-2018-2018-SEATTLE_WA.json
@@ -3,42 +3,42 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
0.18974076473276455,
0.15035830377424855,
- 0.11450746102005706,
- 0.08372212205395722,
- 0.059056934946773325,
+ 0.11450746102005707,
+ 0.08372212205395724,
+ 0.05905693494677333,
0.03979043310304015,
- 0.02608186984634462,
- 0.01639011789619338,
- 0.009939769051733806,
- 0.005732292608201422,
- 0.0030911152287355775,
- 0.0015239775147447628,
+ 0.026081869846344616,
+ 0.016390117896193383,
+ 0.009939769051733804,
+ 0.0057322926082014215,
+ 0.003091115228735578,
+ 0.0015239775147447626,
6.709168675782273E-4,
- 2.574847006859803E-4,
- 8.37874171428662E-5,
- 2.251661394813441E-5,
+ 2.5748470068598036E-4,
+ 8.378741714286619E-5,
+ 2.2516613948134413E-5,
4.500727576177568E-6,
6.144243207535918E-7,
4.524870395276403E-8,
@@ -48,7 +48,7 @@
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,20 +69,20 @@
0.7929925155296614
],
"ys": [
- 0.05798340021258256,
+ 0.05798340021258257,
0.04190422736568196,
0.02936624320782965,
- 0.019925269776090413,
+ 0.01992526977609041,
0.013059136945119223,
- 0.008356470041248171,
+ 0.008356470041248175,
0.005219092927360337,
- 0.0032087975808839644,
+ 0.0032087975808839653,
0.0019199405262616406,
- 0.0010855264302155057,
- 5.619278902307795E-4,
- 2.563270845634498E-4,
- 9.795826467321661E-5,
- 3.093950684856507E-5,
+ 0.0010855264302155054,
+ 5.619278902307794E-4,
+ 2.563270845634497E-4,
+ 9.79582646732166E-5,
+ 3.0939506848565075E-5,
7.164683336505891E-6,
9.927613969917701E-7,
3.041624502650113E-8,
@@ -107,32 +107,32 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.24771893078422802,
- 0.21523675836712636,
- 0.18161823548824615,
+ 0.24771893078422796,
+ 0.21523675836712639,
+ 0.18161823548824618,
0.1478057991464071,
- 0.11545178047071235,
- 0.08622984829115031,
- 0.0614308340584074,
+ 0.11545178047071233,
+ 0.08622984829115032,
+ 0.061430834058407394,
0.0414783202603966,
- 0.026613647847004044,
+ 0.026613647847004047,
0.01612206210785767,
0.009167459234650009,
- 0.0047229038072055946,
+ 0.004722903807205595,
0.002214599540841417,
8.96285507325836E-4,
3.067999345972684E-4,
8.267322513113308E-5,
1.5932119719803484E-5,
- 1.7946631532952552E-6,
+ 1.7946631532952554E-6,
1.06895828117477E-7,
6.68125464781831E-10
]
@@ -161,25 +161,25 @@
1.998773638612381
],
"ys": [
- 0.27215747755947084,
- 0.24281747775616977,
+ 0.2721574775594709,
+ 0.24281747775616974,
0.2111408438896052,
0.17854755392401112,
0.14527845926431035,
0.11415150096883399,
0.08587864028339966,
- 0.061548461430163195,
- 0.04205905132892357,
+ 0.06154846143016319,
+ 0.04205905132892356,
0.027299698171629392,
- 0.01678063082631571,
+ 0.016780630826315708,
0.009668716589318763,
0.005145168066638075,
0.002484010178699564,
- 0.0010642217286274947,
+ 0.0010642217286274949,
3.910335843512345E-4,
- 1.1883832638818702E-4,
+ 1.18838326388187E-4,
2.8076658021732084E-5,
- 4.561137287903131E-6,
+ 4.561137287903132E-6,
4.7281340794708457E-7
]
}
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
index 8fbe33b7dacdf6ba26f68f12b85deeb8879408fc..9b047f707ab52c84e81c549333a3e520120c033f 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-BOSTON_MA.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.012035250953950496,
- 0.008136450513957994,
- 0.005357340154375904,
- 0.0034038199938644185,
- 0.0020759822589634836,
- 0.001182204173473093,
- 6.381637241440367E-4,
- 3.180535412630101E-4,
- 1.4885096963816372E-4,
- 6.570858797962465E-5,
- 2.7907226394671614E-5,
- 1.1603173073102042E-5,
- 4.747368280123755E-6,
- 1.882308505471709E-6,
- 6.98596873660417E-7,
- 2.361735327562602E-7,
- 6.822723750146087E-8,
- 1.654170745318874E-8,
- 3.143062035320597E-9,
- 4.167714303705636E-10
+ 0.03140199836610397,
+ 0.021117409797304226,
+ 0.01379295178931493,
+ 0.00869656700708949,
+ 0.005290805654625041,
+ 0.003036490917270708,
+ 0.0016751011556612925,
+ 8.677373903714001E-4,
+ 4.289188926721494E-4,
+ 2.0235316825357782E-4,
+ 9.205602846076074E-5,
+ 4.063482489850078E-5,
+ 1.7359710544267037E-5,
+ 7.075729925264028E-6,
+ 2.6818721948072718E-6,
+ 9.250128128146017E-7,
+ 2.7305393243278333E-7,
+ 6.769575736079953E-8,
+ 1.3129696503476157E-8,
+ 1.7698286907721423E-9
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.0025398230942089003,
- 0.0017004849473223659,
- 0.0010805372045754734,
- 6.427743459107486E-4,
- 3.5250053778408804E-4,
- 1.784508617487965E-4,
- 8.235649641224025E-5,
- 3.518259008170571E-5,
- 1.403981672242182E-5,
- 5.2925574919901536E-6,
- 1.9318738133305824E-6,
- 6.930280662347882E-7,
- 2.3875608291364243E-7,
- 7.949667457419139E-8,
- 2.3033109721002647E-8,
- 5.81434524647463E-9,
- 1.1768734801565262E-9,
- 1.7921158518774916E-10,
- 1.707680249601977E-11,
- 6.620975889303251E-13
+ 0.005867292219110497,
+ 0.003824832868466257,
+ 0.0023929312222295933,
+ 0.0014244814734809628,
+ 7.967755787146476E-4,
+ 4.198025397391885E-4,
+ 2.0599827713582025E-4,
+ 9.542841191828279E-5,
+ 4.195397953754037E-5,
+ 1.7519733455529052E-5,
+ 7.015770739727138E-6,
+ 2.6927344093994585E-6,
+ 9.68504940016099E-7,
+ 3.290536380670676E-7,
+ 9.720308639640623E-8,
+ 2.499951673620781E-8,
+ 5.155486497350212E-9,
+ 7.983811170654452E-10,
+ 7.727267238902779E-11,
+ 3.0632279373181007E-12
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.022133797305397516,
- 0.016464788221143715,
- 0.011993007697334196,
- 0.008469921726676995,
- 0.005769422436667971,
- 0.003785234685317904,
- 0.002398028509210169,
- 0.001464460382773019,
- 8.708938689719437E-4,
- 5.050137904309894E-4,
- 2.8744285592528334E-4,
- 1.5759519816243772E-4,
- 8.474954902281687E-5,
- 4.331566395015309E-5,
- 2.100673497927998E-5,
- 9.364687468186962E-6,
- 3.735891954644456E-6,
- 1.2797193572338944E-6,
- 3.677725757853919E-7,
- 8.117385475823619E-8
+ 0.05768176631979705,
+ 0.0430924372074033,
+ 0.03158998092630394,
+ 0.022537892785624517,
+ 0.015579065356071974,
+ 0.010411063715061494,
+ 0.006729305958030286,
+ 0.004190647005685594,
+ 0.0025344410360458387,
+ 0.001489394101283274,
+ 8.561569042062332E-4,
+ 4.728987737605025E-4,
+ 2.5571611197859763E-4,
+ 1.3131447973005453E-4,
+ 6.397823652524017E-5,
+ 2.8667301419849297E-5,
+ 1.1501063261195743E-5,
+ 3.961898044829674E-6,
+ 1.1443125622382274E-6,
+ 2.5335867375548424E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.03366552771204859,
- 0.02527490175327033,
- 0.01836359217990806,
- 0.012936884452302021,
- 0.008688945266911698,
- 0.005625605703707624,
- 0.0034731062327398457,
- 0.002041414499953951,
- 0.0011521441250253442,
- 6.256035783742621E-4,
- 3.29051295217555E-4,
- 1.678812267708219E-4,
- 8.28900654230493E-5,
- 3.9329909274772225E-5,
- 1.770632155464228E-5,
- 7.400623622880165E-6,
- 2.815170943710613E-6,
- 9.444508782310246E-7,
- 2.664356480123001E-7,
- 6.028000859708366E-8
+ 0.08723799512304442,
+ 0.06581562207023935,
+ 0.04807392701104474,
+ 0.03409402467179439,
+ 0.023127784976379094,
+ 0.01519225348628602,
+ 0.009568028782612533,
+ 0.005764951207487774,
+ 0.0033438874658604564,
+ 0.0018660267533230903,
+ 0.0010059800226474966,
+ 5.239362908329591E-4,
+ 2.6305702100226733E-4,
+ 1.2659826495025258E-4,
+ 5.777116085974566E-5,
+ 2.450126731406833E-5,
+ 9.477521675844408E-6,
+ 3.242723631229073E-6,
+ 9.362399575687823E-7,
+ 2.1770787463930905E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
index 7f164c52a733f0859d2479350a120519ab428cf0..341ec40b128989ff963a97ad05e1134f791f917e 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-CHICAGO_IL.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.011743450939977118,
- 0.008125308944564938,
- 0.005699841355233888,
- 0.004063331479854992,
- 0.002914932752547856,
- 0.0020116574917099913,
- 0.001302302418803793,
- 7.508580888508447E-4,
- 3.779758912608106E-4,
- 1.6076657926219107E-4,
- 5.6404502509288863E-5,
- 1.5854840222432907E-5,
- 3.4666024386239945E-6,
- 6.276175503615024E-7,
- 1.1311107110879795E-7,
- 3.290169505019905E-8,
- 8.920167427589635E-9,
- 2.0381078454137685E-9,
- 3.6171947320353567E-10,
- 4.4457055160088465E-11
+ 0.028716965168264,
+ 0.01886487994515705,
+ 0.012214410336495216,
+ 0.007811378755969861,
+ 0.004958072843068914,
+ 0.0030430254157746547,
+ 0.001801194832614685,
+ 9.78138997366046E-4,
+ 4.774219607796428E-4,
+ 2.020054821950422E-4,
+ 7.245783442942092E-5,
+ 2.1673952969917548E-5,
+ 5.473081124101165E-6,
+ 1.3049230514184375E-6,
+ 3.396231647344524E-7,
+ 1.0683367558362431E-7,
+ 2.9773479240922235E-8,
+ 6.962943852677989E-9,
+ 1.2649325781181002E-9,
+ 1.5888452390126723E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.003914675231054258,
- 0.003145124290559445,
- 0.0025399851047794315,
- 0.0019954071465699266,
- 0.0014663954072994365,
- 9.81078515831008E-4,
- 5.766625095711313E-4,
- 2.912208314933962E-4,
- 1.2323301880628123E-4,
- 4.232930941434379E-5,
- 1.1417819112031977E-5,
- 2.284917995979172E-6,
- 3.1890512519220076E-7,
- 2.66347166743998E-8,
- 2.6310940908972222E-9,
- 6.43417733035982E-10,
- 1.3439312600713073E-10,
- 2.231605774414246E-11,
- 2.5216333075047996E-12,
- 1.3184079536599202E-13
+ 0.007107163927520146,
+ 0.005044374961729104,
+ 0.0036098092001682334,
+ 0.002566612826496862,
+ 0.0017569962891242118,
+ 0.0011261235004660468,
+ 6.477313305370011E-4,
+ 3.251738192982299E-4,
+ 1.3834151213638156E-4,
+ 4.821034174852281E-5,
+ 1.3350914739802089E-5,
+ 2.8151215514871247E-6,
+ 4.3883529699940863E-7,
+ 5.3884401669757356E-8,
+ 9.528067482900411E-9,
+ 2.381287271761181E-9,
+ 5.049535398817942E-10,
+ 8.505766114071679E-11,
+ 9.735929496440572E-12,
+ 5.151390743421167E-13
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.014201965383094008,
- 0.009836661064584255,
- 0.006887055395108681,
- 0.004822972654784702,
- 0.0033064514318962616,
- 0.002152321220366931,
- 0.0012913959704858482,
- 6.98078988574668E-4,
- 3.4489953492751826E-4,
- 1.5983798459686007E-4,
- 7.339650238789367E-5,
- 3.4227890897312936E-5,
- 1.6846491297689144E-5,
- 8.28535889683906E-6,
- 3.961387655798771E-6,
- 1.7527896460680704E-6,
- 6.948067057717801E-7,
- 2.3627402069950385E-7,
- 6.733661284906263E-8,
- 1.4715213946019287E-8
+ 0.0351216741448582,
+ 0.023211200244723885,
+ 0.015217197102548959,
+ 0.009865315238999507,
+ 0.0062893816628032655,
+ 0.0038894953821493623,
+ 0.0022910218368709465,
+ 0.0012601925559916993,
+ 6.544817819640684E-4,
+ 3.269742624513813E-4,
+ 1.6306741803760654E-4,
+ 8.137426381044411E-5,
+ 4.161546426829107E-5,
+ 2.080762388680752E-5,
+ 1.001141506832018E-5,
+ 4.44687071224383E-6,
+ 1.7683274720331923E-6,
+ 6.028249709072296E-7,
+ 1.7201583835604052E-7,
+ 3.7521157074011703E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.02584957271338509,
- 0.017753646580124724,
- 0.012007008129215242,
- 0.008128801283198313,
- 0.005452530605807153,
- 0.0036242624057437533,
- 0.002294303050029684,
- 0.0013363583126878716,
- 7.036603069604337E-4,
- 3.30610885337662E-4,
- 1.400951836783552E-4,
- 5.5199892795127905E-5,
- 2.1302618500609412E-5,
- 8.42239067335991E-6,
- 3.4034559898394304E-6,
- 1.3409496391300434E-6,
- 4.906709317661948E-7,
- 1.5953368600015112E-7,
- 4.3540972907165534E-8,
- 9.42915621906308E-9
+ 0.06640900091125866,
+ 0.04481552596821446,
+ 0.02929024731626321,
+ 0.018772343014893264,
+ 0.011679854583179558,
+ 0.007173629474797435,
+ 0.004252887054863991,
+ 0.002382839867435222,
+ 0.0012464263395316187,
+ 6.014244596026235E-4,
+ 2.7052055821085266E-4,
+ 1.1629834415263532E-4,
+ 4.94038659917164E-5,
+ 2.1122171127527715E-5,
+ 8.964616707914122E-6,
+ 3.6358487148704516E-6,
+ 1.360029335615549E-6,
+ 4.51150734168798E-7,
+ 1.258059605263143E-7,
+ 2.7975224069953314E-8
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
index 6ca89f349a5057489720e01e5de1006d5a590bde..b3eb10f4ed61e4cad089e3c9decfa8e64aed4fb3 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-LOS_ANGELES_CA.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.8837600400462444,
- 0.6673187946502046,
- 0.4882835378108954,
- 0.3455202166844926,
- 0.2367218318405121,
- 0.15432987457124395,
- 0.09700869655124371,
- 0.057593046930510976,
- 0.03261973805664403,
- 0.01759318861447405,
- 0.009099208609714898,
- 0.004532045855324721,
- 0.002160291779562183,
- 9.598294573466019E-4,
- 3.815584587536864E-4,
- 1.3029279327607092E-4,
- 3.496301615269094E-5,
- 6.804428159353637E-6,
- 7.233059032103408E-7,
- 1.661979548317248E-8
+ 0.8508823501873471,
+ 0.6362479018786753,
+ 0.46039596162962104,
+ 0.3220795555417366,
+ 0.21836720036635332,
+ 0.14115897438850056,
+ 0.08834840604348759,
+ 0.05256618870852907,
+ 0.03006532139482958,
+ 0.016449238686732204,
+ 0.008610533296298387,
+ 0.004303026654814006,
+ 0.002036314331320236,
+ 8.913086969719304E-4,
+ 3.4850684837222815E-4,
+ 1.1735530531010676E-4,
+ 3.115196177071226E-5,
+ 5.9794899062739556E-6,
+ 6.19085910499155E-7,
+ 1.3524678274603458E-8
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,25 +69,25 @@
0.7929925155296614
],
"ys": [
- 0.26692356212816387,
- 0.19346845572100124,
- 0.13503542406081984,
- 0.09029445439050207,
- 0.05754103507466149,
- 0.03519922606956951,
- 0.020504611873457562,
- 0.011388531110149687,
- 0.0059444896413465755,
- 0.0028430325716940386,
- 0.0012287934151915673,
- 4.724175228821316E-4,
- 1.5728193847180564E-4,
- 4.595444068602736E-5,
- 1.0851693057747736E-5,
- 2.017001415376882E-6,
- 2.210202583470558E-7,
- 7.826523371711846E-9,
- 5.669263644795599E-14,
+ 0.24162600424950834,
+ 0.17324782588583593,
+ 0.12004039748855105,
+ 0.08001276069415411,
+ 0.05113015088619405,
+ 0.031629091774935524,
+ 0.018800189808474442,
+ 0.010705264524774973,
+ 0.005718451192547019,
+ 0.0027819034952029395,
+ 0.001213999647974942,
+ 4.6900134842306555E-4,
+ 1.5703844113263544E-4,
+ 4.659853713750058E-5,
+ 1.143447812425923E-5,
+ 2.2785739559456053E-6,
+ 2.91544410608911E-7,
+ 1.6482832709190354E-8,
+ 1.6153905370930904E-13,
0.0
]
},
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.079273358013586,
- 0.8555077463178733,
- 0.6628820990093294,
- 0.5013561151198924,
- 0.36992677755186465,
- 0.2653583472133587,
- 0.18369501834776972,
- 0.12071462999887433,
- 0.074674318290157,
- 0.042992065057384884,
- 0.02315821307836935,
- 0.011556449792705816,
- 0.005547502998353477,
- 0.002478054744283922,
- 0.0010047599090291066,
- 3.4334771609188824E-4,
- 9.186566532588404E-5,
- 1.735151909310151E-5,
- 2.0045026724201254E-6,
- 7.731688307601966E-8
+ 1.0464713689256497,
+ 0.8245698443831144,
+ 0.6351387648271697,
+ 0.47781772004755063,
+ 0.35077579577833734,
+ 0.2501704129684613,
+ 0.17207971830075336,
+ 0.11258566954086907,
+ 0.069779926663667,
+ 0.04058078433037053,
+ 0.022154780427266953,
+ 0.011141000156468288,
+ 0.005324300127717726,
+ 0.0023427795072542995,
+ 9.329079510754943E-4,
+ 3.138981142332354E-4,
+ 8.292800980163755E-5,
+ 1.546222737757504E-5,
+ 1.7562332760101382E-6,
+ 6.578005869366081E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.2706641533906105,
- 1.0383180446078166,
- 0.8255059396697082,
- 0.642505662697047,
- 0.4861506324822116,
- 0.36127298337673586,
- 0.26102771492005267,
- 0.1816798271040518,
- 0.12089246356442312,
- 0.07583968522654515,
- 0.04454853347056016,
- 0.024484293055083213,
- 0.012699307287425965,
- 0.006279461603123059,
- 0.0029487400119263415,
- 0.0012723468881415748,
- 4.822498512000508E-4,
- 1.5188574868477565E-4,
- 3.672591704538665E-5,
- 6.1519003305608015E-6
+ 1.2376009989412806,
+ 1.0065152943796163,
+ 0.7961282134974924,
+ 0.6165953425840623,
+ 0.4643269330444907,
+ 0.3433448581508086,
+ 0.24660682353242033,
+ 0.17053653883549272,
+ 0.11296630892301329,
+ 0.07092556642480097,
+ 0.04198013851455218,
+ 0.023331745441575357,
+ 0.012195643705022161,
+ 0.0060218662839577825,
+ 0.0027964037250655187,
+ 0.001186964217772999,
+ 4.427823265363686E-4,
+ 1.375491430638185E-4,
+ 3.2825995833364024E-5,
+ 5.399431506509675E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
index 7037b601836a22b401d5838c93919b38f42b0692..261bf9a7062ee602d28b153d0bf74b27a795afc6 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_MADRID_MO.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.03810825840039236,
- 0.028315881963472057,
- 0.020672225797126367,
- 0.014870841055017738,
- 0.010645178514638951,
- 0.007579226339112702,
- 0.005525146309384489,
- 0.004150104336178288,
- 0.0032832768942293996,
- 0.002736483538207061,
- 0.0023616078072307626,
- 0.002030219304310808,
- 0.001653622994385719,
- 0.0012136295169658808,
- 7.696144694320109E-4,
- 4.1227100295072064E-4,
- 1.800302271541464E-4,
- 6.366327102023256E-5,
- 1.7295674975518613E-5,
- 3.4296680438421237E-6
+ 0.09850176713422258,
+ 0.07312729909012126,
+ 0.05308397184730751,
+ 0.03768446624790958,
+ 0.02630808344095556,
+ 0.01790809043786765,
+ 0.012160029178287754,
+ 0.008222905743560025,
+ 0.005692879397239757,
+ 0.0041037978211855425,
+ 0.0031069691710146207,
+ 0.0024215583101441906,
+ 0.001854411189102515,
+ 0.0013192248814640891,
+ 8.294421357236949E-4,
+ 4.468168964229126E-4,
+ 1.9751472450576995E-4,
+ 7.082379863370093E-5,
+ 1.9544561496314157E-5,
+ 3.88357952865561E-6
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.009208490572401862,
- 0.006949044290028717,
- 0.005306022483737845,
- 0.004155982807154481,
- 0.0033748323193255178,
- 0.0028673366575082126,
- 0.0025338938062588858,
- 0.0022965778496380263,
- 0.0020710240709275645,
- 0.0017848984735762319,
- 0.001418999638814905,
- 0.0010161066741280161,
- 6.401986492207046E-4,
- 3.5185659206844706E-4,
- 1.60235732766765E-4,
- 6.062719466111046E-5,
- 1.8059984462886E-5,
- 3.992606691586526E-6,
- 5.941978049955505E-7,
- 3.907477602123017E-8
+ 0.020226805685536923,
+ 0.014456993690890865,
+ 0.010311275339298464,
+ 0.007410282372372471,
+ 0.005420242154345005,
+ 0.004112202045405046,
+ 0.0032598918457679518,
+ 0.0027056013898286713,
+ 0.002295628152726618,
+ 0.001909728430262791,
+ 0.0014958430610445947,
+ 0.0010702048038474616,
+ 6.794014527943354E-4,
+ 3.777448399802698E-4,
+ 1.7431530417571855E-4,
+ 6.676688108364843E-5,
+ 2.010923480249365E-5,
+ 4.489749073748097E-6,
+ 6.69242122394876E-7,
+ 4.398566361226216E-8
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.07385719651712236,
- 0.06339731846609972,
- 0.05324739058832817,
- 0.04350964284607091,
- 0.03455200231823048,
- 0.02673578927843179,
- 0.02026653415804013,
- 0.01509405033443092,
- 0.011160466116674345,
- 0.008243233670157545,
- 0.006149418866075562,
- 0.004638605840165204,
- 0.0036081610853177675,
- 0.0028667097097824818,
- 0.002282027734121092,
- 0.0017173902293493675,
- 0.0011387960982620043,
- 6.206346289257639E-4,
- 2.676485464183286E-4,
- 8.559018237373796E-5
+ 0.1886054256128138,
+ 0.16275334197403102,
+ 0.13755397463891877,
+ 0.11317989772270942,
+ 0.09047602199495315,
+ 0.07032705935347142,
+ 0.05330210287581899,
+ 0.03936547661127353,
+ 0.028495426301947097,
+ 0.02022888255013566,
+ 0.014163984801627954,
+ 0.00972284422318302,
+ 0.00669613851628052,
+ 0.004611542864451253,
+ 0.003196105674453867,
+ 0.0021516250421904116,
+ 0.0013255803040000025,
+ 6.922864839444246E-4,
+ 2.910424437563198E-4,
+ 9.122232638554797E-5
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.08841662701849765,
- 0.07591742600201586,
- 0.06349049229025132,
- 0.05159654623603552,
- 0.04033861199238173,
- 0.03066871056836901,
- 0.022664718736152712,
- 0.016375571535456927,
- 0.011700180723249338,
- 0.008331012521430115,
- 0.0059918284439274515,
- 0.00441961706015835,
- 0.00339047874331689,
- 0.002704887471971463,
- 0.0021874716446254974,
- 0.0017054340574167853,
- 0.001200911759714859,
- 7.123552774961517E-4,
- 3.356101022303263E-4,
- 1.2135441742664016E-4
+ 0.22470370542893037,
+ 0.1939084405485559,
+ 0.16314578939913849,
+ 0.1334721570174714,
+ 0.10507322983912896,
+ 0.08032395568597926,
+ 0.059464867655382836,
+ 0.0427127849672139,
+ 0.029944507690815473,
+ 0.020496635602782646,
+ 0.013767300330333573,
+ 0.009150639601752168,
+ 0.006113656085200025,
+ 0.004178588006264202,
+ 0.0029323165891444636,
+ 0.002053070561467998,
+ 0.0013503046278127767,
+ 7.713251130950329E-4,
+ 3.563473983853019E-4,
+ 1.2741054530630147E-4
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
index 8a3df6f99054d98f3a65ffa471850e06121c95c2..c3f7ca4c11e9f007e9c50610a170e5c3164bda50 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-NEW_YORK_NY.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.012374804522292664,
- 0.00836661557414539,
- 0.005447933203374217,
- 0.003381935579235245,
- 0.0020006567971856686,
- 0.0011054229852685289,
- 5.859581677512343E-4,
- 2.932121678682943E-4,
- 1.421916075501724E-4,
- 6.726067803272612E-5,
- 3.134520433789695E-5,
- 1.4361751527596114E-5,
- 6.369510633138831E-6,
- 2.6653684534293637E-6,
- 1.0234643150923622E-6,
- 3.5363710757446486E-7,
- 1.0369647752886424E-7,
- 2.5379169471070928E-8,
- 4.851084599984121E-9,
- 6.463135305490378E-10
+ 0.03173858014171648,
+ 0.021339780972349124,
+ 0.013891736155355614,
+ 0.008702871323317573,
+ 0.005257010814937974,
+ 0.003005434084977267,
+ 0.0016656813512850115,
+ 8.787709846342374E-4,
+ 4.4982230327846414E-4,
+ 2.233768838664674E-4,
+ 1.0813164329058E-4,
+ 5.087678520362409E-5,
+ 2.3000914423316594E-5,
+ 9.796473238506976E-6,
+ 3.834226566465003E-6,
+ 1.3526179722084802E-6,
+ 4.0561593777847027E-7,
+ 1.0159328170663664E-7,
+ 1.983620005558785E-8,
+ 2.6881101620063547E-9
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.0026995587713563303,
- 0.001729856217452915,
- 0.001043724658751179,
- 5.893703808209607E-4,
- 3.0866135946543816E-4,
- 1.5129449159709623E-4,
- 6.909234873826654E-5,
- 3.0170083088739838E-5,
- 1.2820296859449094E-5,
- 5.334744194862449E-6,
- 2.1850795994287946E-6,
- 8.683687558905425E-7,
- 3.2288483966793256E-7,
- 1.1154021351741914E-7,
- 3.321633846097989E-8,
- 8.550579030900384E-9,
- 1.7547455322744306E-9,
- 2.705551313725607E-10,
- 2.6042457346830444E-11,
- 1.0203573556440597E-12
+ 0.0061025079058511095,
+ 0.003899067974125618,
+ 0.002382642687892061,
+ 0.00138663763370032,
+ 7.624471722655169E-4,
+ 3.991905113937744E-4,
+ 1.9772432210500465E-4,
+ 9.426079143655626E-5,
+ 4.351161422788669E-5,
+ 1.9358718499170798E-5,
+ 8.303052242177256E-6,
+ 3.3925889700760563E-6,
+ 1.2851573724623575E-6,
+ 4.5199061406267797E-7,
+ 1.3712336694696286E-7,
+ 3.595587559990004E-8,
+ 7.519232998092494E-9,
+ 1.1793297231150328E-9,
+ 1.1536327397598236E-10,
+ 4.625232359646364E-12
]
},
"Peak Ground Acceleration": {
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.020286596128412507,
- 0.015122005526298518,
- 0.011082055927620184,
- 0.007943124693114983,
- 0.005565081037653393,
- 0.0038115412828580303,
- 0.0025512684613907266,
- 0.0016581992888227432,
- 0.00105005091277049,
- 6.457811692687936E-4,
- 3.870049228081458E-4,
- 2.2185052288528715E-4,
- 1.236206185563812E-4,
- 6.497784148592097E-5,
- 3.216899369858368E-5,
- 1.4558524637476324E-5,
- 5.872716012004253E-6,
- 2.02924869721662E-6,
- 5.875115950380293E-7,
- 1.3058577801930758E-7
+ 0.053422434955574166,
+ 0.04020920495554081,
+ 0.029855756453638558,
+ 0.0217266204504069,
+ 0.01545155301653882,
+ 0.010719211766649875,
+ 0.0072464779449506024,
+ 0.004745418573916583,
+ 0.0030227167657870552,
+ 0.001868387203005202,
+ 0.0011249844803513092,
+ 6.479801770598047E-4,
+ 3.627963118316445E-4,
+ 1.9167743860676635E-4,
+ 9.54296906591475E-5,
+ 4.3456067606267236E-5,
+ 1.764341472644732E-5,
+ 6.133767088181088E-6,
+ 1.7849365683808554E-6,
+ 3.978894235967971E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.030924385577531452,
- 0.023158670112213068,
- 0.0168266446727544,
- 0.011887481789564952,
- 0.008051319708031232,
- 0.005306104962367634,
- 0.003378081358145652,
- 0.002076878721198851,
- 0.001240205271953173,
- 7.171120777581213E-4,
- 4.015972226266107E-4,
- 2.170493146671748E-4,
- 1.126383063319517E-4,
- 5.5685617014544675E-5,
- 2.5902604304970156E-5,
- 1.110015884696405E-5,
- 4.299689212594959E-6,
- 1.461140887787391E-6,
- 4.159137664565076E-7,
- 9.467170166750412E-8
+ 0.08079525692428417,
+ 0.060877287273066176,
+ 0.044629057123178224,
+ 0.031926302078010976,
+ 0.021985425373050815,
+ 0.014766339179658411,
+ 0.009589023782390913,
+ 0.00600763853559983,
+ 0.0036471049278067936,
+ 0.002138717977256336,
+ 0.0012124137077166005,
+ 6.626542322611687E-4,
+ 3.4774996062009417E-4,
+ 1.7398642420530911E-4,
+ 8.203255085018509E-5,
+ 3.5712179306848327E-5,
+ 1.4088660740274175E-5,
+ 4.889784000529996E-6,
+ 1.4261978938027703E-6,
+ 3.339970262028064E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
index 6358bb7ca8c5c4e1d1ff4b6bb8e63fbc38ed5132..eacc54cb23d43bbfafd49b8391373f1ee7bc6fbb 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-RENO_NV.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.4509980504265575,
- 0.31640849903818624,
- 0.21358652709530696,
- 0.13852590684777596,
- 0.08704051464729225,
- 0.05253655067618185,
- 0.0313630074964224,
- 0.01828926856693416,
- 0.010569791905629159,
- 0.005985554870546813,
- 0.003258642867557007,
- 0.0016482421911010224,
- 7.428663370263867E-4,
- 2.8617770593243423E-4,
- 9.001026608080633E-5,
- 2.1766162718777832E-5,
- 3.4439011809001544E-6,
- 2.8437342591115396E-7,
- 4.7116082241967405E-9,
- 1.4267296632389565E-11
+ 0.4475846033759181,
+ 0.3134392311924985,
+ 0.21100103478140925,
+ 0.13624546359391296,
+ 0.08506227171193938,
+ 0.050930598806163255,
+ 0.030158159091716916,
+ 0.017456250416622635,
+ 0.010023495239063,
+ 0.005643347529223006,
+ 0.003057066831819484,
+ 0.001541731293160766,
+ 6.949253604013826E-4,
+ 2.6863199316272E-4,
+ 8.507502823172053E-5,
+ 2.0835932202264287E-5,
+ 3.3559684855157995E-6,
+ 2.8064858610885874E-7,
+ 4.451769096210394E-9,
+ 1.0408963020001982E-11
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.11700214317084666,
- 0.07984556633545123,
- 0.05291299606238968,
- 0.03404755985513787,
- 0.02114650811223566,
- 0.012726247663438568,
- 0.007323504383620474,
- 0.0040144093270540835,
- 0.00205488138625064,
- 9.525469423918409E-4,
- 3.8994761986655535E-4,
- 1.365245169629735E-4,
- 3.884698378921924E-5,
- 8.873557780140218E-6,
- 1.3451231092798012E-6,
- 1.2032259298422766E-7,
- 4.609116834290836E-9,
- 2.59008536728359E-11,
+ 0.11454312605927197,
+ 0.07774977737128347,
+ 0.05111873766856917,
+ 0.032564050475628284,
+ 0.020001855395237383,
+ 0.01190823141989159,
+ 0.006785839006910068,
+ 0.003689766411235815,
+ 0.0018778709350906041,
+ 8.678782554827404E-4,
+ 3.5518422155049847E-4,
+ 1.2455086316643806E-4,
+ 3.5566198683860574E-5,
+ 8.159419258458496E-6,
+ 1.2251021309367327E-6,
+ 1.0484430247693849E-7,
+ 3.920291953879094E-9,
+ 2.528732965558806E-11,
0.0,
0.0
]
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.4945845377045569,
- 0.35620880201657545,
- 0.25137051984623665,
- 0.17424903457376942,
- 0.11924752502067437,
- 0.08070972610358695,
- 0.053872250044587636,
- 0.03502132654998915,
- 0.022080257240772574,
- 0.013369869167750875,
- 0.007751781243749961,
- 0.0041510856851986345,
- 0.002024329677524295,
- 8.332799191377023E-4,
- 2.803322221722735E-4,
- 7.216436198566049E-5,
- 1.3139937692058717E-5,
- 1.4887451524976926E-6,
- 8.583934300949907E-8,
- 1.4528521242785493E-10
+ 0.49236908617846603,
+ 0.3541925608742514,
+ 0.24922192065983623,
+ 0.17194027435257983,
+ 0.1170161518528752,
+ 0.07880191470231797,
+ 0.052392617713349486,
+ 0.03395479216015905,
+ 0.021343253364080148,
+ 0.012870263274909758,
+ 0.007419090030026814,
+ 0.00394739831552725,
+ 0.0019166475898031736,
+ 7.886854748360648E-4,
+ 2.663552666586273E-4,
+ 6.913066068129533E-5,
+ 1.2761441291611963E-5,
+ 1.4751175404686563E-6,
+ 8.80425288533516E-8,
+ 1.282664681878661E-10
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.6240554880372423,
- 0.4648421129913744,
- 0.3364614024187943,
- 0.23936400511977998,
- 0.1665729605388722,
- 0.11552626958244688,
- 0.07924766772201519,
- 0.05346535671204676,
- 0.03534685017891077,
- 0.022654951039290397,
- 0.013996293443887118,
- 0.008274695350937313,
- 0.00461624083114446,
- 0.002359144711013691,
- 0.0010588845419861948,
- 3.9830557252783347E-4,
- 1.2098385904750002E-4,
- 2.7883432647415395E-5,
- 4.379653019618013E-6,
- 3.910084902445004E-7
+ 0.6216532405946646,
+ 0.46272644211304453,
+ 0.33436224894384825,
+ 0.23714631355626206,
+ 0.16431040627752377,
+ 0.11340616476478484,
+ 0.07743363519310616,
+ 0.05203557685595775,
+ 0.034290455737858286,
+ 0.02190858742027236,
+ 0.013479714609487702,
+ 0.00792349635428749,
+ 0.004391048350590266,
+ 0.002231861061172497,
+ 9.995799121306317E-4,
+ 3.7669134676994497E-4,
+ 1.1508171621894027E-4,
+ 2.68345941924452E-5,
+ 4.287383926678435E-6,
+ 3.8934883651109496E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
index f1e1051c9ebf55a36260cb784898e57535a2f016..16ec0510c1ab2d230a160695fa605b09516051fd 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SALT_LAKE_CITY_UT.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.07329300166227745,
- 0.055337802621669735,
- 0.040968817403122415,
- 0.02972750508986697,
- 0.021208125016890057,
- 0.014718949348420704,
- 0.010151835343442727,
- 0.006964506964454938,
- 0.004865384284178251,
- 0.0034433728216316144,
- 0.002402092823420567,
- 0.0015776279469702096,
- 9.282583752562302E-4,
- 4.6859866659776025E-4,
- 1.957562143016859E-4,
- 6.566956362330448E-5,
- 1.610677465115143E-5,
- 2.5356426012945703E-6,
- 1.781660653263597E-7,
- 5.303018859899033E-10
+ 0.11130094220045068,
+ 0.08076677570122351,
+ 0.05722148473553047,
+ 0.03963349320771064,
+ 0.02698098163287568,
+ 0.017850721458831903,
+ 0.01174520773124128,
+ 0.007678049229037662,
+ 0.005126831047286601,
+ 0.003501302162770975,
+ 0.0023922966629531177,
+ 0.0015609412173680857,
+ 9.216413065891488E-4,
+ 4.696083436199915E-4,
+ 1.986253448291123E-4,
+ 6.761927782939845E-5,
+ 1.6932493024728407E-5,
+ 2.7390147868540693E-6,
+ 1.9938391276229874E-7,
+ 6.133478748372659E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.027011742125709646,
- 0.02054026099288426,
- 0.015151661177658343,
- 0.010840130319940439,
- 0.007525995300555911,
- 0.005119570216554908,
- 0.003395985153115906,
- 0.00219752272463167,
- 0.0013656595910964422,
- 7.894479600187155E-4,
- 4.1061078425454916E-4,
- 1.8566800604505942E-4,
- 7.046560404053304E-5,
- 2.214811117324299E-5,
- 5.1877205964415855E-6,
- 8.883945318293091E-7,
- 8.064900890952642E-8,
- 1.5197879144214235E-9,
+ 0.032509119401939554,
+ 0.02393090948313386,
+ 0.017200050940302872,
+ 0.012041991296390504,
+ 0.008199167144515544,
+ 0.005482561246852691,
+ 0.003589819997276718,
+ 0.002308264821614951,
+ 0.0014349471872017092,
+ 8.34035985621716E-4,
+ 4.376768443464131E-4,
+ 2.0012377124111334E-4,
+ 7.68275935454949E-5,
+ 2.4474978399149564E-5,
+ 5.824078563907241E-6,
+ 1.0104254474502878E-6,
+ 9.323149237023285E-8,
+ 1.8015679867281317E-9,
0.0,
0.0
]
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.08315499079996769,
- 0.06431139828469785,
- 0.04915016022135098,
- 0.03721435569635022,
- 0.02795306146262804,
- 0.020719362574279174,
- 0.01503310418456431,
- 0.010630741763975264,
- 0.007468303088638388,
- 0.0053200412902422636,
- 0.0038825297002366356,
- 0.0027994970622556223,
- 0.0018938616014459182,
- 0.0010946026000977843,
- 5.105948259048646E-4,
- 1.814145569321867E-4,
- 4.669415700262315E-5,
- 7.661897211595805E-6,
- 6.963517941442256E-7,
- 2.099912331198713E-8
+ 0.1518690130188437,
+ 0.11632439012311155,
+ 0.0861981278754339,
+ 0.06177240482401042,
+ 0.04303374915551782,
+ 0.02929063040852448,
+ 0.01953817139931182,
+ 0.012778226345862159,
+ 0.008368974319197935,
+ 0.005613375089418224,
+ 0.003917455242324175,
+ 0.0027475269741797453,
+ 0.0018358792259366326,
+ 0.0010585855083360335,
+ 4.958532204181748E-4,
+ 1.7765378688379245E-4,
+ 4.631769142386964E-5,
+ 7.776346852799237E-6,
+ 7.321846059611325E-7,
+ 2.3316840793449853E-8
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.10014082840506616,
- 0.07937813836503774,
- 0.061700223014619984,
- 0.047497342277461774,
- 0.0360740112616547,
- 0.027342479018824466,
- 0.020449825995003054,
- 0.014960970616397342,
- 0.010734355728858135,
- 0.0076366762405428714,
- 0.005496130334334665,
- 0.004028162881456666,
- 0.002942927307469069,
- 0.0020330523395788187,
- 0.0012414540217925533,
- 6.298234078379817E-4,
- 2.5541203512870637E-4,
- 7.99435274083079E-5,
- 1.7681458944686246E-5,
- 2.3632474990565053E-6
+ 0.20166702354774013,
+ 0.16160084749247716,
+ 0.1244192194969577,
+ 0.09241815681362486,
+ 0.06575425030346817,
+ 0.04566994409796748,
+ 0.030914416242860204,
+ 0.020452242747243332,
+ 0.013372050811850987,
+ 0.00875704266836266,
+ 0.005879873504406088,
+ 0.004093401979108478,
+ 0.0028976037674082866,
+ 0.001971540082246526,
+ 0.0011986374031853074,
+ 6.095534573924074E-4,
+ 2.4887756358368666E-4,
+ 7.87040412473546E-5,
+ 1.773819528482079E-5,
+ 2.4514947455994724E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
index b20b3412aea0f5ba553dd87531d3930a497d5db3..397c69fe3c1235c10b0107378b51e75cd114d3d7 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SAN_FRANCISCO_CA.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.793213593982615,
- 0.577983578178273,
- 0.40579525953388984,
- 0.2759859720941026,
- 0.18399009975966585,
- 0.11936538209099885,
- 0.07694484056508578,
- 0.04840785421492175,
- 0.029819512815414086,
- 0.01768412385500739,
- 0.009915141001364477,
- 0.005117546173329484,
- 0.0023490942214720507,
- 9.214389956449585E-4,
- 2.9468592716695214E-4,
- 7.308514452887161E-5,
- 1.1247347826454863E-5,
- 6.940428175459909E-7,
- 5.10346784921843E-9,
- 5.841096556615169E-11
+ 0.7840745950193878,
+ 0.5702718287716494,
+ 0.3997971350379117,
+ 0.2715542629587968,
+ 0.18068031139646856,
+ 0.11679081873486646,
+ 0.07490310091605154,
+ 0.046888511954231674,
+ 0.028815662954150976,
+ 0.017120190032723144,
+ 0.009653111403164615,
+ 0.005020801502225727,
+ 0.002324152060070731,
+ 9.193964272868024E-4,
+ 2.965560898564296E-4,
+ 7.425555422157574E-5,
+ 1.1662469542011495E-5,
+ 7.471407239630221E-7,
+ 4.327900445257619E-9,
+ 4.280870815036898E-11
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.2025943739811626,
- 0.14523332315140788,
- 0.10250307359018228,
- 0.07087475113028119,
- 0.04756353086470577,
- 0.03103939235040483,
- 0.019605803017679113,
- 0.012137851217009655,
- 0.007356656688105114,
- 0.004265832391757879,
- 0.002291262860196218,
- 0.0010938967876560786,
- 4.4251021889519853E-4,
- 1.4953639800960512E-4,
- 3.814923137778993E-5,
- 6.870948539135475E-6,
- 6.953041247719502E-7,
- 2.8121734850878907E-8,
+ 0.19738243542428757,
+ 0.14168220877374643,
+ 0.10008332912286685,
+ 0.06914243671013488,
+ 0.0462990135844667,
+ 0.030155590303921745,
+ 0.01904155553388089,
+ 0.011808350337992548,
+ 0.00718083336322479,
+ 0.0041853531191431105,
+ 0.0022659598771207212,
+ 0.0010946630897325576,
+ 4.501517230572789E-4,
+ 1.5548159304975556E-4,
+ 4.092510252141889E-5,
+ 7.735880848280358E-6,
+ 8.459968703624985E-7,
+ 3.74918485697537E-8,
0.0,
0.0
]
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 1.0168692143070062,
- 0.7923123914451994,
- 0.5957749833811382,
- 0.4320284093428651,
- 0.303631608228334,
- 0.20829236120541317,
- 0.14039078301687707,
- 0.09271147762259842,
- 0.060008863388386874,
- 0.037552479212519765,
- 0.02235243410344431,
- 0.01203566580239071,
- 0.00575008176921448,
- 0.0022603495396226014,
- 7.034883142819305E-4,
- 1.5908436720509333E-4,
- 2.2735672283956533E-5,
- 1.3034249979450535E-6,
- 1.0236851661932837E-8,
- 2.5180884928616156E-11
+ 1.0099380776225448,
+ 0.7870746947750729,
+ 0.5917835457036492,
+ 0.4286714548737322,
+ 0.3005220866273447,
+ 0.2053384578230158,
+ 0.1376613122533619,
+ 0.09034223112308178,
+ 0.05814626712059648,
+ 0.03628844636175918,
+ 0.02164309463283226,
+ 0.01172836158460607,
+ 0.0056517850617297,
+ 0.0022426443773611725,
+ 7.045248541384342E-4,
+ 1.6082909766016313E-4,
+ 2.327505352594275E-5,
+ 1.370176499870282E-6,
+ 9.774880018276357E-9,
+ 1.8250003057916266E-11
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 1.2051064264582476,
- 0.9782651541920249,
- 0.7648840249547406,
- 0.5785033270293076,
- 0.42033271375876846,
- 0.29850865082744316,
- 0.2068893742866078,
- 0.14038182035917574,
- 0.09379780723050979,
- 0.06140722538398119,
- 0.03905929899039934,
- 0.023649257644110883,
- 0.01321452449292896,
- 0.006565163545150544,
- 0.002790251113545982,
- 9.69470326568192E-4,
- 2.6350269428707E-4,
- 5.2101041445273694E-5,
- 5.964900806365306E-6,
- 2.2241971901700354E-7
+ 1.1978787330044776,
+ 0.9725493883514309,
+ 0.760415627009683,
+ 0.5747750268719304,
+ 0.41694788196629506,
+ 0.2952856296658587,
+ 0.2038317231669151,
+ 0.13758259431202174,
+ 0.09137864375857647,
+ 0.05948995920820008,
+ 0.03771568209853715,
+ 0.022851664183984956,
+ 0.0128307329888723,
+ 0.006423615826395934,
+ 0.002754636969832231,
+ 9.660023791878227E-4,
+ 2.650171050331252E-4,
+ 5.285265419070352E-5,
+ 6.156763722409572E-6,
+ 2.426143559370607E-7
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
index 97795b24292f483a1ce636ccab70a24bf480ba89..263ffe8c41bd263ac868c1b2eac69af3a4ed7e13 100644
--- a/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
+++ b/src/test/resources/e2e/nshm-conus-2023/nshm-conus-2023-2023-SEATTLE_WA.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.19897581677887666,
- 0.1577395573051793,
- 0.12044861188465388,
- 0.08849701093209442,
- 0.06286360738094342,
- 0.04276589752771625,
- 0.02837549286089879,
- 0.01809939308657242,
- 0.011162206885093687,
- 0.006559356758212915,
- 0.0036143759422569417,
- 0.0018285570367639595,
- 8.296667905783596E-4,
- 3.284945561883995E-4,
- 1.0963455941947854E-4,
- 2.9696131236439645E-5,
- 5.805827780831235E-6,
- 6.855121895761377E-7,
- 3.2583055586129815E-8,
- 1.8738214080387096E-11
+ 0.1997793016971402,
+ 0.1585250728790603,
+ 0.12116908078405636,
+ 0.08910831230443658,
+ 0.06333736560966338,
+ 0.043093389988133696,
+ 0.028580388460289777,
+ 0.01821735738362719,
+ 0.01123227796892613,
+ 0.00660873652693667,
+ 0.0036548832126260655,
+ 0.001860604963475091,
+ 8.510413673500248E-4,
+ 3.3987935013381714E-4,
+ 1.1435202682716995E-4,
+ 3.114357779727954E-5,
+ 6.088655157703063E-6,
+ 7.136500417299364E-7,
+ 3.366155503095819E-8,
+ 1.3844856748009016E-11
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,24 +69,24 @@
0.7929925155296614
],
"ys": [
- 0.057458910275419064,
- 0.04119453721482716,
- 0.028738886126215488,
- 0.019517266040986553,
- 0.012865085501768908,
- 0.008286940358446314,
- 0.005177828770184231,
- 0.0031351056053247803,
- 0.0018040520137694118,
- 9.550967828148115E-4,
- 4.525051792337519E-4,
- 1.8601411939532498E-4,
- 6.34002565523996E-5,
- 1.7744137447968963E-5,
- 3.6119400522511268E-6,
- 4.377163495039788E-7,
- 1.040241402813071E-8,
- 1.7354534758719045E-11,
+ 0.05804476459665961,
+ 0.041635106894742896,
+ 0.02901816422632226,
+ 0.019653876323849274,
+ 0.012901472583868468,
+ 0.008269880789363747,
+ 0.005139400897507957,
+ 0.0030906591428687662,
+ 0.0017598187411684081,
+ 9.163676483739542E-4,
+ 4.241153350881833E-4,
+ 1.692063074918274E-4,
+ 5.555488821491962E-5,
+ 1.4850334291205167E-5,
+ 2.8640101774040855E-6,
+ 3.2858861718099857E-7,
+ 6.7005888291790454E-9,
+ 5.614225022270342E-12,
0.0,
0.0
]
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
- 0.2578412015141585,
- 0.22157628906966204,
- 0.1846973059387178,
- 0.1484454027157886,
- 0.1146425948592031,
- 0.08487402243951296,
- 0.060122997722412225,
- 0.0404714992516234,
- 0.025946563723898995,
- 0.015770187065794868,
- 0.009079699272726408,
- 0.00481041227280926,
- 0.0023578899725231082,
- 0.00101186450505057,
- 3.7074288922810117E-4,
- 1.0887407546288273E-4,
- 2.3944480179971553E-5,
- 3.4423038486722723E-6,
- 2.7874999242876813E-7,
- 6.628896595304417E-9
+ 0.2587420597377019,
+ 0.22244160588962886,
+ 0.18549632936654387,
+ 0.14915756586956203,
+ 0.11524845788405014,
+ 0.08535758478613292,
+ 0.06048171651688572,
+ 0.040719619314481384,
+ 0.0261144666658724,
+ 0.015891005679034485,
+ 0.009175388129728776,
+ 0.004885429051556261,
+ 0.002409202891544041,
+ 0.0010395594741382048,
+ 3.8214957132823714E-4,
+ 1.1226052751016851E-4,
+ 2.4609229150341752E-5,
+ 3.5111346042809243E-6,
+ 2.8182370150762684E-7,
+ 6.626616132457025E-9
]
},
"0.20 Second Spectral Acceleration": {
@@ -161,26 +161,26 @@
1.998773638612381
],
"ys": [
- 0.2869636502669868,
- 0.25417973544818384,
- 0.21906830834876057,
- 0.1834844524639711,
- 0.14787713473344755,
- 0.11527966254404634,
- 0.08627079311437469,
- 0.061710212057459315,
- 0.04223637305486282,
- 0.027568734753433105,
- 0.017153092866713564,
- 0.010123007487523891,
- 0.00561719974969265,
- 0.0028886570138894493,
- 0.0013460854387742321,
- 5.496026708999016E-4,
- 1.9120436392156004E-4,
- 5.465049981000188E-5,
- 1.2008852556658006E-5,
- 1.9094547695209577E-6
+ 0.2878516982954659,
+ 0.2550623135197736,
+ 0.21991007739787044,
+ 0.18425987035877295,
+ 0.1485658072494233,
+ 0.11586814527240913,
+ 0.08674776317270892,
+ 0.06207341639858485,
+ 0.04249817002030045,
+ 0.027752312154425564,
+ 0.017285454796169643,
+ 0.010223972209830248,
+ 0.005694323318959238,
+ 0.0029419321920128197,
+ 0.001376805535864566,
+ 5.636744379753912E-4,
+ 1.9616835926077882E-4,
+ 5.592130460225895E-5,
+ 1.22149525135547E-5,
+ 1.9287484178736967E-6
]
}
}
\ No newline at end of file
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json
index c6aea429d9107f5c8317653aaeaab2e1118b613b..9390be337d6cc84abbb1248e717909dd205225c6 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HILO_HI.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
1.1394279599298858,
0.909645925740205,
- 0.6810439562313703,
+ 0.6810439562313704,
0.48213438998284386,
0.3270662494936988,
0.2122733790095776,
0.13579352589768764,
0.08466990088453301,
- 0.0514796672410259,
+ 0.051479667241025914,
0.029592215233161495,
0.015605186053687877,
0.007369438722986227,
- 0.0030791345001285235,
+ 0.003079134500128523,
0.001133816052813239,
- 3.683841726832001E-4,
- 1.0771529770871668E-4,
+ 3.683841726832002E-4,
+ 1.077152977087167E-4,
2.7590429340726252E-5,
6.106383784135073E-6,
- 9.141545957726993E-7,
- 4.716658318737339E-8
+ 9.141545957726994E-7,
+ 4.7166583187373387E-8
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -69,26 +69,26 @@
0.7929925155296614
],
"ys": [
- 0.24225805041057025,
+ 0.24225805041057027,
0.1626494298061276,
- 0.11286823232748022,
+ 0.11286823232748024,
0.08019936527365806,
0.057001082377164766,
- 0.0397723104642292,
+ 0.03977231046422921,
0.026270923994779784,
0.0159300182060438,
- 0.008586807484419114,
+ 0.008586807484419113,
0.0040091692633346795,
0.0016237229130359047,
5.831580842583807E-4,
- 1.935491083341371E-4,
+ 1.9354910833413707E-4,
6.446411351755592E-5,
2.0541404464536928E-5,
5.89324452995356E-6,
1.3026715401568408E-6,
2.061368668443604E-7,
- 2.2313612928494348E-8,
- 3.4274144991400273E-10
+ 2.2313612928494355E-8,
+ 3.427414499140028E-10
]
},
"Peak Ground Acceleration": {
@@ -107,10 +107,10 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
@@ -122,17 +122,17 @@
0.868541087272583,
0.6793538859833672,
0.4895776766820634,
- 0.3230521403675808,
+ 0.32305214036758084,
0.19728774899189122,
- 0.11230291486323443,
- 0.05999879240178362,
- 0.029038427625475594,
- 0.012752442114810743,
+ 0.11230291486323442,
+ 0.05999879240178363,
+ 0.02903842762547559,
+ 0.012752442114810742,
0.004825259624029285,
- 0.0015856433122290355,
+ 0.0015856433122290357,
4.467361996202859E-4,
1.0815891326044897E-4,
- 2.1501975995084003E-5,
+ 2.150197599508401E-5,
3.0877820264321665E-6,
2.0121735347546392E-7
]
@@ -164,19 +164,19 @@
1.4371068709113273,
1.3442294606163505,
1.2504550788598903,
- 1.145108478540398,
+ 1.1451084785403978,
1.0076845134906756,
0.8393355383077514,
0.6496537972367906,
0.4625305796292689,
- 0.30353482643208957,
- 0.1840984877001757,
+ 0.3035348264320895,
+ 0.18409848770017573,
0.10404729414822564,
- 0.054920827101472565,
+ 0.05492082710147257,
0.026929508320917738,
0.012117250742785222,
- 0.004912231979440461,
- 0.0017509584506394304,
+ 0.0049122319794404614,
+ 0.0017509584506394302,
5.433850247572385E-4,
1.4341185451814312E-4,
3.1018961899754435E-5,
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json
index 5f307f1d3eafd85d51559394fe223273545d0628..755d3992618291fcf58c8f92320fe65d48e12145 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-HONOLULU_HI.json
@@ -3,52 +3,52 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
0.1096176362431887,
0.07712267985209978,
- 0.052362164725512236,
- 0.03410083982464372,
- 0.021327885700315224,
+ 0.05236216472551225,
+ 0.03410083982464373,
+ 0.02132788570031522,
0.012597455865731777,
0.007195466062794852,
0.0039020156778838797,
0.0020347763827356416,
- 0.0010104978512827578,
+ 0.0010104978512827576,
4.744665345271375E-4,
- 2.0784677016393618E-4,
+ 2.0784677016393615E-4,
8.354936782969439E-5,
3.0262362405560818E-5,
9.700628718654082E-6,
- 2.7338866176016795E-6,
- 6.418080520161567E-7,
+ 2.73388661760168E-6,
+ 6.418080520161568E-7,
1.2432205810419981E-7,
1.6644800833465068E-8,
- 8.894088492362762E-10
+ 8.894088492362763E-10
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -70,7 +70,7 @@
],
"ys": [
0.023279814179665247,
- 0.015258454706800593,
+ 0.015258454706800595,
0.009636588671134795,
0.0058636185962218715,
0.0034303179683354557,
@@ -83,11 +83,11 @@
2.5779423268780836E-5,
9.34540879758316E-6,
3.0570885601346303E-6,
- 8.448187381597023E-7,
+ 8.448187381597024E-7,
2.0283376419955368E-7,
3.799045552673217E-8,
5.257992980887434E-9,
- 4.696318067912855E-10,
+ 4.696318067912854E-10,
8.040835683421514E-12
]
},
@@ -107,29 +107,29 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
0.16241112120908746,
- 0.12117474522250349,
+ 0.1211747452225035,
0.08821017091766084,
0.06247545594775962,
- 0.0429411432751231,
+ 0.04294114327512309,
0.028525687803782396,
0.018224455950293393,
- 0.011059987400758736,
- 0.006364262004183082,
+ 0.011059987400758737,
+ 0.006364262004183083,
0.0034377054571609225,
- 0.0017388253798322879,
+ 0.001738825379832288,
7.965440914871203E-4,
3.3531414903647464E-4,
1.2359465951104756E-4,
- 3.997349646564973E-5,
+ 3.997349646564974E-5,
1.1017452326436623E-5,
2.556220564845531E-6,
4.819237373193018E-7,
@@ -161,19 +161,19 @@
1.998773638612381
],
"ys": [
- 0.20884911299107894,
- 0.16145810468844024,
- 0.1199907491643427,
+ 0.20884911299107897,
+ 0.1614581046884402,
+ 0.11999074916434269,
0.08664281640904029,
- 0.06035281081025548,
- 0.04113660286620183,
- 0.02712237329976281,
+ 0.06035281081025549,
+ 0.041136602866201834,
+ 0.027122373299762817,
0.017158998663766196,
0.010389832056442814,
- 0.005966842420004629,
- 0.0032374258061386835,
+ 0.005966842420004628,
+ 0.003237425806138684,
0.0016481130397465967,
- 7.801989781232735E-4,
+ 7.801989781232736E-4,
3.388907756049955E-4,
1.3261398028112855E-4,
4.5544380625508945E-5,
diff --git a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json
index 75e60ef6eaf3dd9429246559d7491673bc5ea3ac..bbc560143e94c4e6fa1a8fe56cefaa2bab4352cc 100644
--- a/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json
+++ b/src/test/resources/e2e/nshm-hawaii-2021/nshm-hawaii-2021-2021-KAILUA_KONA_HI.json
@@ -3,38 +3,38 @@
"xs": [
-5.991464547107982,
-5.585999438999818,
- -5.181423615076538,
+ -5.181423615076537,
-4.775958506968373,
-4.374058465024705,
-3.9633162998156966,
-3.5613661338149765,
- -3.153556358747558,
+ -3.1535563587475584,
-2.7488721956224653,
-2.3434070875143007,
-1.9379419794061366,
- -1.532476871297972,
+ -1.5324768712979722,
-1.1270117631898076,
-0.7215466550816433,
- -0.3160815469734789,
- 0.0861776962410524,
+ -0.31608154697347896,
+ 0.08617769624105241,
0.494696241836107,
0.9001613499442714,
1.3056264580524357,
- 1.7119945007591926
+ 1.7119945007591924
],
"ys": [
- 0.9310649618626425,
- 0.7152683525622627,
+ 0.9310649618626424,
+ 0.7152683525622628,
0.5254960437436178,
0.37057192881004797,
- 0.2536030693592891,
+ 0.25360306935928917,
0.1673342748557868,
0.10852163641624823,
0.06764805605345484,
- 0.04042125038591836,
- 0.02275930256132998,
- 0.012035453130050867,
- 0.006001361401039622,
+ 0.040421250385918366,
+ 0.022759302561329985,
+ 0.012035453130050871,
+ 0.00600136140103962,
0.002825403258669261,
0.0012397199668725764,
4.913127725890904E-4,
@@ -42,13 +42,13 @@
4.6081848166959275E-5,
9.142956045358946E-6,
1.067682459238504E-6,
- 4.413524073773537E-8
+ 4.4135240737735364E-8
]
},
"5.00 Second Spectral Acceleration": {
"xs": [
-6.908755779315721,
- -6.502290170873973,
+ -6.502290170873972,
-6.0968250627658085,
-5.692842534617867,
-5.286388795682763,
@@ -73,20 +73,20 @@
0.13554779250681923,
0.09647775115759329,
0.06847614819048337,
- 0.04772578379364718,
+ 0.04772578379364717,
0.03208679105889853,
- 0.020129540279605004,
+ 0.020129540279605,
0.011639202185119844,
- 0.006195139919067763,
- 0.0030758835356592914,
- 0.0014771509658122373,
- 7.061929082246016E-4,
- 3.34514415859711E-4,
+ 0.0061951399190677625,
+ 0.003075883535659292,
+ 0.0014771509658122375,
+ 7.061929082246017E-4,
+ 3.3451441585971104E-4,
1.5467986387544445E-4,
6.363609376236911E-5,
2.247131683032451E-5,
- 6.219516642047412E-6,
- 1.2615492254822045E-6,
+ 6.219516642047414E-6,
+ 1.2615492254822047E-6,
1.5297532779407637E-7,
7.198489307670766E-9
]
@@ -107,34 +107,34 @@
-1.5994875815809322,
-1.1973282616072674,
-0.789658080940789,
- -0.38566248081198456,
+ -0.3856624808119846,
0.01980262729617973,
0.4252677354043441,
- 0.832909122935104,
+ 0.8329091229351039,
1.235471471385307,
1.6428726885203377
],
"ys": [
1.3099486083268739,
- 1.1995234176688747,
- 1.0517265084684118,
+ 1.199523417668875,
+ 1.0517265084684115,
0.8707860874217463,
0.6765138623146243,
0.49340163862251196,
0.33992289432676787,
0.22192803156480623,
0.13847632521718928,
- 0.0817533386032545,
- 0.04511099205028912,
- 0.022490754664834876,
- 0.01037493979425652,
+ 0.08175333860325448,
+ 0.04511099205028913,
+ 0.022490754664834873,
+ 0.010374939794256521,
0.004313773760782856,
0.0016216028906538638,
5.238693662990279E-4,
- 1.377271763315316E-4,
- 2.6761997339916372E-5,
- 3.5045913382111136E-6,
- 2.30974963417142E-7
+ 1.3772717633153163E-4,
+ 2.676199733991637E-5,
+ 3.5045913382111145E-6,
+ 2.3097496341714198E-7
]
},
"0.20 Second Spectral Acceleration": {
@@ -162,17 +162,17 @@
],
"ys": [
1.3761096429204573,
- 1.2927474893926607,
- 1.178335057078432,
+ 1.292747489392661,
+ 1.1783350570784317,
1.0275173511479154,
0.842703120792494,
0.6513972997833428,
- 0.47242900392024684,
+ 0.4724290039202468,
0.32217060882735266,
0.20861884543377657,
0.128355896587962,
0.07482094551740774,
- 0.040954079958872666,
+ 0.04095407995887267,
0.02092944382070038,
0.009967533485864722,
0.004400165256626161,