Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-haz
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Admin message
Maintenance scheduled for Thursday, April 10, from 5 PM to 6 PM ET.
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-haz
Commits
a3971a81
Commit
a3971a81
authored
2 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
updated conus model path
parent
311dc991
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!655
Production Release | nshmp-haz
,
!652
Increment lib
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
+3
-2
3 additions, 2 deletions
.../java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
with
3 additions
and
2 deletions
src/test/java/gov/usgs/earthquake/nshmp/model/NshmTestsConus.java
+
3
−
2
View file @
a3971a81
...
@@ -80,6 +80,7 @@ class NshmTestsConus {
...
@@ -80,6 +80,7 @@ class NshmTestsConus {
private
static
final
Set
<
Imt
>
IMTS
=
EnumSet
.
of
(
PGA
,
SA0P2
,
SA1P0
,
SA5P0
);
private
static
final
Set
<
Imt
>
IMTS
=
EnumSet
.
of
(
PGA
,
SA0P2
,
SA1P0
,
SA5P0
);
private
static
final
String
MODEL_NAME
=
"nshm-conus-2018-5.1-maint"
;
private
static
final
String
MODEL_NAME
=
"nshm-conus-2018-5.1-maint"
;
private
static
final
String
MODEL_NAME_OUT
=
"nshm-conus"
;
private
static
final
int
MODEL_YEAR
=
2018
;
private
static
final
int
MODEL_YEAR
=
2018
;
private
static
final
Path
MODEL_PATH
=
Paths
.
get
(
"../"
+
MODEL_NAME
);
private
static
final
Path
MODEL_PATH
=
Paths
.
get
(
"../"
+
MODEL_NAME
);
private
static
final
Path
DATA_PATH
=
Paths
.
get
(
"src/test/resources/e2e"
);
private
static
final
Path
DATA_PATH
=
Paths
.
get
(
"src/test/resources/e2e"
);
...
@@ -187,7 +188,7 @@ class NshmTestsConus {
...
@@ -187,7 +188,7 @@ class NshmTestsConus {
private
static
Map
<
String
,
XySequence
>
readExpected
(
NamedLocation
loc
)
{
private
static
Map
<
String
,
XySequence
>
readExpected
(
NamedLocation
loc
)
{
String
filename
=
resultFilename
(
MODEL_NAME
,
MODEL_YEAR
,
loc
);
String
filename
=
resultFilename
(
MODEL_NAME
_OUT
,
MODEL_YEAR
,
loc
);
Path
resultPath
=
DATA_PATH
.
resolve
(
filename
);
Path
resultPath
=
DATA_PATH
.
resolve
(
filename
);
JsonObject
obj
=
null
;
JsonObject
obj
=
null
;
...
@@ -246,7 +247,7 @@ class NshmTestsConus {
...
@@ -246,7 +247,7 @@ class NshmTestsConus {
/* Initialize and shut down executor to generate results. */
/* Initialize and shut down executor to generate results. */
setUpBeforeClass
();
setUpBeforeClass
();
writeExpecteds
(
MODEL_NAME
,
MODEL_YEAR
,
SITES
);
writeExpecteds
(
MODEL_NAME
_OUT
,
MODEL_YEAR
,
SITES
);
tearDownAfterClass
();
tearDownAfterClass
();
}
}
...
...
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