Mercurial > repos > public > sbplib_julia

changeset 1570:063a2bfb03da feature/grids/curvilinear

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bugs in calls to equidistant_grid after merge with default
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 25 Apr 2024 13:57:42 +0200
parents 5d32ecb98db8
children c2620118f110 64452a678e7a
files src/Grids/mapped_grid.jl test/Grids/mapped_grid_test.jl
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/Grids/mapped_grid.jl	Thu Apr 25 09:03:04 2024 +0200
+++ b/src/Grids/mapped_grid.jl	Thu Apr 25 13:57:42 2024 +0200
@@ -53,7 +53,7 @@
 
 function mapped_grid(x, J, size...)
     D = length(size)
-    lg = equidistant_grid(size, ntuple(i->0., D), ntuple(i->1., D))
+    lg = equidistant_grid(ntuple(i->0., D), ntuple(i->1., D), size...)
     return MappedGrid(
         lg,
         map(x,lg),
--- a/test/Grids/mapped_grid_test.jl	Thu Apr 25 09:03:04 2024 +0200
+++ b/test/Grids/mapped_grid_test.jl	Thu Apr 25 13:57:42 2024 +0200
@@ -4,7 +4,7 @@
 using StaticArrays
 
 @testset "MappedGrid" begin
-    lg = equidistant_grid((11,11), (0,0), (1,1)) # TODO: Change dims of the grid to be different
+    lg = equidistant_grid((0,0), (1,1), 11, 11) # TODO: Change dims of the grid to be different
     x̄ = map(ξ̄ -> 2ξ̄, lg)
     J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
     mg = MappedGrid(lg, x̄, J)
@@ -64,7 +64,7 @@
 
     @testset "Iterator interface" begin
         sg = MappedGrid(
-            equidistant_grid((15,11), (0,0), (1,1)),
+            equidistant_grid((0,0), (1,1), 15, 11),
             map(ξ̄ -> @SArray[ξ̄[1], ξ̄[2], -ξ̄[1]], lg), rand(SMatrix{2,3,Float64},15,11)
         )
 
@@ -180,7 +180,7 @@
     mg = mapped_grid(x̄, J, 10, 11)
     @test mg isa MappedGrid{SVector{2,Float64}, 2}
 
-    lg = equidistant_grid((10,11), (0,0), (1,1))
+    lg = equidistant_grid((0,0), (1,1), 10, 11)
     @test logicalgrid(mg) == lg
     @test collect(mg) == map(x̄, lg)
 end