tload Base.Test into global namespace, remove superfluous module loads - Granul… | |
git clone git://src.adamsgaard.dk/Granular.jl | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit 23b5df397b0b3d2d7619da5e4672675bc3474e90 | |
parent 7738dd99c78168b534c9b206f1a84efdf2f9f112 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Fri, 21 Apr 2017 16:40:01 -0400 | |
load Base.Test into global namespace, remove superfluous module loads | |
Diffstat: | |
M test/collision-2floes-normal.jl | 27 ++++++++++++--------------- | |
M test/contact-search-and-geometry.jl | 32 +++++++++++++++--------------… | |
M test/netcdf.jl | 3 --- | |
M test/runtests.jl | 2 +- | |
4 files changed, 28 insertions(+), 36 deletions(-) | |
--- | |
diff --git a/test/collision-2floes-normal.jl b/test/collision-2floes-normal.jl | |
t@@ -3,9 +3,6 @@ | |
# Check for conservation of kinetic energy (=momentum) during a normal collisi… | |
# between two ice cylindrical ice floes | |
-import Base.Test | |
-import SeaIce | |
- | |
info("#### $(basename(@__FILE__)) ####") | |
verbose=false | |
t@@ -34,8 +31,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylo… | |
E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim) | |
E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim) | |
-Base.Test.@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol | |
-Base.Test.@test_approx_eq E_kin_rot_init E_kin_rot_final | |
+@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 | |
info("Testing kinetic energy conservation with Two-term Taylor scheme") | |
t@@ -47,8 +44,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylo… | |
E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim) | |
E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim) | |
-Base.Test.@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol | |
-Base.Test.@test_approx_eq E_kin_rot_init E_kin_rot_final | |
+@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 | |
info("Testing kinetic energy conservation with Three-term Taylor scheme") | |
t@@ -61,8 +58,8 @@ SeaIce.run!(sim, temporal_integration_method="Three-term Tay… | |
E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim) | |
E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim) | |
-Base.Test.@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol | |
-Base.Test.@test_approx_eq E_kin_rot_init E_kin_rot_final | |
+@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 | |
info("# Ice floes free to move") | |
t@@ -89,8 +86,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Taylo… | |
E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim) | |
E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim) | |
-Base.Test.@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol | |
-Base.Test.@test_approx_eq E_kin_rot_init E_kin_rot_final | |
+@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 | |
info("Testing kinetic energy conservation with Two-term Taylor scheme") | |
t@@ -102,8 +99,8 @@ SeaIce.run!(sim, temporal_integration_method="Two-term Tayl… | |
E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim) | |
E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim) | |
-Base.Test.@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol | |
-Base.Test.@test_approx_eq E_kin_rot_init E_kin_rot_final | |
+@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 | |
info("Testing kinetic energy conservation with Three-term Taylor scheme") | |
t@@ -116,5 +113,5 @@ SeaIce.run!(sim, temporal_integration_method="Three-term T… | |
E_kin_lin_final = SeaIce.totalIceFloeKineticTranslationalEnergy(sim) | |
E_kin_rot_final = SeaIce.totalIceFloeKineticRotationalEnergy(sim) | |
-Base.Test.@test_approx_eq_eps E_kin_lin_init E_kin_lin_final E_kin_lin_init*tol | |
-Base.Test.@test_approx_eq E_kin_rot_init E_kin_rot_final | |
+@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 | |
diff --git a/test/contact-search-and-geometry.jl b/test/contact-search-and-geom… | |
t@@ -1,8 +1,6 @@ | |
#!/usr/bin/env julia | |
# Check the contact search and geometry of a two-particle interaction | |
-import Base.Test | |
-import SeaIce | |
info("#### $(basename(@__FILE__)) ####") | |
t@@ -14,30 +12,30 @@ SeaIce.addIceFloeCylindrical(sim, [18., 0.], 10., 1., verb… | |
position_ij = SeaIce.interIceFloePositionVector(sim, 1, 2) | |
overlap_ij = SeaIce.findOverlap(sim, 1, 2, position_ij) | |
-Base.Test.@test_approx_eq [18., 0.] position_ij | |
-Base.Test.@test_approx_eq -2. overlap_ij | |
+@test_approx_eq [18., 0.] position_ij | |
+@test_approx_eq -2. overlap_ij | |
info("Testing findContactsAllToAll(...)") | |
sim_copy = deepcopy(sim) | |
SeaIce.findContactsAllToAll!(sim) | |
-Base.Test.@test 1 == length(sim.overlaps) | |
-Base.Test.@test 1 == length(sim.contact_pairs) | |
-Base.Test.@test_approx_eq [1, 2] sim.contact_pairs[1] | |
-Base.Test.@test_approx_eq [-2., 0.] sim.overlaps[1] | |
+@test 1 == length(sim.overlaps) | |
+@test 1 == length(sim.contact_pairs) | |
+@test_approx_eq [1, 2] sim.contact_pairs[1] | |
+@test_approx_eq [-2., 0.] sim.overlaps[1] | |
info("Testing findContacts(...)") | |
sim = deepcopy(sim_copy) | |
SeaIce.findContacts!(sim) | |
-Base.Test.@test 1 == length(sim.overlaps) | |
-Base.Test.@test 1 == length(sim.contact_pairs) | |
-Base.Test.@test_approx_eq [1, 2] sim.contact_pairs[1] | |
-Base.Test.@test_approx_eq [-2., 0.] sim.overlaps[1] | |
+@test 1 == length(sim.overlaps) | |
+@test 1 == length(sim.contact_pairs) | |
+@test_approx_eq [1, 2] sim.contact_pairs[1] | |
+@test_approx_eq [-2., 0.] sim.overlaps[1] | |
-Base.Test.@test_throws ErrorException SeaIce.findContacts!(sim, method="") | |
+@test_throws ErrorException SeaIce.findContacts!(sim, method="") | |
info("Testing if interact(...) removes contacts correctly") | |
t@@ -46,7 +44,7 @@ SeaIce.findContacts!(sim) | |
SeaIce.interact!(sim) | |
SeaIce.findContacts!(sim) | |
-Base.Test.@test 1 == length(sim.overlaps) | |
-Base.Test.@test 1 == length(sim.contact_pairs) | |
-Base.Test.@test_approx_eq [1, 2] sim.contact_pairs[1] | |
-Base.Test.@test_approx_eq [-2., 0.] sim.overlaps[1] | |
+@test 1 == length(sim.overlaps) | |
+@test 1 == length(sim.contact_pairs) | |
+@test_approx_eq [1, 2] sim.contact_pairs[1] | |
+@test_approx_eq [-2., 0.] sim.overlaps[1] | |
diff --git a/test/netcdf.jl b/test/netcdf.jl | |
t@@ -2,9 +2,6 @@ | |
# Check if NetCDF files are read correctly from the disk. | |
-import Base.Test | |
-import SeaIce | |
- | |
info("#### $(basename(@__FILE__)) ####") | |
info("Testing dimensions of content read from prog__0001_006.nc") | |
diff --git a/test/runtests.jl b/test/runtests.jl | |
t@@ -1,4 +1,4 @@ | |
-using SeaIce | |
+import SeaIce | |
using Base.Test | |
include("contact-search-and-geometry.jl") |