Merge branch 'site-branch-path-edits' into 'main'
Site, tree, and NGA-East edits See merge request !273
Showing
- src/main/java/gov/usgs/earthquake/nshmp/calc/HazardInput.java 7 additions, 6 deletions...main/java/gov/usgs/earthquake/nshmp/calc/HazardInput.java
- src/main/java/gov/usgs/earthquake/nshmp/calc/Site.java 2 additions, 2 deletionssrc/main/java/gov/usgs/earthquake/nshmp/calc/Site.java
- src/main/java/gov/usgs/earthquake/nshmp/calc/Transforms.java 2 additions, 1 deletionsrc/main/java/gov/usgs/earthquake/nshmp/calc/Transforms.java
- src/main/java/gov/usgs/earthquake/nshmp/gmm/GroundMotions.java 35 additions, 5 deletions...ain/java/gov/usgs/earthquake/nshmp/gmm/GroundMotions.java
- src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java 25 additions, 9 deletionssrc/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
- src/main/java/gov/usgs/earthquake/nshmp/model/HazardModel.java 18 additions, 1 deletion...ain/java/gov/usgs/earthquake/nshmp/model/HazardModel.java
- src/main/java/gov/usgs/earthquake/nshmp/model/ModelLoader.java 3 additions, 2 deletions...ain/java/gov/usgs/earthquake/nshmp/model/ModelLoader.java
- src/main/java/gov/usgs/earthquake/nshmp/model/SystemRuptureSet.java 2 additions, 1 deletion...ava/gov/usgs/earthquake/nshmp/model/SystemRuptureSet.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/Branch.java 10 additions, 0 deletionssrc/main/java/gov/usgs/earthquake/nshmp/tree/Branch.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/EnumBranch.java 1 addition, 1 deletionsrc/main/java/gov/usgs/earthquake/nshmp/tree/EnumBranch.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/EnumValueBranch.java 1 addition, 1 deletion.../java/gov/usgs/earthquake/nshmp/tree/EnumValueBranch.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/GroupBranch.java 1 addition, 1 deletion...main/java/gov/usgs/earthquake/nshmp/tree/GroupBranch.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/LogicGroup.java 1 addition, 1 deletionsrc/main/java/gov/usgs/earthquake/nshmp/tree/LogicGroup.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/LogicTree.java 22 additions, 0 deletionssrc/main/java/gov/usgs/earthquake/nshmp/tree/LogicTree.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/RegularBranch.java 1 addition, 4 deletions...in/java/gov/usgs/earthquake/nshmp/tree/RegularBranch.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/RegularTree.java 1 addition, 20 deletions...main/java/gov/usgs/earthquake/nshmp/tree/RegularTree.java
- src/main/java/gov/usgs/earthquake/nshmp/tree/StringValueBranch.java 1 addition, 1 deletion...ava/gov/usgs/earthquake/nshmp/tree/StringValueBranch.java
- src/test/java/gov/usgs/earthquake/nshmp/tree/LogicTreeTests.java 15 additions, 13 deletions...t/java/gov/usgs/earthquake/nshmp/tree/LogicTreeTests.java
Loading
Please register or sign in to comment