Granular.jl

commit 71b3e39a5ed3f47997c736843d83c77b3d9e1a91
parent 87c38d3e836aa40f6c0c4e2d0a86b99c3d0f9d28
Author: Anders Damsgaard <andersd@riseup.net>
Date:   Thu, 22 Jun 2017 09:44:58 -0400

fix several deprecation warnings in julia 0.6

Diffstat:
M
test/collision-2floes-normal.jl
 | 
32
++++++++++++++++----------------
M
test/collision-2floes-oblique.jl
 | 
58
+++++++++++++++++++++++++++++-----------------------------
M
test/collision-5floes-normal.jl
 | 
32
++++++++++++++++----------------
M
test/contact-search-and-geometry.jl
 | 
4
++--

4 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/test/collision-2floes-normal.jl b/test/collision-2floes-normal.jl
@@ -31,8 +31,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
@@ -44,8 +44,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -58,8 +58,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("# Ice floes free to move")
@@ -86,8 +86,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
@@ -99,8 +99,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -113,8 +113,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("# Adding contact-normal viscosity")
@@ -147,7 +147,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -161,7 +161,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("# Ice floes free to move")
@@ -192,7 +192,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -206,4 +206,4 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
diff --git a/test/collision-2floes-oblique.jl b/test/collision-2floes-oblique.jl
@@ -35,8 +35,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
@@ -48,8 +48,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -61,8 +61,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor", verbose=verbos
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 info("# Ice floes free to move")
 
@@ -90,8 +90,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
@@ -103,8 +103,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -117,8 +117,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 
 info("## Contact-normal elasticity and tangential viscosity and friction")
@@ -143,7 +143,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 @test sim.ice_floes[2].ang_vel ≈ 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol
 
 info("mu_d = 0.")
 sim = deepcopy(sim_init)
@@ -161,8 +161,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 @test sim.ice_floes[2].ang_pos ≈ 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
 sim = deepcopy(sim_init)
@@ -178,7 +178,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 @test sim.ice_floes[2].ang_vel ≈ 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -195,7 +195,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 @test sim.ice_floes[2].ang_vel ≈ 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol
 
 info("# Ice floes free to move")
 
@@ -228,7 +228,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 @test sim.ice_floes[2].ang_vel < 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
 sim = deepcopy(sim_init)
@@ -240,7 +240,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -257,7 +257,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 @test sim.ice_floes[2].ang_vel < 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("# Ice floes free to move, mirrored")
@@ -291,7 +291,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 @test sim.ice_floes[2].ang_vel > 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
 sim = deepcopy(sim_init)
@@ -303,7 +303,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -320,7 +320,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 @test sim.ice_floes[2].ang_vel > 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("# Ice floes free to move, mirrored #2")
@@ -352,7 +352,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 @test sim.ice_floes[2].ang_vel < 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
 sim = deepcopy(sim_init)
@@ -364,7 +364,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -381,7 +381,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 @test sim.ice_floes[2].ang_vel < 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("# Tangential elasticity, no tangential viscosity, no Coulomb slip")
@@ -421,7 +421,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 @test sim.ice_floes[2].ang_vel < 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 info("Testing kinetic energy conservation with Two-term Taylor scheme")
 sim = deepcopy(sim_init)
@@ -433,7 +433,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("Testing kinetic energy conservation with Three-term Taylor scheme")
@@ -450,7 +450,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 @test sim.ice_floes[2].ang_vel < 0.
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init+E_kin_rot_init E_kin_lin_final+E_kin_rot_final E_kin_lin_init*tol 
+@test E_kin_lin_init+E_kin_rot_init ≈ E_kin_lin_final+E_kin_rot_final atol=E_kin_lin_init*tol 
 
 
 info("# Tangential elasticity, no tangential viscosity, Coulomb slip")
diff --git a/test/collision-5floes-normal.jl b/test/collision-5floes-normal.jl
@@ -37,8 +37,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 @test 0. < norm(sim.ice_floes[1].lin_vel)
 for i=2:5
     info("testing ice floe $i")
@@ -55,8 +55,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 @test 0. < norm(sim.ice_floes[1].lin_vel)
 for i=2:5
     info("testing ice floe $i")
@@ -74,8 +74,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 @test 0. < norm(sim.ice_floes[1].lin_vel)
 for i=2:5
     info("testing ice floe $i")
@@ -110,8 +110,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 for i=1:5
     info("testing ice floe $i")
     @test 0. < norm(sim.ice_floes[i].lin_vel)
@@ -127,8 +127,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 for i=1:5
     info("testing ice floe $i")
     @test 0. < norm(sim.ice_floes[i].lin_vel)
@@ -145,8 +145,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
-@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_lin_init ≈ E_kin_lin_final atol=E_kin_lin_init*tol
+@test E_kin_rot_init ≈ E_kin_rot_final
 for i=1:5
     info("testing ice floe $i")
     @test 0. < norm(sim.ice_floes[i].lin_vel)
@@ -192,7 +192,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
 @test 0. < norm(sim.ice_floes[1].lin_vel)
 for i=2:5
     info("testing ice floe $i")
@@ -211,7 +211,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
 @test 0. < norm(sim.ice_floes[1].lin_vel)
 for i=2:5
     info("testing ice floe $i")
@@ -253,7 +253,7 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylor", verbose=verbose)
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
 for i=1:5
     info("testing ice floe $i")
     @test 0. < norm(sim.ice_floes[i].lin_vel)
@@ -271,7 +271,7 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Taylor",
 E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim)
 E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim)
 @test E_kin_lin_init > E_kin_lin_final
-@test_approx_eq E_kin_rot_init E_kin_rot_final
+@test E_kin_rot_init ≈ E_kin_rot_final
 for i=1:5
     info("testing ice floe $i")
     @test 0. < norm(sim.ice_floes[i].lin_vel)
diff --git a/test/contact-search-and-geometry.jl b/test/contact-search-and-geometry.jl
@@ -12,8 +12,8 @@ SeaIce.addIceFloeCylindrical(sim, [18., 0.], 10., 1., verbose=false)
 position_ij = SeaIce.interIceFloePositionVector(sim, 1, 2)
 overlap_ij = SeaIce.findOverlap(sim, 1, 2, position_ij)
 
-@test_approx_eq [-18., 0.] position_ij
-@test_approx_eq -2. overlap_ij
+@test [-18., 0.] ≈ position_ij
+@test -2. ≈ overlap_ij
 
 
 info("Testing findContactsAllToAll(...)")