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
60340322
Commit
60340322
authored
3 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Plain Diff
Merge branch 'grid-smoothing' into 'main'
Grid smoothing fix See merge request
!248
parents
ea4932f3
f263d7e0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!248
Grid smoothing fix
Pipeline
#114326
passed
3 years ago
Stage: build
Stage: publish
Stage: trigger
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
build.gradle
+1
-1
1 addition, 1 deletion
build.gradle
src/main/java/gov/usgs/earthquake/nshmp/model/GridRuptureSet.java
+2
-0
2 additions, 0 deletions
.../java/gov/usgs/earthquake/nshmp/model/GridRuptureSet.java
with
3 additions
and
1 deletion
build.gradle
+
1
−
1
View file @
60340322
...
...
@@ -62,7 +62,7 @@ javadoc {
// model parsing classes; TODO remove when parser is stable
task
fatJar
(
type:
Jar
)
{
from
{
configurations
.
compile
.
collect
{
it
.
isDirectory
()
?
it
:
zipTree
(
it
)
}
//
configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
configurations
.
runtimeClasspath
.
collect
{
it
.
isDirectory
()
?
it
:
zipTree
(
it
)
}
}
with
jar
...
...
This diff is collapsed.
Click to expand it.
src/main/java/gov/usgs/earthquake/nshmp/model/GridRuptureSet.java
+
2
−
0
View file @
60340322
...
...
@@ -1039,9 +1039,11 @@ public class GridRuptureSet extends AbstractRuptureSet<PointSource> {
private
static
final
int
PRECISION
=
5
;
private
static
final
double
[]
OFFSET_SCALE_10
=
Sequences
.
arrayBuilder
(-
0.45
,
0.45
,
0.1
)
.
centered
()
.
build
();
private
static
final
double
[]
OFFSET_SCALE_4
=
Sequences
.
arrayBuilder
(-
0.375
,
0.375
,
0.25
)
.
centered
()
.
build
();
/*
...
...
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