Granular.jl

commit 7852ca2fa0228f850f90d5a4ccc256149ec55e40
parent 1a252984bd7ca482cc02cdcb7dd52b5a066b670c
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Thu, 22 Jun 2017 10:43:01 -0400

fix deprecation warning in convertIceFloeDataToArrays

Diffstat:
M
src/icefloe.jl
 | 
68
++++++++++++++++++++++++++++++++++----------------------------------

1 file changed, 34 insertions(+), 34 deletions(-)
diff --git a/src/icefloe.jl b/src/icefloe.jl
@@ -201,17 +201,17 @@ arrays in an `IceFloeArrays` structure.
 function convertIceFloeDataToArrays(simulation::Simulation)
 
     ifarr = IceFloeArrays(
-                          Array(Float64, length(simulation.ice_floes)),
-
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
 
                           zeros(Float64, 3, length(simulation.ice_floes)),
                           zeros(Float64, 3, length(simulation.ice_floes)),
@@ -223,29 +223,29 @@ function convertIceFloeDataToArrays(simulation::Simulation)
                           zeros(Float64, 3, length(simulation.ice_floes)),
                           zeros(Float64, 3, length(simulation.ice_floes)),
 
-                          Array(Int, length(simulation.ice_floes)),
-                          Array(Int, length(simulation.ice_floes)),
-                          Array(Int, length(simulation.ice_floes)),
-
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Float64, length(simulation.ice_floes)),
-
-                          Array(Float64, length(simulation.ice_floes)),
-                          Array(Int, length(simulation.ice_floes)),
+                          Array{Int}(length(simulation.ice_floes)),
+                          Array{Int}(length(simulation.ice_floes)),
+                          Array{Int}(length(simulation.ice_floes)),
+
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Float64}(length(simulation.ice_floes)),
+
+                          Array{Float64}(length(simulation.ice_floes)),
+                          Array{Int}(length(simulation.ice_floes)),
 
                           zeros(Float64, 3, length(simulation.ice_floes)),
                           zeros(Float64, 3, length(simulation.ice_floes)),