Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nshmp-lib
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

60b10f57

Commit 60b10f57 authored 3 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'config-updates-138' into 'main'

CalcConfig updates

Closes #138

See merge request !240

parents 46d21407 3c0541ff

No related branches found

No related tags found

1 merge request!240CalcConfig updates

Pipeline #112291 passed 3 years ago

Stage: build

Stage: trigger

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java 36 additions, 12 deletions

src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/RezaeianDamping_2014.java 5 additions, 5 deletions

...a/gov/usgs/earthquake/nshmp/gmm/RezaeianDamping_2014.java
src/main/resources/calc/calc-config-defaults.json 4 additions, 3 deletions

src/main/resources/calc/calc-config-defaults.json
src/test/java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java 8 additions, 7 deletions

.../java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java
src/test/resources/calc/calc-config-extends.json 3 additions, 2 deletions

src/test/resources/calc/calc-config-extends.json

with 56 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment