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

eee830b6

Commit eee830b6 authored 2 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'cyberfeature' into 'main'

Add BSSA14 cybershake adjusted GMM

See merge request !283

parents 211d7df3 5efa575d

No related branches found

No related tags found

2 merge requests!283Add BSSA14 cybershake adjusted GMM,!281Cybershakebranch

Pipeline #153142 passed 2 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/gmm/BooreEtAl_2014.java 40 additions, 13 deletions

...in/java/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java 12 additions, 0 deletions

src/main/java/gov/usgs/earthquake/nshmp/gmm/Gmm.java
src/main/resources/gmm/coeffs/BSSA14.csv 24 additions, 24 deletions

src/main/resources/gmm/coeffs/BSSA14.csv
src/test/java/gov/usgs/earthquake/nshmp/gmm/DeepBasin.java 2 additions, 0 deletions

src/test/java/gov/usgs/earthquake/nshmp/gmm/DeepBasin.java
src/test/resources/gmm/deep-basin-results.csv 144 additions, 0 deletions

src/test/resources/gmm/deep-basin-results.csv

with 222 additions and 37 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