Skip to content
Snippets Groups Projects
Commit e3618490 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

Merge branch 'increment-lib' into 'main'

Increment lib

See merge request !616
parents 19c37047 ea6d9818
No related branches found
No related tags found
2 merge requests!619Production Release | nshmp-haz,!616Increment lib
Pipeline #139658 passed
...@@ -6,8 +6,7 @@ ...@@ -6,8 +6,7 @@
* [Developer Basics](./Developer-Basics.md#developer-basics) * [Developer Basics](./Developer-Basics.md#developer-basics)
* [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration) * [Calculation Configuration](./Calculation-Configuration.md#calculation-configuration)
* [Site Specification](./Site-Specification.md#site-specification) * [Site Specification](./Site-Specification.md#site-specification)
* [Examples](../../etc/examples) (or * [Examples](../../etc/examples)
[on GitLab](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/tree/main/etc/examples))
* [Web Services](./Web-Services.md) * [Web Services](./Web-Services.md)
## Build & Run Options ## Build & Run Options
......
...@@ -80,7 +80,7 @@ or its children will be processed; any standalone sources will be ignored. For e ...@@ -80,7 +80,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 **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. additive and therefore does not include weights. Examples from the NSHM for the conterminous U.S.
NSHM include the Cascadia segmented partial-rupture models and the New Madrid 1500-yr cluster 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 be used to impose a probability of occurrence or other scaling requred by a NSHM. If absent, the
`scale` value is one. `scale` value is one.
......
...@@ -71,6 +71,9 @@ rupture representations. ...@@ -71,6 +71,9 @@ rupture representations.
```json ```json
{ {
"grid-spacing": 0.1, "grid-spacing": 0.1,
"smoothing-density": 10,
"smoothing-limit": 40.0,
"opt-distance-bin": 1.0,
"point-source-type": "FINITE", "point-source-type": "FINITE",
"rupture-scaling": "NSHM_POINT_WC94_LENGTH", "rupture-scaling": "NSHM_POINT_WC94_LENGTH",
"max-depth": 22.0, "max-depth": 22.0,
...@@ -151,6 +154,9 @@ __zone-config.json:__ Zone source model configuration is identical to a grid sou ...@@ -151,6 +154,9 @@ __zone-config.json:__ Zone source model configuration is identical to a grid sou
```json ```json
{ {
"grid-spacing": 0.1, "grid-spacing": 0.1,
"smoothing-density": 10,
"smoothing-limit": 40.0,
"opt-distance-bin": null,
"point-source-type": "FIXED_STRIKE", "point-source-type": "FIXED_STRIKE",
"rupture-scaling": "NSHM_POINT_WC94_LENGTH", "rupture-scaling": "NSHM_POINT_WC94_LENGTH",
"max-depth": 22.0, "max-depth": 22.0,
......
...@@ -11,7 +11,7 @@ micronautRxVersion = 2.1.1 ...@@ -11,7 +11,7 @@ micronautRxVersion = 2.1.1
micronautPluginVersion = 3.1.1 micronautPluginVersion = 3.1.1
nodePluginVersion = 3.0.1 nodePluginVersion = 3.0.1
nodeVersion = 16.3.0 nodeVersion = 16.3.0
nshmpLibVersion = 1.0.6 nshmpLibVersion = 1.1.0
nshmpWsUtilsVersion = 0.3.7 nshmpWsUtilsVersion = 0.3.7
shadowVersion = 7.1.2 shadowVersion = 7.1.2
spotbugsVersion = 4.7.0 spotbugsVersion = 4.7.0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment