Skip to content
Snippets Groups Projects
Commit a30c21fe authored by Altekruse, Jason Morgan's avatar Altekruse, Jason Morgan
Browse files

Merge branch 'prep-for-review' into 'master'

prep for review

See merge request ghsc/nshmp/nshmp-haz-v2!528
parents d6bca9b5 d35fa005
No related branches found
No related tags found
1 merge request!528prep for review
Pipeline #53893 passed
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
All contributions to and interactions surrounding this project will abide by All contributions to and interactions surrounding this project will abide by
the [USGS Code of Scientific Conduct][1]. the [USGS Code of Scientific Conduct][1].
[1]: https://www2.usgs.gov/fsp/fsp_code_of_scientific_conduct.asp [1]: https://www.usgs.gov/about/organization/science-support/office-science-quality-and-integrity/code-scientific-conduct
...@@ -10,6 +10,6 @@ If you have direct contributions you would like considered for incorporation ...@@ -10,6 +10,6 @@ If you have direct contributions you would like considered for incorporation
into the project you can [fork this repository][2] and into the project you can [fork this repository][2] and
[submit a merge request][3] for review. [submit a merge request][3] for review.
[1]: https://code.usgs.gov/ghsc/nshmp/nshm-fault-sections/issues [1]: https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/-/issues
[2]: https://docs.gitlab.com/ee/gitlab-basics/fork-project.html [2]: https://docs.gitlab.com/ee/gitlab-basics/fork-project.html
[3]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html [3]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html
...@@ -4,15 +4,14 @@ Unless otherwise noted, this project is in the public domain in the United ...@@ -4,15 +4,14 @@ Unless otherwise noted, this project is in the public domain in the United
States because it contains materials that originally came from the United States because it contains materials that originally came from the United
States Geological Survey, an agency of the United States Department of States Geological Survey, an agency of the United States Department of
Interior. For more information, see the official USGS copyright policy at Interior. For more information, see the official USGS copyright policy at
<https://www2.usgs.gov/visual-id/credit_usgs.html#copyright> <https://www.usgs.gov/information-policies-and-instructions/copyrights-and-credits>.
Additionally, we waive copyright and related rights in the work Additionally, we waive copyright and related rights in the work
worldwide through the CC0 1.0 Universal public domain dedication. worldwide through the CC0 1.0 Universal public domain dedication.
## CC0 1.0 Universal Summary ## CC0 1.0 Universal Summary
This is a human-readable summary of the This is a human-readable summary of the [Legal Code (read the full text)][1].
[Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode).
### No Copyright ### No Copyright
...@@ -35,3 +34,5 @@ this deed makes no warranties about the work, and disclaims liability for ...@@ -35,3 +34,5 @@ this deed makes no warranties about the work, and disclaims liability for
all uses of the work, to the fullest extent permitted by applicable law. all uses of the work, to the fullest extent permitted by applicable law.
When using or citing the work, you should not imply endorsement by the When using or citing the work, you should not imply endorsement by the
author or the affirmer. author or the affirmer.
[1]: https://creativecommons.org/publicdomain/zero/1.0/legalcode
...@@ -8,4 +8,4 @@ command line applications and web service classes and relies on the ...@@ -8,4 +8,4 @@ command line applications and web service classes and relies on the
[*nshmp-lib*](https://code.usgs.gov/ghsc/nshmp/nshmp-lib) hazard library, among other [*nshmp-lib*](https://code.usgs.gov/ghsc/nshmp/nshmp-lib) hazard library, among other
dependencies. dependencies.
Please see the [docs](https://code.usgs.gov/ghsc/nshmp/nshmp-haz/docs) for more information. Please see the [docs](https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/-/tree/master/docs) for more information.
{ [
"version": "2.0.0", {
"measurementType": {}, "name": "nshmp-haz-v2",
"agency": "U.S. Department of Interior", "organization": "U.S. Geological Survey",
"releases": [ "description": "National Seismic Hazard Mapping Project (NSHMP) software stack",
{ "version": "#.#.#",
"name": "nshmp-haz", "status": "Production",
"description": "National Seismic Hazard Mapping Project (NSHMP) Code", "doi": "doi:###TBD###",
"version": "1.0.0",
"status": "Production", "permissions": {
"organization": "U.S. Geological Survey", "usageType": "openSource",
"vcs": "git", "licenses": [
"repositoryURL": "https://github.com/usgs/nshmp-haz", {
"homepageURL": "https://github.com/usgs/nshmp-haz/wiki", "name": "Public Domain, CC0-1.0",
"downloadURL": "https://github.com/usgs/nshmp-haz/releases/tag/v1.0.0", "URL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/-/blob/master/LICENSE.md"
"disclaimerURL": "https://github.com/usgs/nshmp-haz/blob/master/DISCLAIMER.md", }
"permissions": { ]
"licenses": [ },
{
"name": "Public Domain", "repositoryURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/",
"URL": "https://github.com/usgs/nshmp-haz/blob/master/LICENSE.md" "homepageURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/-/tree/master/docs",
} "downloadURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/-/releases/tag/v#.#.#",
], "disclaimerURL": "https://code.usgs.gov/ghsc/nshmp/nshmp-haz-v2/-/blob/master/DISCLAIMER.md",
"usageType": "openSource", "vcs": "git",
"exemptionText": null
}, "laborHours": 1200,
"laborHours": 1200,
"languages": [ "Java" ], "languages": [ "Java" ],
"tags": [
"psha", "tags": [
"seismic-hazard", "Earthquake Hazards",
"seismic-source", "Geologic Hazards Science Center",
"earthquake-hazard", "psha",
"earthquake-source", "nshmp-haz",
"hazard-curve", "seismic-hazard",
"deaggregation" "seismic-source",
], "earthquake-hazard",
"contact": { "earthquake-source",
"name": "Peter Powers", "hazard-curve",
"email": "pmpowers@usgs.gov" "disaggregation",
}, "deaggregation",
"date": { "doi|###TBD###"
"metadataLastUpdated": "2017-09-18" ],
}
"contact": {
"name": "Peter Powers",
"email": "pmpowers@usgs.gov"
},
"date": {
"metadataLastUpdated": "2021-06-##"
} }
] }
} ]
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