Mercurial > repos > public > sbplib_julia

changeset 1145:4da66d6d7bed refactor/grids

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge bugfix/lazy_tensors/lazyfunctionarray
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 19 Oct 2022 23:14:00 +0200
parents cfe6a09974fb (diff) 6fd97b5ed3e5 (current diff)
children 31041ef8092a
files
diffstat 2 files changed, 50 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/src/Grids/equidistant_grid.jl	Wed Oct 19 23:11:59 2022 +0200
+++ b/src/Grids/equidistant_grid.jl	Wed Oct 19 23:14:00 2022 +0200
@@ -20,7 +20,6 @@
     end
 end
 
-
 """
     EquidistantGrid(size, limit_lower, limit_upper)
 
@@ -37,7 +36,7 @@
 function EquidistantGrid(size, limit_lower, limit_upper)
     return EquidistantGrid{length(size), eltype(limit_lower)}(size, limit_lower, limit_upper)
 end
-
+# TBD: Should it be an AbstractArray?
 
 """
     EquidistantGrid{T}()
@@ -64,6 +63,13 @@
 
 Base.ndims(::EquidistantGrid{Dim}) where Dim = Dim
 
+function Base.getindex(g::EquidistantGrid, I::Vararg{Int})
+    h = spacing(g)
+    return g.limit_lower .+ (I.-1).*h
+end
+
+Base.getindex(g::EquidistantGrid, I::CartesianIndex) = g[Tuple(I)...]
+# TBD: Can this method be removed if `EquidistantGrid` is an AbstractArray?
 
 
 
@@ -99,7 +105,6 @@
     return broadcast(I -> grid.limit_lower .+ (I.-1).*h, indices)
 end
 
-
 """
     restrict(::EquidistantGrid, dim)
 
--- a/test/Grids/equidistant_grid_test.jl	Wed Oct 19 23:11:59 2022 +0200
+++ b/test/Grids/equidistant_grid_test.jl	Wed Oct 19 23:14:00 2022 +0200
@@ -44,6 +44,18 @@
         end
     end
 
+    @testset "getindex" begin
+        g = EquidistantGrid((5,3), (-1.0,0.0), (0.0,7.11))
+        @test g[1,1] == (-1.0,0.0)
+        @test g[1,3] == (-1.0,7.11)
+        @test g[5,1] == (0.0,0.0)
+        @test g[5,3] == (0.0,7.11)
+
+        @test g[4,2] == (-0.25,7.11/2)
+
+        @test g[CartesianIndex(1,3)] == (-1.0,7.11)
+    end
+
     @testset "restrict" begin
         g = EquidistantGrid((5,3), (0.0,0.0), (2.0,1.0))
         @test restrict(g, 1) == EquidistantGrid(5,0.0,2.0)
@@ -69,36 +81,36 @@
     end
 
     @testset "boundary_grid" begin
-            @testset "1D" begin
-                g = EquidistantGrid(5,0.0,2.0)
-                (id_l, id_r) = boundary_identifiers(g)
-                @test boundary_grid(g,id_l) == EquidistantGrid{Float64}()
-                @test boundary_grid(g,id_r) == EquidistantGrid{Float64}()
-                @test_throws DomainError boundary_grid(g,CartesianBoundary{2,Lower}())
-                @test_throws DomainError boundary_grid(g,CartesianBoundary{0,Lower}())
-            end
-            @testset "2D" begin
-                g = EquidistantGrid((5,3),(0.0,0.0),(1.0,3.0))
-                (id_w, id_e, id_s, id_n) = boundary_identifiers(g)
-                @test boundary_grid(g,id_w) == restrict(g,2)
-                @test boundary_grid(g,id_e) == restrict(g,2)
-                @test boundary_grid(g,id_s) == restrict(g,1)
-                @test boundary_grid(g,id_n) == restrict(g,1)
-                @test_throws DomainError boundary_grid(g,CartesianBoundary{4,Lower}())
-            end
-            @testset "3D" begin
-                g = EquidistantGrid((2,5,3), (0.0,0.0,0.0), (2.0,1.0,3.0))
-                (id_w, id_e,
-                 id_s, id_n,
-                 id_t, id_b) = boundary_identifiers(g)
-                @test boundary_grid(g,id_w) == restrict(g,[2,3])
-                @test boundary_grid(g,id_e) == restrict(g,[2,3])
-                @test boundary_grid(g,id_s) == restrict(g,[1,3])
-                @test boundary_grid(g,id_n) == restrict(g,[1,3])
-                @test boundary_grid(g,id_t) == restrict(g,[1,2])
-                @test boundary_grid(g,id_b) == restrict(g,[1,2])
-                @test_throws DomainError boundary_grid(g,CartesianBoundary{4,Lower}())
-            end
+        @testset "1D" begin
+            g = EquidistantGrid(5,0.0,2.0)
+            (id_l, id_r) = boundary_identifiers(g)
+            @test boundary_grid(g,id_l) == EquidistantGrid{Float64}()
+            @test boundary_grid(g,id_r) == EquidistantGrid{Float64}()
+            @test_throws DomainError boundary_grid(g,CartesianBoundary{2,Lower}())
+            @test_throws DomainError boundary_grid(g,CartesianBoundary{0,Lower}())
+        end
+        @testset "2D" begin
+            g = EquidistantGrid((5,3),(0.0,0.0),(1.0,3.0))
+            (id_w, id_e, id_s, id_n) = boundary_identifiers(g)
+            @test boundary_grid(g,id_w) == restrict(g,2)
+            @test boundary_grid(g,id_e) == restrict(g,2)
+            @test boundary_grid(g,id_s) == restrict(g,1)
+            @test boundary_grid(g,id_n) == restrict(g,1)
+            @test_throws DomainError boundary_grid(g,CartesianBoundary{4,Lower}())
+        end
+        @testset "3D" begin
+            g = EquidistantGrid((2,5,3), (0.0,0.0,0.0), (2.0,1.0,3.0))
+            (id_w, id_e,
+             id_s, id_n,
+             id_t, id_b) = boundary_identifiers(g)
+            @test boundary_grid(g,id_w) == restrict(g,[2,3])
+            @test boundary_grid(g,id_e) == restrict(g,[2,3])
+            @test boundary_grid(g,id_s) == restrict(g,[1,3])
+            @test boundary_grid(g,id_n) == restrict(g,[1,3])
+            @test boundary_grid(g,id_t) == restrict(g,[1,2])
+            @test boundary_grid(g,id_b) == restrict(g,[1,2])
+            @test_throws DomainError boundary_grid(g,CartesianBoundary{4,Lower}())
+        end
     end
 
     @testset "refine" begin