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

7823b6e5

Commit 7823b6e5 authored 4 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'lib-work' into 'master'

Lib work

Closes #72 and #36

See merge request !149

parents 9a3dcc07 170e9dd7

No related branches found

No related tags found

1 merge request!149Lib work

Pipeline #33642 passed 4 years ago

Stage: test

Changes 10
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/gov/usgs/earthquake/nshmp/fault/surface/ApproxGriddedSurface.java 14 additions, 7 deletions

.../earthquake/nshmp/fault/surface/ApproxGriddedSurface.java
src/main/java/gov/usgs/earthquake/nshmp/fault/surface/DefaultGriddedSurface.java 30 additions, 24 deletions

...earthquake/nshmp/fault/surface/DefaultGriddedSurface.java
src/main/java/gov/usgs/earthquake/nshmp/fault/surface/GriddedSubsetSurface.java 13 additions, 7 deletions

.../earthquake/nshmp/fault/surface/GriddedSubsetSurface.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java 2 additions, 2 deletions

...va/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/BcHydro_2012.java 1 addition, 1 deletion

...main/java/gov/usgs/earthquake/nshmp/gmm/BcHydro_2012.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java 1 addition, 1 deletion

.../java/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java 1 addition, 1 deletion

...ain/java/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java
src/main/java/gov/usgs/earthquake/nshmp/model/FaultRuptureSet.java 1 addition, 1 deletion

...java/gov/usgs/earthquake/nshmp/model/FaultRuptureSet.java
src/main/java/gov/usgs/earthquake/nshmp/model/ModelData.java 10 additions, 0 deletions

src/main/java/gov/usgs/earthquake/nshmp/model/ModelData.java
src/main/java/gov/usgs/earthquake/nshmp/model/ModelLoader.java 11 additions, 0 deletions

...ain/java/gov/usgs/earthquake/nshmp/model/ModelLoader.java

with 84 additions and 44 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