Granular.jl

commit 58d2643f7f6bcd6849152cb030481aefa724e57a
parent 66d9f3e3d75e83a0d4550bdfeb7f7e7f127cd341
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Mon,  1 May 2017 16:15:24 -0400

shorten distance between fixed ice floes in side walls

Diffstat:
M
examples/nares_strait.jl
 | 
5
++---

1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/examples/nares_strait.jl b/examples/nares_strait.jl
@@ -15,20 +15,19 @@ sim.ocean = SeaIce.createRegularOceanGrid(n, L, name="poiseuille_flow")
 sim.ocean.v[:, :, 1, 1] = 1e-8*((sim.ocean.xq - Lx/2.).^2 - Lx^2./4.)
 
 # Initialize confining walls, which are ice floes that are fixed in space
-#r = .5e3
 r = minimum(L[1:2]/n[1:2])/2.
 h = 1.
 
 ## N-S segments
 for y in linspace((L[2] - Ly_constriction)/2.,
                   Ly_constriction + (L[2] - Ly_constriction)/2., 
-                  Int(floor(Ly_constriction/(r*2))))
+                  Int(round(Ly_constriction/(r*2))))
     SeaIce.addIceFloeCylindrical(sim, [(Lx - Lx_constriction)/2., y], r, h, 
                                  fixed=true, verbose=false)
 end
 for y in linspace((L[2] - Ly_constriction)/2.,
                   Ly_constriction + (L[2] - Ly_constriction)/2., 
-                  Int(floor(Ly_constriction/(r*2))))
+                  Int(round(Ly_constriction/(r*2))))
     SeaIce.addIceFloeCylindrical(sim,
                                  [Lx_constriction + (L[1] - Lx_constriction)/2., 
                                   y], r, h, fixed=true, verbose=false)