Granular.jl

commit 2e88c8f814b4838ec6ec179feb6a565d46a7b155
parent fe6e958bbd175c28451ad9047efff6825c2d38b0
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Thu, 25 May 2017 11:08:17 -0400

fix minor syntax issues

Diffstat:
M
src/interaction.jl
 | 
5
++---
M
test/ocean.jl
 | 
4
++--

2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/interaction.jl b/src/interaction.jl
@@ -99,9 +99,8 @@ function interactIceFloes!(simulation::Simulation, i::Int, j::Int, ic::Int)
         k_n = harmonicMean(simulation.ice_floes[i].contact_stiffness_normal,
                          simulation.ice_floes[j].contact_stiffness_normal)
 
-        k_t =
-          harmonicMean(simulation.ice_floes[i].contact_stiffness_tangential,
-                       simulation.ice_floes[j].contact_stiffness_tangential)
+        k_t = harmonicMean(simulation.ice_floes[i].contact_stiffness_tangential,
+                           simulation.ice_floes[j].contact_stiffness_tangential)
     end
 
     γ_n = harmonicMean(simulation.ice_floes[i].contact_viscosity_normal,
diff --git a/test/ocean.jl b/test/ocean.jl
@@ -52,7 +52,7 @@ E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_rot_init ≈ E_kin_rot_final  # no rotation before or after
 @test E_kin_lin_init < E_kin_lin_final  # linear vel. gained due to ocean drag
 
-info("Testing vortex interaction between (static ocean)")
+info("Testing vortex interaction (static ocean)")
 sim = deepcopy(sim_init)
 sim.ice_floes[1].ang_vel = 0.1
 E_kin_lin_init = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
@@ -65,7 +65,7 @@ E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test sim.ice_floes[1].ang_pos > 0.     # check angular position orientation
 @test E_kin_lin_init ≈ E_kin_lin_final  # no linear velocity gained
 
-info("Testing vortex interaction between (static ice floe)")
+info("Testing vortex interaction (static ice floe)")
 sim = deepcopy(sim_init)
 sim.ocean = SeaIce.createRegularOceanGrid([1, 1, 1], [1., 1., 1.])
 sim.ice_floes[1].lin_pos[1] = 0.5