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
84561f73
Commit
84561f73
authored
4 months ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
field edits wus --> nga
parent
9dbdcf3b
No related branches found
No related tags found
1 merge request
!432
General edits and improvements
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java
+8
-8
8 additions, 8 deletions
...a/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java
with
8 additions
and
8 deletions
src/main/java/gov/usgs/earthquake/nshmp/gmm/UsgsPrviBackbone2025.java
+
8
−
8
View file @
84561f73
...
...
@@ -82,7 +82,7 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
final
double
τ1
,
τ2
,
τ3
,
τ4
;
final
double
a
,
b
;
final
double
φs2sPrvi
,
φs2s
Wus
;
final
double
φs2sPrvi
,
φs2s
Nga
;
final
double
τSub
,
φSub
,
φSubSS
,
φSubS2S
;
Coefficients
(
...
...
@@ -104,7 +104,7 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
Map
<
String
,
Double
>
coeffsPhiS2S
=
ccPhiS2S
.
get
(
imt
);
φs2sPrvi
=
coeffsPhiS2S
.
get
(
"phiS2S_PRVI"
);
φs2s
Wus
=
coeffsPhiS2S
.
get
(
"phiS2S_WUS"
);
φs2s
Nga
=
coeffsPhiS2S
.
get
(
"phiS2S_WUS"
);
Map
<
String
,
Double
>
coeffsSubSigma
=
ccSubSigma
.
get
(
imt
);
τSub
=
coeffsSubSigma
.
get
(
"tau_mean"
);
...
...
@@ -244,9 +244,9 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
Coefficients
c
=
super
.
coeffs
;
double
τ
=
calcTau
(
in
.
Mw
,
c
);
double
φSS
=
calcPhiSS
(
in
.
Mw
,
c
);
double
σ
Wus
=
sqrt
(
τ
*
τ
+
c
.
φs2s
Wus
*
c
.
φs2s
Wus
+
φSS
*
φSS
);
double
σ
Nga
=
sqrt
(
τ
*
τ
+
c
.
φs2s
Nga
*
c
.
φs2s
Nga
+
φSS
*
φSS
);
double
σPrvi
=
sqrt
(
τ
*
τ
+
c
.
φs2sPrvi
*
c
.
φs2sPrvi
+
φSS
*
φSS
);
return
new
double
[]
{
σ
Wus
,
σPrvi
};
return
new
double
[]
{
σ
Nga
,
σPrvi
};
}
// active crust tau
...
...
@@ -400,9 +400,9 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
@Override
double
[]
calcSigmas
(
GmmInput
in
)
{
Coefficients
c
=
super
.
coeffs
;
double
σ
=
sqrt
(
c
.
τSub
*
c
.
τSub
+
c
.
φSub
*
c
.
φSub
);
double
σ
Nga
=
sqrt
(
c
.
τSub
*
c
.
τSub
+
c
.
φSub
*
c
.
φSub
);
double
σPrvi
=
sqrt
(
c
.
τSub
*
c
.
τSub
+
c
.
φSubS2S
*
c
.
φSubS2S
+
c
.
φSubSS
*
c
.
φSubSS
);
return
new
double
[]
{
σ
,
σPrvi
};
return
new
double
[]
{
σ
Nga
,
σPrvi
};
}
}
...
...
@@ -535,9 +535,9 @@ public abstract class UsgsPrviBackbone2025 implements GroundMotionModel {
@Override
double
[]
calcSigmas
(
GmmInput
in
)
{
Coefficients
c
=
super
.
coeffs
;
double
σ
=
sqrt
(
c
.
τSub
*
c
.
τSub
+
c
.
φSub
*
c
.
φSub
);
double
σ
Nga
=
sqrt
(
c
.
τSub
*
c
.
τSub
+
c
.
φSub
*
c
.
φSub
);
double
σPrvi
=
sqrt
(
c
.
τSub
*
c
.
τSub
+
c
.
φSubS2S
*
c
.
φSubS2S
+
c
.
φSubSS
*
c
.
φSubSS
);
return
new
double
[]
{
σ
,
σPrvi
};
return
new
double
[]
{
σ
Nga
,
σPrvi
};
}
}
...
...
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