Commit 7d34da9a authored 5 years ago by Jason Altekruse

Merge branch 'master' of code.usgs.gov:ghsc/users/jaltekruse/nshmp-lib into XySequence-edits-#51

parents 0c5ca79b 31768f5e

No related branches found

No related tags found

1 merge request!93XySequence edits

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/gov/usgs/earthquake/nshmp/data/XySequence.java 3 additions, 0 deletions

src/main/java/gov/usgs/earthquake/nshmp/data/XySequence.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/Deserialize.java 99 additions, 25 deletions

.../java/gov/usgs/earthquake/nshmp/eq/model/Deserialize.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/GmmConfig.java 2 additions, 2 deletions

...in/java/gov/usgs/earthquake/nshmp/eq/model/GmmConfig.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/GmmParser.java 2 additions, 2 deletions

...in/java/gov/usgs/earthquake/nshmp/eq/model/GmmParser.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/GmmSet.java 71 additions, 10 deletions

src/main/java/gov/usgs/earthquake/nshmp/eq/model/GmmSet.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/HazardModel.java 8 additions, 8 deletions

.../java/gov/usgs/earthquake/nshmp/eq/model/HazardModel.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/Loader.java 143 additions, 68 deletions

src/main/java/gov/usgs/earthquake/nshmp/eq/model/Loader.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/MagnitudeBranch.java 19 additions, 0 deletions

...a/gov/usgs/earthquake/nshmp/eq/model/MagnitudeBranch.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/MfdConfig.java 8 additions, 2 deletions

...in/java/gov/usgs/earthquake/nshmp/eq/model/MfdConfig.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/MfdHelper2.java 12 additions, 0 deletions

...n/java/gov/usgs/earthquake/nshmp/eq/model/MfdHelper2.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/NshmRuptureSet.java 0 additions, 21 deletions

...va/gov/usgs/earthquake/nshmp/eq/model/NshmRuptureSet.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/RateBranch.java 19 additions, 0 deletions

...n/java/gov/usgs/earthquake/nshmp/eq/model/RateBranch.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/RuptureSet.java 134 additions, 0 deletions

...n/java/gov/usgs/earthquake/nshmp/eq/model/RuptureSet.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/SourceConfig.java 24 additions, 21 deletions

...java/gov/usgs/earthquake/nshmp/eq/model/SourceConfig.java
src/main/java/gov/usgs/earthquake/nshmp/eq/model/SourceTree.java 262 additions, 0 deletions

...n/java/gov/usgs/earthquake/nshmp/eq/model/SourceTree.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/UncertaintyModel.java 2 additions, 6 deletions

.../java/gov/usgs/earthquake/nshmp/gmm/UncertaintyModel.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPgvSupport.java 2 additions, 0 deletions

...in/java/gov/usgs/earthquake/nshmp/gmm/UsgsPgvSupport.java
src/main/java/gov/usgs/earthquake/nshmp/internal/www/NshmpMicronautServlet.java 1 addition, 1 deletion

.../earthquake/nshmp/internal/www/NshmpMicronautServlet.java
src/main/java/gov/usgs/earthquake/nshmp/internal/www/WsUtils.java 1 addition, 1 deletion

.../java/gov/usgs/earthquake/nshmp/internal/www/WsUtils.java
src/main/java/gov/usgs/earthquake/nshmp/mfd/MfdBuilder.java 4 additions, 0 deletions

src/main/java/gov/usgs/earthquake/nshmp/mfd/MfdBuilder.java

with 816 additions and 167 deletions

Please register or to comment

Admin message

Merge branch 'master' of code.usgs.gov:ghsc/users/jaltekruse/nshmp-lib into XySequence-edits-#51