tMerge branch 'master' of github.com:anders-dc/SeaIce.jl - Granular.jl - Julia … | |
git clone git://src.adamsgaard.dk/Granular.jl | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit becce5fac380f92fcc830d87cf93264aba9bdc69 | |
parent 7852ca2fa0228f850f90d5a4ccc256149ec55e40 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 22 Jun 2017 11:17:11 -0400 | |
Merge branch 'master' of github.com:anders-dc/SeaIce.jl | |
Diffstat: | |
M test/profiling.jl | 13 ++++++++----- | |
1 file changed, 8 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/test/profiling.jl b/test/profiling.jl | |
t@@ -43,14 +43,17 @@ function timeSingleStepInDenseSimulation(nx::Int; verbose:… | |
fixed=fixed, verbose=false) | |
end | |
end | |
- info("number of ice floes: $(length(sim.ice_floes))") | |
+ print_with_color(:green, "number of ice floes: $(length(sim.ice_floes))\n") | |
if grid_sorting | |
- info("using cell-based spatial decomposition (ocean)") | |
if include_atmosphere | |
- info("using cell-based spatial decomposition (ocean + atmosphere)") | |
+ print_with_color(:green, "using cell-based spatial decomposition "… | |
+ " (ocean + atmosphere)\n") | |
+ else | |
+ print_with_color(:green, "using cell-based spatial " * | |
+ "decomposition (ocean)\n") | |
end | |
else | |
- info("using all-to-all contact search") | |
+ print_with_color(:green, "using all-to-all contact search\n") | |
end | |
SeaIce.setTotalTime!(sim, 1.0) | |
t@@ -86,7 +89,7 @@ function timeSingleStepInDenseSimulation(nx::Int; verbose::B… | |
end | |
#nx = Int[4 8 16 32 64 96] | |
-nx = round(logspace(1, 2, 16)) | |
+nx = round.(logspace(1, 2, 16)) | |
elements = zeros(length(nx)) | |
t_elapsed = zeros(length(nx)) | |
t_elapsed_all_to_all = zeros(length(nx)) |