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

aeca5243

Commit aeca5243 authored 3 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'app-work' into 'main'

Hazard and disagg app work

Closes #476

See merge request !589

parents 6e2a2c1f cd00b7d8

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java 400 additions, 23 deletions

src/main/java/gov/usgs/earthquake/nshmp/DisaggCalc.java
src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java 0 additions, 371 deletions

src/main/java/gov/usgs/earthquake/nshmp/DisaggEpsilon.java
src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java 16 additions, 3 deletions

src/main/java/gov/usgs/earthquake/nshmp/HazardCalc.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggController.java 8 additions, 3 deletions

...ov/usgs/earthquake/nshmp/www/hazard/DisaggController.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java 1 addition, 0 deletions

...a/gov/usgs/earthquake/nshmp/www/hazard/DisaggService.java
src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardController.java 5 additions, 2 deletions

...ov/usgs/earthquake/nshmp/www/hazard/HazardController.java

with 430 additions and 402 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