tuse String conversion conforming to Julia 0.7 standard - Granular.jl - Julia package for granular dynamics simulation
(HTM) git clone git://src.adamsgaard.dk/Granular.jl
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 6ea156c479fc26d60eceede529de2a57d7e0ca97
(DIR) parent 4f11bab89cc1f59db939100f8919bd40259c357d
(HTM) Author: Anders Damsgaard <andersd@riseup.net>
Date: Thu, 9 Nov 2017 11:24:35 -0600
use String conversion conforming to Julia 0.7 standard
Diffstat:
M test/grid-boundaries.jl | 12 ++++++------
M test/ocean.jl | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
---
(DIR) diff --git a/test/grid-boundaries.jl b/test/grid-boundaries.jl
t@@ -19,7 +19,7 @@ const originalSTDOUT = STDOUT
Granular.reportGridBoundaryConditions(ocean)
close(out_w)
redirect_stdout(originalSTDOUT)
-output = convert(String, readavailable(out_r))
+output = String(readavailable(out_r))
@test output == """West (-x): inactive\t(1)
East (+x): inactive\t(1)
South (-y): inactive\t(1)
t@@ -30,7 +30,7 @@ North (+y): inactive\t(1)
Granular.setGridBoundaryConditions!(ocean, "periodic", "south, west", verbose=true)
close(out_w)
redirect_stdout(originalSTDOUT)
-output = convert(String, readavailable(out_r))
+output = String(readavailable(out_r))
@test output == """West (-x): periodic\t(2)
East (+x): inactive\t(1)
South (-y): periodic\t(2)
t@@ -45,7 +45,7 @@ North (+y): inactive\t(1)
Granular.setGridBoundaryConditions!(ocean, "inactive", "all", verbose=false)
close(out_w)
redirect_stdout(originalSTDOUT)
-output = convert(String, readavailable(out_r))
+output = String(readavailable(out_r))
@test output == ""
@test ocean.bc_west == 1
@test ocean.bc_east == 1
t@@ -55,7 +55,7 @@ output = convert(String, readavailable(out_r))
(out_r, out_w) = redirect_stdout()
Granular.setGridBoundaryConditions!(ocean, "periodic", "all")
close(out_w)
-output = convert(String, readavailable(out_r))
+output = String(readavailable(out_r))
redirect_stdout(originalSTDOUT)
@test output == """West (-x): periodic\t(2)
East (+x): periodic\t(2)
t@@ -70,7 +70,7 @@ North (+y): periodic\t(2)
(out_r, out_w) = redirect_stdout()
Granular.setGridBoundaryConditions!(ocean, "inactive")
close(out_w)
-output = convert(String, readavailable(out_r))
+output = String(readavailable(out_r))
redirect_stdout(originalSTDOUT)
@test output == """West (-x): inactive\t(1)
East (+x): inactive\t(1)
t@@ -85,7 +85,7 @@ North (+y): inactive\t(1)
(out_r, out_w) = redirect_stdout()
Granular.setGridBoundaryConditions!(ocean, "periodic")
close(out_w)
-output = convert(String, readavailable(out_r))
+output = String(readavailable(out_r))
redirect_stdout(originalSTDOUT)
@test output == """West (-x): periodic\t(2)
East (+x): periodic\t(2)
(DIR) diff --git a/test/ocean.jl b/test/ocean.jl
t@@ -13,11 +13,11 @@ sim.ocean = Granular.createRegularOceanGrid([6, 6, 6], [1., 1., 1.])
@test size(sim.ocean.xh) == (6, 6)
@test size(sim.ocean.yh) == (6, 6)
@test sim.ocean.xq[1, :, 1] ≈ zeros(7)
-@test sim.ocean.xq[4, :, 1] ≈ .5*ones(7)
-@test sim.ocean.xq[end, :, 1] ≈ 1.*ones(7)
+@test sim.ocean.xq[4, :, 1] ≈ .5 * ones(7)
+@test sim.ocean.xq[end, :, 1] ≈ 1. * ones(7)
@test sim.ocean.yq[:, 1, 1] ≈ zeros(7)
-@test sim.ocean.yq[:, 4, 1] ≈ .5*ones(7)
-@test sim.ocean.yq[:, end, 1] ≈ 1.*ones(7)
+@test sim.ocean.yq[:, 4, 1] ≈ .5 * ones(7)
+@test sim.ocean.yq[:, end, 1] ≈ 1. * ones(7)
@test size(sim.ocean.u) == (7, 7, 6, 1)
@test size(sim.ocean.v) == (7, 7, 6, 1)
@test size(sim.ocean.h) == (7, 7, 6, 1)