tadd missing continue statement, remove debug output - Granular.jl - Julia package for granular dynamics simulation
(HTM) git clone git://src.adamsgaard.dk/Granular.jl
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 117f20b43c96d91a227055edfc60116226cb0171
(DIR) parent 6204c8ac361eeb4c3bee652eac20975622c7bd71
(HTM) Author: Anders Damsgaard <andersd@riseup.net>
Date: Mon, 1 May 2017 13:57:20 -0400
add missing continue statement, remove debug output
Diffstat:
M src/contact_search.jl | 1 +
M test/contact-search-and-geometry.jl | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
---
(DIR) diff --git a/src/contact_search.jl b/src/contact_search.jl
t@@ -112,6 +112,7 @@ function findContactsOceanGrid!(simulation::Simulation)
simulation.ice_floes[idx_j].fixed) ||
!simulation.ice_floes[idx_i].enabled ||
!simulation.ice_floes[idx_j].enabled
+ continue
end
# Inter-grain position vector and grain overlap
(DIR) diff --git a/test/contact-search-and-geometry.jl b/test/contact-search-and-geometry.jl
t@@ -92,7 +92,6 @@ sim = deepcopy(sim_copy)
sim.ocean = SeaIce.createRegularOceanGrid([4, 4, 2], [80., 80., 2.])
sim.ice_floes[1].fixed = true
sim.ice_floes[2].fixed = true
-println(length(sim.ice_floes))
SeaIce.sortIceFloesInOceanGrid!(sim)
SeaIce.findContactsOceanGrid!(sim)