Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nshmp-haz
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

23887d79

Commit 23887d79 authored 3 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'cli-continued' into 'main'

CLI continued

See merge request !566

parents 1f0ea187 5f4a6cec

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

gradle.properties 1 addition, 1 deletion

gradle.properties
src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java 2 additions, 1 deletion

src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java 1 addition, 1 deletion

src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java 2 additions, 1 deletion

src/main/java/gov/usgs/earthquake/nshmp/RateCalc.java
src/main/java/gov/usgs/earthquake/nshmp/www/HazardController.java 7 additions, 3 deletions

.../java/gov/usgs/earthquake/nshmp/www/HazardController.java
src/main/java/gov/usgs/earthquake/nshmp/www/services/HazardService2.java 444 additions, 0 deletions

...ov/usgs/earthquake/nshmp/www/services/HazardService2.java

with 457 additions and 7 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