Skip to content

Commit b230c36

Browse files
committed
testdx/textdy/testdz works on cpu and gpu
1 parent 36f2054 commit b230c36

File tree

1 file changed

+24
-6
lines changed

1 file changed

+24
-6
lines changed

test/test_grid.jl

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,39 @@ testny(g, ny) = isapprox(g.ny, ny)
33
testnz(g, nz) = isapprox(g.nz, nz)
44

55
# Physical grid tests
6-
function testdx(g::Union{OneDGrid{T,A}, TwoDGrid{T,A}, ThreeDGrid{T,A}}) where {T, A}
6+
function testdx(g::Union{OneDGrid{T,<:Array}, TwoDGrid{T,<:Array}, ThreeDGrid{T,<:Array}}) where T
77
dxgrid = @. g.x[2:end] - g.x[1:end-1]
8-
dxones = A(g.dx*ones(T, size(dxgrid)))
8+
dxones = g.dx*ones(T, size(dxgrid))
99
isapprox(dxgrid, dxones)
1010
end
1111

12-
function testdy(g::Union{TwoDGrid{T,A}, ThreeDGrid{T,A}}) where {T, A}
12+
function testdy(g::Union{TwoDGrid{T,<:Array}, ThreeDGrid{T,<:Array}}) where T
1313
dygrid = @. g.y[2:end] - g.y[1:end-1]
14-
dyones = A(g.dy*ones(T, size(dygrid)))
14+
dyones = g.dy*ones(T, size(dygrid))
1515
isapprox(dygrid, dyones)
1616
end
1717

18-
function testdz(g::ThreeDGrid{T,A}) where {T, A}
18+
function testdz(g::ThreeDGrid{T,<:Array}) where T
1919
dzgrid = @. g.z[2:end] - g.z[1:end-1]
20-
dzones = A(g.dz*ones(T, size(dzgrid)))
20+
dzones = g.dz*ones(T, size(dzgrid))
21+
isapprox(dzgrid, dzones)
22+
end
23+
24+
function testdx(g::Union{OneDGrid{T,<:CuArray}, TwoDGrid{T,<:CuArray}, ThreeDGrid{T,<:CuArray}}) where T
25+
dxgrid = @. g.x[2:end] - g.x[1:end-1]
26+
dxones = CuArray(g.dx*ones(T, size(dxgrid)))
27+
isapprox(dxgrid, dxones)
28+
end
29+
30+
function testdy(g::Union{TwoDGrid{T,<:CuArray}, ThreeDGrid{T,<:CuArray}}) where T
31+
dygrid = @. g.y[2:end] - g.y[1:end-1]
32+
dyones = CuArray(g.dy*ones(T, size(dygrid)))
33+
isapprox(dygrid, dyones)
34+
end
35+
36+
function testdz(g::ThreeDGrid{T,<:CuArray}) where T
37+
dzgrid = @. g.z[2:end] - g.z[1:end-1]
38+
dzones = CuArray(g.dz*ones(T, size(dzgrid)))
2139
isapprox(dzgrid, dzones)
2240
end
2341

0 commit comments

Comments
 (0)