Skip to content
Snippets Groups Projects
Commit 60340322 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

Merge branch 'grid-smoothing' into 'main'

Grid smoothing fix

See merge request !248
parents ea4932f3 f263d7e0
No related branches found
No related tags found
1 merge request!248Grid smoothing fix
Pipeline #114326 passed
...@@ -62,7 +62,7 @@ javadoc { ...@@ -62,7 +62,7 @@ javadoc {
// model parsing classes; TODO remove when parser is stable // model parsing classes; TODO remove when parser is stable
task fatJar(type: Jar) { task fatJar(type: Jar) {
from { 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) } configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
} }
with jar with jar
......
...@@ -1039,9 +1039,11 @@ public class GridRuptureSet extends AbstractRuptureSet<PointSource> { ...@@ -1039,9 +1039,11 @@ public class GridRuptureSet extends AbstractRuptureSet<PointSource> {
private static final int PRECISION = 5; private static final int PRECISION = 5;
private static final double[] OFFSET_SCALE_10 = Sequences private static final double[] OFFSET_SCALE_10 = Sequences
.arrayBuilder(-0.45, 0.45, 0.1) .arrayBuilder(-0.45, 0.45, 0.1)
.centered()
.build(); .build();
private static final double[] OFFSET_SCALE_4 = Sequences private static final double[] OFFSET_SCALE_4 = Sequences
.arrayBuilder(-0.375, 0.375, 0.25) .arrayBuilder(-0.375, 0.375, 0.25)
.centered()
.build(); .build();
/* /*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment