Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-ws-static
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-ws-static
Commits
a5add086
Commit
a5add086
authored
2 years ago
by
Altekruse, Jason Morgan
Browse files
Options
Downloads
Plain Diff
Merge branch 'issue-62' into 'main'
Filter null values Closes
#62
See merge request
!130
parents
4f52758a
f9a22963
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!131
Production Release | nshmp-ws-static
,
!130
Filter null values
Pipeline
#181970
passed
2 years ago
Stage: build
Stage: trigger
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/BoundingReaderHazardCurves.java
+12
-1
12 additions, 1 deletion
...quake/nshmp/netcdf/reader/BoundingReaderHazardCurves.java
with
12 additions
and
1 deletion
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/reader/BoundingReaderHazardCurves.java
+
12
−
1
View file @
a5add086
...
@@ -2,7 +2,9 @@ package gov.usgs.earthquake.nshmp.netcdf.reader;
...
@@ -2,7 +2,9 @@ package gov.usgs.earthquake.nshmp.netcdf.reader;
import
java.io.IOException
;
import
java.io.IOException
;
import
java.util.List
;
import
java.util.List
;
import
java.util.stream.Collectors
;
import
gov.usgs.earthquake.nshmp.Maths
;
import
gov.usgs.earthquake.nshmp.data.XySequence
;
import
gov.usgs.earthquake.nshmp.data.XySequence
;
import
gov.usgs.earthquake.nshmp.geo.Location
;
import
gov.usgs.earthquake.nshmp.geo.Location
;
import
gov.usgs.earthquake.nshmp.netcdf.Netcdf
;
import
gov.usgs.earthquake.nshmp.netcdf.Netcdf
;
...
@@ -26,6 +28,8 @@ import ucar.nc2.dataset.NetcdfDatasets;
...
@@ -26,6 +28,8 @@ import ucar.nc2.dataset.NetcdfDatasets;
*/
*/
public
class
BoundingReaderHazardCurves
extends
BoundingReader
<
StaticDataHazardCurves
>
{
public
class
BoundingReaderHazardCurves
extends
BoundingReader
<
StaticDataHazardCurves
>
{
private
static
final
double
FILL_VALUE
=
9999.9
;
public
BoundingReaderHazardCurves
(
NetcdfHazardCurves
netcdf
,
Location
site
)
{
public
BoundingReaderHazardCurves
(
NetcdfHazardCurves
netcdf
,
Location
site
)
{
super
(
netcdf
,
site
);
super
(
netcdf
,
site
);
}
}
...
@@ -148,7 +152,14 @@ public class BoundingReaderHazardCurves extends BoundingReader<StaticDataHazardC
...
@@ -148,7 +152,14 @@ public class BoundingReaderHazardCurves extends BoundingReader<StaticDataHazardC
netcdfData
.
imls
().
get
(
imt
),
netcdfData
.
imls
().
get
(
imt
),
(
double
[])
hazards
.
section
(
origin
,
shape
).
reduce
().
get1DJavaArray
(
DataType
.
DOUBLE
));
(
double
[])
hazards
.
section
(
origin
,
shape
).
reduce
().
get1DJavaArray
(
DataType
.
DOUBLE
));
imtHazardMap
.
put
(
imt
,
xySequence
);
var
points
=
xySequence
.
stream
()
.
filter
(
xy
->
Maths
.
round
(
xy
.
x
(),
1
)
!=
FILL_VALUE
)
.
collect
(
Collectors
.
toList
());
var
xs
=
points
.
stream
().
map
(
xy
->
xy
.
x
()).
collect
(
Collectors
.
toList
());
var
ys
=
points
.
stream
().
map
(
xy
->
xy
.
y
()).
collect
(
Collectors
.
toList
());
imtHazardMap
.
put
(
imt
,
XySequence
.
create
(
xs
,
ys
));
}
catch
(
InvalidRangeException
e
)
{
}
catch
(
InvalidRangeException
e
)
{
throw
new
RuntimeException
(
e
.
getMessage
());
throw
new
RuntimeException
(
e
.
getMessage
());
}
}
...
...
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