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

468d5e96

Commit 468d5e96 authored 3 years ago by Powers, Peter M.

Downloads
- Plain Diff

Merge branch 'conditional-spectrum' into 'main'

Conditional spectrum (interim updates)

See merge request !252

parents c0a6cde3 5b0dbbff

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 0 deletions

.gitignore
src/main/java/gov/usgs/earthquake/nshmp/calc/ConditionalSpectrum.java 108 additions, 70 deletions

...a/gov/usgs/earthquake/nshmp/calc/ConditionalSpectrum.java
src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggContributor.java 4 additions, 20 deletions

...ava/gov/usgs/earthquake/nshmp/calc/DisaggContributor.java
src/main/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java 2 additions, 1 deletion

...in/java/gov/usgs/earthquake/nshmp/calc/DisaggDataset.java
src/main/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java 8 additions, 9 deletions

...ain/java/gov/usgs/earthquake/nshmp/calc/HazardExport.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/GroundMotion.java 26 additions, 0 deletions

...main/java/gov/usgs/earthquake/nshmp/gmm/GroundMotion.java
src/test/java/gov/usgs/earthquake/nshmp/model/LoaderTests.java 2 additions, 1 deletion

...est/java/gov/usgs/earthquake/nshmp/model/LoaderTests.java

with 151 additions and 101 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