tFix Julia 0.7 deprecation warning in irregular packing routine - Granular.jl -… | |
git clone git://src.adamsgaard.dk/Granular.jl | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit ccaa91b1ef4cffd09d039b5f5a2ee5d7c6f93273 | |
parent ea2796081adee6a056d0df05fba1ec0163ddcf0c | |
Author: Anders Damsgaard <[email protected]> | |
Date: Wed, 3 Jan 2018 10:44:32 -0500 | |
Fix Julia 0.7 deprecation warning in irregular packing routine | |
Diffstat: | |
M src/packing.jl | 3 ++- | |
1 file changed, 2 insertions(+), 1 deletion(-) | |
--- | |
diff --git a/src/packing.jl b/src/packing.jl | |
t@@ -137,6 +137,7 @@ function irregularPacking!(simulation::Simulation; | |
srand(seed) | |
active_list = Int[] # list of points to originate search from | |
+ i = 0 | |
# Step 0: Use existing `grid` (ocean or atmosphere) for contact search | |
if typeof(simulation.ocean.input_file) != Bool | |
t@@ -176,7 +177,7 @@ function irregularPacking!(simulation::Simulation; | |
# point is adequately far from existing samples, emit it as the next sample | |
# and add it to the active list. If after `sample_limit` attempts no such | |
# point is found, instead remove `i` from the active list. | |
- i = 0; j = 0; | |
+ j = 0; | |
x_active = zeros(2); x_candidate = zeros(2); | |
r_active = 0.; r_candidate = 0.; T = 0. | |
n = 0 |