 |
tdisable ice floes outside grid - Granular.jl - Julia package for granular dyna… |
 |
git clone git://src.adamsgaard.dk/Granular.jl |
 |
Log |
|
Files |
|
Refs |
|
README |
|
LICENSE |
|
--- |
|
commit 764f9a160974b94ffec0b0572a0bcdc2cbc49336 |
|
parent 123a1615b1ad0448e9392e31f54a0f857a19f415 |
|
Author: Anders Damsgaard <[email protected]> |
|
Date: Mon, 1 May 2017 10:13:26 -0400 |
|
|
|
disable ice floes outside grid |
|
|
|
Diffstat: |
|
M src/grid.jl | 3 +-- |
|
M src/simulation.jl | 2 +- |
|
|
|
2 files changed, 2 insertions(+), 3 deletions(-) |
|
--- |
|
diff --git a/src/grid.jl b/src/grid.jl |
|
t@@ -52,8 +52,7 @@ function sortIceFloesInOceanGrid!(simulation::Simulation; ve… |
|
|
|
# remove ice floe if it is outside of the grid |
|
if i == 0 && j == 0 |
|
-export removeIceFloe! |
|
- |
|
+ disableIceFloe(simulation, idx) |
|
end |
|
|
|
# add cell to ice floe |
|
diff --git a/src/simulation.jl b/src/simulation.jl |
|
t@@ -168,7 +168,7 @@ function disableIceFloe!(simulation::Simulation, i::Intege… |
|
error("Index must be greater than 0 (i = $i)") |
|
end |
|
|
|
- simulation.ice_floes |
|
+ simulation.ice_floes[i].enable = false |
|
end |
|
|
|
export zeroForcesAndTorques! |
