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
bfa2ee8f
Commit
bfa2ee8f
authored
4 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
add NehrpSiteClass; delete Vs30
parent
b83463e4
No related branches found
No related tags found
1 merge request
!144
Lib work
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/gov/usgs/earthquake/nshmp/calc/Vs30.java
+0
-63
0 additions, 63 deletions
src/main/java/gov/usgs/earthquake/nshmp/calc/Vs30.java
src/main/java/gov/usgs/earthquake/nshmp/gmm/NehrpSiteClass.java
+49
-0
49 additions, 0 deletions
...in/java/gov/usgs/earthquake/nshmp/gmm/NehrpSiteClass.java
with
49 additions
and
63 deletions
src/main/java/gov/usgs/earthquake/nshmp/calc/Vs30.java
deleted
100644 → 0
+
0
−
63
View file @
b83463e4
package
gov.usgs.earthquake.nshmp.calc
;
/**
* Identifiers for commonly used values of Vs30. These correspond to the NEHERP
* site classes that have histroically been supported by the NSHMp in hazard
* calculations.
*
* @author U.S. Geological Survey
*/
@Deprecated
public
enum
Vs30
{
/** NEHRP site class A. */
VS_2000
(
"Site class A"
),
/** NEHRP site class B. */
VS_1150
(
"Site class B"
),
/** NEHRP B/C boundary site class. */
VS_760
(
"B/C boundary"
),
/** NEHRP site class C. */
VS_537
(
"Site class C"
),
/** NEHRP C/D boundary site class. */
VS_360
(
"C/D boundary"
),
/** NEHRP site class D. */
VS_259
(
"Site class D"
),
/** NEHRP D/E boundary site class. */
VS_180
(
"D/E boundary"
);
private
String
label
;
private
double
value
;
private
Vs30
(
String
label
)
{
this
.
label
=
label
;
this
.
value
=
Double
.
valueOf
(
name
().
substring
(
3
));
}
@Override
public
String
toString
()
{
return
this
.
name
().
substring
(
3
)
+
" m/s ("
+
label
+
")"
;
}
/**
* Return the Vs30 value for this identifier.
*/
public
double
value
()
{
return
value
;
}
/**
* Create a Vs30 constant from a Vs30 {@code value}.
* @param value to process
*/
public
static
Vs30
fromValue
(
double
value
)
{
String
name
=
"VS_"
+
(
int
)
value
;
return
Enum
.
valueOf
(
Vs30
.
class
,
name
);
}
}
This diff is collapsed.
Click to expand it.
src/main/java/gov/usgs/earthquake/nshmp/gmm/NehrpSiteClass.java
0 → 100644
+
49
−
0
View file @
bfa2ee8f
package
gov.usgs.earthquake.nshmp.gmm
;
/**
* NEHRP site class identifier.
*
* <p>Over time, the equivalent Vs30 values for each site class have changed
* slightly and are documented with each NSHM.
*
* @author U.S. Geological Survey
*/
enum
NehrpSiteClass
{
/** Site class A, very hard rock. */
A
(
"very hard rock"
),
/** Site class A/B boundary, hard rock. */
AB
(
"hard rock"
),
/** Site class B, medium hard rock. */
B
(
"medium hard rock"
),
/** Site class B/C boundary, soft rock. */
BC
(
"soft rock"
),
/** Site class C, very dense soil or hard clay. */
C
(
"very dense soil or hard clay"
),
/** Site class C/D boundary, dense sand or very stiff clay. */
CD
(
"dense sand or very stiff clay"
),
/** Site class D, medium dense sand or stiff clay. */
D
(
"medium dense sand or stiff clay"
),
/** Site class D/E boundary, loose sand or medium stiff clay. */
DE
(
"loose sand or medium stiff clay"
),
/** Site class E, very loose sand or soft clay. */
E
(
"very loose sand or soft clay"
);
private
final
String
condition
;
private
NehrpSiteClass
(
String
condition
)
{
this
.
condition
=
condition
;
}
public
String
condition
()
{
return
condition
;
}
}
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