Mercurial > repos > public > sbplib_julia

annotate test/Grids/mapped_grid_test.jl @ 1688:72776d3d5fd6 feature/grids/curvilinear

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add min_spacing for 2D mapped grids
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 22 Aug 2024 08:14:04 +0200
parents 22a9992471be
children e11b5b6940a2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1426
9c689a627244 Add src and test file for curvilinear grid type
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
1 using Sbplib.Grids
1451
2e08f3444354 Implement boundary_identifiers, and a wishful implementation of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1450
diff changeset
2 using Sbplib.RegionIndices
1426
9c689a627244 Add src and test file for curvilinear grid type
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
3 using Test
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
4 using StaticArrays
1688
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
5 using LinearAlgebra
1426
9c689a627244 Add src and test file for curvilinear grid type
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
6
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
7 @testset "MappedGrid" begin
1570
063a2bfb03da Fix bugs in calls to equidistant_grid after merge with default
Jonatan Werpers <jonatan@werpers.com>
parents: 1560
diff changeset
8 lg = equidistant_grid((0,0), (1,1), 11, 11) # TODO: Change dims of the grid to be different
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
9 x̄ = map(ξ̄ -> 2ξ̄, lg)
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
10 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
11 mg = MappedGrid(lg, x̄, J)
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
12
1434
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
13 # TODO: Test constructor for different dims of range and domain for the coordinates
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
14 # TODO: Test constructor with different type than TensorGrid. a dummy type?
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
15
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
16 @test_broken false # @test_throws ArgumentError("Sizes must match") MappedGrid(lg, map(ξ̄ -> @SArray[ξ̄[1], ξ̄[2], -ξ̄[1]], lg), rand(SMatrix{2,3,Float64},15,11))
1434
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
17
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
18
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
19 @test mg isa Grid{SVector{2, Float64},2}
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
20
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
21 @test jacobian(mg) isa Array{<:AbstractMatrix}
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
22 @test logicalgrid(mg) isa Grid
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
23
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
24 @testset "Indexing Interface" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
25 mg = MappedGrid(lg, x̄, J)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
26 @test mg[1,1] == [0.0, 0.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
27 @test mg[4,2] == [0.6, 0.2]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
28 @test mg[6,10] == [1., 1.8]
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
29
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
30 @test mg[begin, begin] == [0.0, 0.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
31 @test mg[end,end] == [2.0, 2.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
32 @test mg[begin,end] == [0., 2.]
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
33
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
34 @test eachindex(mg) == CartesianIndices((11,11))
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
35
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
36 @testset "cartesian indexing" begin
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
37 cases = [
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
38 (1,1) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
39 (3,5) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
40 (10,6),
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
41 (1,1) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
42 (3,2) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
43 ]
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
44
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
45 @testset "i = $is" for (lg, is) ∈ cases
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
46 @test mg[CartesianIndex(is...)] == mg[is...]
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
47 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
48 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
49
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
50 @testset "eachindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
51 @test eachindex(mg) == CartesianIndices((11,11))
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
52 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
53
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
54 @testset "firstindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
55 @test firstindex(mg, 1) == 1
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
56 @test firstindex(mg, 2) == 1
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
57 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
58
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
59 @testset "lastindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
60 @test lastindex(mg, 1) == 11
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
61 @test lastindex(mg, 2) == 11
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
62 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
63 end
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
64 # TODO: Test with different types of logical grids
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
65
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
66 @testset "Iterator interface" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
67 sg = MappedGrid(
1570
063a2bfb03da Fix bugs in calls to equidistant_grid after merge with default
Jonatan Werpers <jonatan@werpers.com>
parents: 1560
diff changeset
68 equidistant_grid((0,0), (1,1), 15, 11),
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
69 map(ξ̄ -> @SArray[ξ̄[1], ξ̄[2], -ξ̄[1]], lg), rand(SMatrix{2,3,Float64},15,11)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
70 )
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
71
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
72 @test eltype(mg) == SVector{2,Float64}
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
73 @test eltype(sg) == SVector{3,Float64}
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
74
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
75 @test eltype(typeof(mg)) == SVector{2,Float64}
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
76 @test eltype(typeof(sg)) == SVector{3,Float64}
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
77
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
78 @test size(mg) == (11,11)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
79 @test size(sg) == (15,11)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
80
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
81 @test size(mg,2) == 11
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
82 @test size(sg,2) == 11
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
83
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
84 @test length(mg) == 121
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
85 @test length(sg) == 165
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
86
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
87 @test Base.IteratorSize(mg) == Base.HasShape{2}()
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
88 @test Base.IteratorSize(typeof(mg)) == Base.HasShape{2}()
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
89
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
90 @test Base.IteratorSize(sg) == Base.HasShape{2}()
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
91 @test Base.IteratorSize(typeof(sg)) == Base.HasShape{2}()
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
92
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
93 element, state = iterate(mg)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
94 @test element == lg[1,1].*2
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
95 element, _ = iterate(mg, state)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
96 @test element == lg[2,1].*2
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
97
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
98 element, state = iterate(sg)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
99 @test element == sg.physicalcoordinates[1,1]
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
100 element, _ = iterate(sg, state)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
101 @test element == sg.physicalcoordinates[2,1]
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
102
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
103 @test collect(mg) == 2 .* lg
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
104 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
105
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
106 @testset "Base" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
107 @test ndims(mg) == 2
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
108 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
109
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
110 @testset "boundary_identifiers" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
111 @test boundary_identifiers(mg) == boundary_identifiers(lg)
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
112 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
113
1493
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
114 @testset "boundary_indices" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
115 @test boundary_indices(mg, CartesianBoundary{1,Lower}()) == boundary_indices(lg,CartesianBoundary{1,Lower}())
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
116 @test boundary_indices(mg, CartesianBoundary{2,Lower}()) == boundary_indices(lg,CartesianBoundary{2,Lower}())
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
117 @test boundary_indices(mg, CartesianBoundary{1,Upper}()) == boundary_indices(lg,CartesianBoundary{1,Upper}())
1493
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
118 end
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
119
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
120 @testset "boundary_grid" begin
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
121 x̄((ξ, η)) = @SVector[ξ, η*(1+ξ*(ξ-1))]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
122 J((ξ, η)) = @SMatrix[
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
123 1 0;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
124 η*(2ξ-1) 1+ξ*(ξ-1);
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
125 ]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
126
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
127 mg = mapped_grid(x̄, J, 10, 11)
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
128 J1((ξ, η)) = @SMatrix[
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
129 1 ;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
130 η*(2ξ-1);
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
131 ]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
132 J2((ξ, η)) = @SMatrix[
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
133 0;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
134 1+ξ*(ξ-1);
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
135 ]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
136
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
137 function test_boundary_grid(mg, bId, Jb)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
138 bg = boundary_grid(mg, bId)
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
139
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
140 lg = logicalgrid(mg)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
141 expected_bg = MappedGrid(
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
142 boundary_grid(lg, bId),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
143 map(x̄, boundary_grid(lg, bId)),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
144 map(Jb, boundary_grid(lg, bId)),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
145 )
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
146
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
147 @testset let bId=bId, bg=bg, expected_bg=expected_bg
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
148 @test collect(bg) == collect(expected_bg)
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
149 @test logicalgrid(bg) == logicalgrid(expected_bg)
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
150 @test jacobian(bg) == jacobian(expected_bg)
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
151 # TODO: Implement equality of a curvilinear grid and simlify the above
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
152 end
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
153 end
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
154
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
155 @testset test_boundary_grid(mg, TensorGridBoundary{1, Lower}(), J2)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
156 @testset test_boundary_grid(mg, TensorGridBoundary{1, Upper}(), J2)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
157 @testset test_boundary_grid(mg, TensorGridBoundary{2, Lower}(), J1)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
158 @testset test_boundary_grid(mg, TensorGridBoundary{2, Upper}(), J1)
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
159 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
160
1560
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
161 @testset "jacobian_determinant" begin
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
162 @test_broken false
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
163 end
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
164
1682
4ce9cb21220c Fix naming of metrix tensor functions
Jonatan Werpers <jonatan@werpers.com>
parents: 1659
diff changeset
165 @testset "metric_tensor" begin
1560
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
166 @test_broken false
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
167 end
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
168
1682
4ce9cb21220c Fix naming of metrix tensor functions
Jonatan Werpers <jonatan@werpers.com>
parents: 1659
diff changeset
169 @testset "metric_tensor_inverse" begin
1560
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
170 @test_broken false
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
171 end
5d32ecb98db8 Add functions for jacobian_determiant, geometric_tensor, geometric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1527
diff changeset
172
1684
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
173
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
174 @testset "min_spacing" begin
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
175 let g = mapped_grid(identity, x->@SMatrix[1], 11)
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
176 @test min_spacing(g) ≈ 0.1
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
177 end
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
178
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
179 let g = mapped_grid(x->x+x.^2/2, x->@SMatrix[1 .+ x], 11)
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
180 @test min_spacing(g) ≈ 0.105
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
181 end
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
182
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
183 let g = mapped_grid(x->x + x.*(1 .- x)/2, x->@SMatrix[1.5 .- x], 11)
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
184 @test min_spacing(g) ≈ 0.055
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
185 end
1688
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
186
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
187 let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,11)
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
188 @test min_spacing(g) ≈ 0.1
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
189 end
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
190
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
191 let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,21)
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
192 @test min_spacing(g) ≈ 0.05
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
193 end
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
194
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
195 skew_grid(a,b, sz...) = mapped_grid(ξ̄->ξ̄[1]*a + ξ̄[2]*b, ξ̄->[a b], sz...)
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
196
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
197 @testset let a = @SVector[1,0], b = @SVector[1,1]/√2
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
198 g = skew_grid(a,b,11,11)
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
199
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
200 @test min_spacing(g) ≈ 0.1*norm(b-a)
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
201 end
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
202
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
203 @testset let a = @SVector[1,0], b = @SVector[-1,1]/√2
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
204 g = skew_grid(a,b,11,11)
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
205
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
206 @test min_spacing(g) ≈ 0.1*norm(a+b)
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
207 end
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
208
72776d3d5fd6 Add min_spacing for 2D mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1684
diff changeset
209 # Skevt nät
1684
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
210 end
22a9992471be Add min_spacing for mapped 1d grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1682
diff changeset
211
1426
9c689a627244 Add src and test file for curvilinear grid type
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
212 end
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
213
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
214 @testset "mapped_grid" begin
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
215 x̄((ξ, η)) = @SVector[ξ, η*(1+ξ*(ξ-1))]
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
216 J((ξ, η)) = @SMatrix[
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
217 1 0;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
218 η*(2ξ-1) 1+ξ*(ξ-1);
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
219 ]
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
220 mg = mapped_grid(x̄, J, 10, 11)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
221 @test mg isa MappedGrid{SVector{2,Float64}, 2}
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
222
1570
063a2bfb03da Fix bugs in calls to equidistant_grid after merge with default
Jonatan Werpers <jonatan@werpers.com>
parents: 1560
diff changeset
223 lg = equidistant_grid((0,0), (1,1), 10, 11)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
224 @test logicalgrid(mg) == lg
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
225 @test collect(mg) == map(x̄, lg)
1659
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
226
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
227
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
228 @testset "normal" begin
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
229 @test normal(mg, CartesianBoundary{1,Lower}()) == fill(@SVector[-1,0], 11)
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
230 @test normal(mg, CartesianBoundary{1,Upper}()) == fill(@SVector[1,0], 11)
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
231 @test normal(mg, CartesianBoundary{2,Lower}()) == fill(@SVector[0,-1], 10)
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
232 @test normal(mg, CartesianBoundary{2,Upper}()) ≈ map(boundary_grid(mg,CartesianBoundary{2,Upper}())|>logicalgrid) do ξ̄
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
233 α = 1-2ξ̄[1]
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
234 @SVector[α,1]/√(α^2 + 1)
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
235 end
3bbcd496e021 Add function for computing the normal at the boundary of a mapped grid as a grid function
Jonatan Werpers <jonatan@werpers.com>
parents: 1570
diff changeset
236 end
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
237 end