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

95d41b7b

Commit 95d41b7b authored 9 months ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'config-248-dsf' into 'main'

CalcConfig updates

Closes #248

See merge request !415

parents a23be4f8 0c487090

No related branches found

No related tags found

1 merge request!415CalcConfig updates

Pipeline #443110 passed 9 months ago

Stage: build

Changes 5
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java 7 additions, 10 deletions

src/main/java/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsDampingScaling.java 7 additions, 3 deletions

...ava/gov/usgs/earthquake/nshmp/gmm/UsgsDampingScaling.java
src/main/java/gov/usgs/earthquake/nshmp/model/ModelTrees.java 1 addition, 1 deletion

...main/java/gov/usgs/earthquake/nshmp/model/ModelTrees.java
src/test/java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java 11 additions, 0 deletions

.../java/gov/usgs/earthquake/nshmp/calc/CalcConfigTests.java
src/test/resources/calc/calc-config-extends-empty-arrays.json 8 additions, 0 deletions

...test/resources/calc/calc-config-extends-empty-arrays.json

with 34 additions and 14 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