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
e8ffbb0b
Commit
e8ffbb0b
authored
2 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
sp16 rRup --> rJB; cleanup
parent
433dfa6b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!269
SP16 fix
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
+2
-16
2 additions, 16 deletions
src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
with
2 additions
and
16 deletions
src/main/java/gov/usgs/earthquake/nshmp/gmm/NgaEast.java
+
2
−
16
View file @
e8ffbb0b
...
@@ -524,8 +524,8 @@ public abstract class NgaEast implements GroundMotionModel {
...
@@ -524,8 +524,8 @@ public abstract class NgaEast implements GroundMotionModel {
for
(
int
i
=
0
;
i
<
GMMS
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
GMMS
.
size
();
i
++)
{
Gmm
seed
=
GMMS
.
get
(
i
);
Gmm
seed
=
GMMS
.
get
(
i
);
if
(
seed
==
Gmm
.
NGA_EAST_SEED_SP16
)
{
if
(
seed
==
Gmm
.
NGA_EAST_SEED_SP16
)
{
double
μ
=
sp16
.
calcMeanRock
(
in
.
Mw
,
in
.
r
Rup
);
double
μ
=
sp16
.
calcMeanRock
(
in
.
Mw
,
in
.
r
JB
);
double
μPga
=
exp
(
sp16pga
.
calcMeanRock
(
in
.
Mw
,
in
.
r
Rup
));
double
μPga
=
exp
(
sp16pga
.
calcMeanRock
(
in
.
Mw
,
in
.
r
JB
));
SiteAmp
.
Value
fSite
=
siteAmp
.
calc
(
μPga
,
in
.
vs30
);
SiteAmp
.
Value
fSite
=
siteAmp
.
calc
(
μPga
,
in
.
vs30
);
μs
[
i
]
=
fSite
.
apply
(
μ
);
μs
[
i
]
=
fSite
.
apply
(
μ
);
}
else
if
(
imt
==
Imt
.
PGV
&&
noPgvSeeds
.
contains
(
seed
))
{
}
else
if
(
imt
==
Imt
.
PGV
&&
noPgvSeeds
.
contains
(
seed
))
{
...
@@ -547,20 +547,6 @@ public abstract class NgaEast implements GroundMotionModel {
...
@@ -547,20 +547,6 @@ public abstract class NgaEast implements GroundMotionModel {
}
}
}
}
public
static
void
main
(
String
[]
args
)
{
// TODO clean
// Gmm gmm = Gmm.NGA_EAST_SEED_SP16;
Gmm
gmm
=
Gmm
.
NGA_EAST_SEEDS_2018
;
// Gmm gmm = Gmm.NGA_EAST_SEED_SP16;
GmmInput
in
=
GmmInput
.
builder
().
withDefaults
().
build
();
LogicTree
<
GroundMotion
>
gms
=
gmm
.
instance
(
Imt
.
PGA
).
calc
(
in
);
System
.
out
.
println
(
gms
);
gms
.
forEach
(
gm
->
System
.
out
.
println
(
gm
.
id
()
+
": "
+
gm
.
value
()));
GroundMotion
gm
=
GroundMotions
.
combine
(
gms
);
System
.
out
.
println
(
gm
);
}
/*
/*
* Updated NGA-East for use in the 2023 nshm-conus update. This model includes
* Updated NGA-East for use in the 2023 nshm-conus update. This model includes
* (1) the final published nonlinear site amplification model of Hshash et al.
* (1) the final published nonlinear site amplification model of Hshash et al.
...
...
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