Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-lib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-lib
Commits
9f214340
Commit
9f214340
authored
2 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
kuehn cleaning
parent
d01e0d91
No related branches found
No related tags found
1 merge request
!282
Gmm updates
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java
+1
-24
1 addition, 24 deletions
...in/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java
with
1 addition
and
24 deletions
src/main/java/gov/usgs/earthquake/nshmp/gmm/KuehnEtAl_2020.java
+
1
−
24
View file @
9f214340
...
...
@@ -245,6 +245,7 @@ public abstract class KuehnEtAl_2020 implements GroundMotionModel {
abstract
boolean
basin
();
/* Only true for interface */
abstract
boolean
seattle
();
@Override
...
...
@@ -376,8 +377,6 @@ public abstract class KuehnEtAl_2020 implements GroundMotionModel {
double
z2p5
,
boolean
seattle
)
{
// TODO add Seattle flag
if
(
Double
.
isNaN
(
z2p5
))
{
return
0.0
;
}
...
...
@@ -394,28 +393,6 @@ public abstract class KuehnEtAl_2020 implements GroundMotionModel {
}
return
fb
;
// switch (region) {
// case Region.CASCADIA:
// // Eq. 4.14
// switch (basin) {
// case Basin.SEATTLE:
// return c.θ11S; // Seattle-specific
// case Basin.OTHER:
// // TODO:
// // The paper returns this:
// // System.out.printf(" OTHER basin: taking minimum of %.9f and
// // %.9f\n",c.θ11 + c.θ12 * δlnZ, c.θ11S);
// // return min(c.θ11 + c.θ12 * δlnZ, c.θ11S);
// // The official python code just returns this:
// return c.θ11 + c.θ12 * δlnZ;
// default:
// return 0.0;
// }
// default:
// // Eq. 4.10
// return c.θ11 + c.θ12 * δlnZ;
// }
}
/* Eq. 4.11 - basin reference depth for vs30; Cascadia model */
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment