Granular.jl

commit db2bf7ae4d13aeddc44c8200e475cd3eb1059f1e
parent dec15a9e0cb198b20df8eaab444a6d03d2a1a80e
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Mon,  1 May 2017 10:36:15 -0400

avoid double reporting of current time

Diffstat:
M
examples/nares_strait.jl
 | 
3
+++
M
src/simulation.jl
 | 
6
------

2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/examples/nares_strait.jl b/examples/nares_strait.jl
@@ -117,6 +117,9 @@ while sim.time < sim.time_total
     end
     for i=1:size(sim.ocean.xh, 1)
         if sim.ocean.ice_floe_list[i, end] == []
+            x, y = SeaIce.getCellCenterCoordinates(sim.ocean, i, j)
+            x += noise_amplitude*(0.5 - Base.Random.rand())
+            y += noise_amplitude*(0.5 - Base.Random.rand())
             SeaIce.addIceFloeCylindrical(sim, [x, y], r, h, verbose=false)
         end
     end
diff --git a/src/simulation.jl b/src/simulation.jl
@@ -88,9 +88,6 @@ function run!(simulation::Simulation;
     end
 
     checkTimeParameters(simulation)
-    if simulation.file_time_step > 0.0
-        writeVTK(simulation, verbose=show_file_output)
-    end
 
     time_since_output_file = 0.0
 
@@ -126,9 +123,6 @@ function run!(simulation::Simulation;
         time_since_output_file = time_since_output_file + simulation.time_step
 
         if single_step
-            if verbose
-                println("Current time: ", simulation.time)
-            end
             return
         end
     end