Mercurial > repos > public > sbplib_julia

annotate test/Grids/mapped_grid_test.jl @ 1705:4870fc3faa25 feature/grids/curvilinear

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add tests for equallity of mapped grids
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 04 Sep 2024 15:38:10 +0200
parents e5e76c8e52c5
children 11640aa3e348
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
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
7
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
8 _skew_mapping(a,b) = (ξ̄->ξ̄[1]*a + ξ̄[2]*b, ξ̄->[a b])
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
9
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
10 function _partially_curved_mapping()
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
11 x̄((ξ, η)) = @SVector[ξ, η*(1+ξ*(ξ-1))]
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
12 J((ξ, η)) = @SMatrix[
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
13 1 0;
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
14 η*(2ξ-1) 1+ξ*(ξ-1);
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
15 ]
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
16
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
17 return x̄, J
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
18 end
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
19
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
20 function _fully_curved_mapping()
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
21 x̄((ξ, η)) = @SVector[2ξ + η*(1-η), 3η+(1+η/2)*ξ^2]
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
22 J((ξ, η)) = @SMatrix[
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
23 2 1-2η;
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
24 (2+η)*ξ 3+1/2*ξ^2;
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
25 ]
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
26
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
27 return x̄, J
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
28 end
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
29
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
30 @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
31 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
32 x̄ = map(ξ̄ -> 2ξ̄, lg)
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
33 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
34 mg = MappedGrid(lg, x̄, J)
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
35
1434
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
36 # 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
37 # TODO: Test constructor with different type than TensorGrid. a dummy type?
1704
e5e76c8e52c5 Fix todos and add broken test for mapped_grid(::Grid,...)
Jonatan Werpers <jonatan@werpers.com>
parents: 1703
diff changeset
38 # TODO: Test that the element types agree
1434
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
39
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
40 @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
41
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
42
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
43 @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
44
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
45 @test jacobian(mg) isa Array{<:AbstractMatrix}
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
46 @test logicalgrid(mg) isa Grid
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
47
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
48 @testset "Indexing Interface" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
49 mg = MappedGrid(lg, x̄, J)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
50 @test mg[1,1] == [0.0, 0.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
51 @test mg[4,2] == [0.6, 0.2]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
52 @test mg[6,10] == [1., 1.8]
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
53
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
54 @test mg[begin, begin] == [0.0, 0.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
55 @test mg[end,end] == [2.0, 2.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
56 @test mg[begin,end] == [0., 2.]
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
57
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
58 @test eachindex(mg) == CartesianIndices((11,11))
1703
6eb5b48607e0 Add test for axes(::MappedGrid)
Jonatan Werpers <jonatan@werpers.com>
parents: 1691
diff changeset
59 @test axes(mg) == (1:11, 1:11)
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
60
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
61 @testset "cartesian indexing" begin
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
62 cases = [
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
63 (1,1) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
64 (3,5) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
65 (10,6),
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
66 (1,1) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
67 (3,2) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
68 ]
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
69
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
70 @testset "i = $is" for (lg, is) ∈ cases
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
71 @test mg[CartesianIndex(is...)] == mg[is...]
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
72 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
73 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
74
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
75 @testset "eachindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
76 @test eachindex(mg) == CartesianIndices((11,11))
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
77 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
78
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
79 @testset "firstindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
80 @test firstindex(mg, 1) == 1
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
81 @test firstindex(mg, 2) == 1
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
82 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
83
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
84 @testset "lastindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
85 @test lastindex(mg, 1) == 11
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
86 @test lastindex(mg, 2) == 11
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
87 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
88 end
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
89 # 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
90
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
91 @testset "Iterator interface" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
92 sg = MappedGrid(
1570
063a2bfb03da Fix bugs in calls to equidistant_grid after merge with default
Jonatan Werpers <jonatan@werpers.com>
parents: 1560
diff changeset
93 equidistant_grid((0,0), (1,1), 15, 11),
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
94 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
95 )
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
96
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
97 @test eltype(mg) == SVector{2,Float64}
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
98 @test eltype(sg) == SVector{3,Float64}
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
99
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
100 @test eltype(typeof(mg)) == SVector{2,Float64}
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
101 @test eltype(typeof(sg)) == SVector{3,Float64}
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 size(mg) == (11,11)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
104 @test size(sg) == (15,11)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
105
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
106 @test size(mg,2) == 11
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
107 @test size(sg,2) == 11
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
108
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
109 @test length(mg) == 121
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
110 @test length(sg) == 165
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
111
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
112 @test Base.IteratorSize(mg) == Base.HasShape{2}()
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
113 @test Base.IteratorSize(typeof(mg)) == Base.HasShape{2}()
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
114
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
115 @test Base.IteratorSize(sg) == Base.HasShape{2}()
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
116 @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
117
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
118 element, state = iterate(mg)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
119 @test element == lg[1,1].*2
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
120 element, _ = iterate(mg, state)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
121 @test element == lg[2,1].*2
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
122
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
123 element, state = iterate(sg)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
124 @test element == sg.physicalcoordinates[1,1]
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
125 element, _ = iterate(sg, state)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
126 @test element == sg.physicalcoordinates[2,1]
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
127
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
128 @test collect(mg) == 2 .* lg
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
129 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
130
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
131 @testset "Base" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
132 @test ndims(mg) == 2
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
133 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
134
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
135 @testset "==" begin
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
136 sz = (15,11)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
137 lg = equidistant_grid((0,0), (1,1), sz...)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
138 x = rand(SVector{3,Float64}, sz...)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
139 J = rand(SMatrix{2,3,Float64}, sz...)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
140
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
141 sg = MappedGrid(lg, x, J)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
142
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
143 sg1 = MappedGrid(equidistant_grid((0,0), (1,1), sz...), copy(x), copy(J))
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
144
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
145 sz2 = (15,12)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
146 lg2 = equidistant_grid((0,0), (1,1), sz2...)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
147 x2 = rand(SVector{3,Float64}, sz2...)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
148 J2 = rand(SMatrix{2,3,Float64}, sz2...)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
149 sg2 = MappedGrid(lg2, x2, J2)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
150
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
151 sg3 = MappedGrid(lg, rand(SVector{3,Float64}, sz...), J)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
152 sg4 = MappedGrid(lg, x, rand(SMatrix{2,3,Float64}, sz...))
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
153
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
154 @test sg == sg1
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
155 @test sg != sg2 # Different size
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
156 @test sg != sg3 # Different coordinates
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
157 @test sg != sg4 # Different jacobian
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
158 end
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
159
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
160 @testset "boundary_identifiers" begin
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
161 lg = equidistant_grid((0,0), (1,1), 11, 11) # TODO: Change dims of the grid to be different
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
162 x̄ = map(ξ̄ -> 2ξ̄, lg)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
163 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
164 mg = MappedGrid(lg, x̄, J)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
165 @test boundary_identifiers(mg) == boundary_identifiers(lg)
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
166 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
167
1493
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
168 @testset "boundary_indices" begin
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
169 lg = equidistant_grid((0,0), (1,1), 11, 11) # TODO: Change dims of the grid to be different
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
170 x̄ = map(ξ̄ -> 2ξ̄, lg)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
171 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
172 mg = MappedGrid(lg, x̄, J)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
173
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
174 @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
175 @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
176 @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
177 end
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
178
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
179 @testset "boundary_grid" begin
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
180 x̄, J = _partially_curved_mapping()
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
181 mg = mapped_grid(x̄, J, 10, 11)
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
182 J1((ξ, η)) = @SMatrix[
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
183 1 ;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
184 η*(2ξ-1);
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
185 ]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
186 J2((ξ, η)) = @SMatrix[
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
187 0;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
188 1+ξ*(ξ-1);
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
189 ]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
190
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
191 function test_boundary_grid(mg, bId, Jb)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
192 bg = boundary_grid(mg, bId)
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
193
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
194 lg = logicalgrid(mg)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
195 expected_bg = MappedGrid(
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
196 boundary_grid(lg, bId),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
197 map(x̄, boundary_grid(lg, bId)),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
198 map(Jb, boundary_grid(lg, bId)),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
199 )
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
200
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
201 @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
202 @test collect(bg) == collect(expected_bg)
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
203 @test logicalgrid(bg) == logicalgrid(expected_bg)
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
204 @test jacobian(bg) == jacobian(expected_bg)
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
205 # 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
206 end
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
207 end
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
208
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
209 @testset test_boundary_grid(mg, TensorGridBoundary{1, Lower}(), J2)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
210 @testset test_boundary_grid(mg, TensorGridBoundary{1, Upper}(), J2)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
211 @testset test_boundary_grid(mg, TensorGridBoundary{2, Lower}(), J1)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
212 @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
213 end
1426
9c689a627244 Add src and test file for curvilinear grid type
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
214 end
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
215
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
216 @testset "mapped_grid" begin
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
217 x̄, J = _partially_curved_mapping()
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
218 mg = mapped_grid(x̄, J, 10, 11)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
219 @test mg isa MappedGrid{SVector{2,Float64}, 2}
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
220
1570
063a2bfb03da Fix bugs in calls to equidistant_grid after merge with default
Jonatan Werpers <jonatan@werpers.com>
parents: 1560
diff changeset
221 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
222 @test logicalgrid(mg) == lg
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
223 @test collect(mg) == map(x̄, lg)
1704
e5e76c8e52c5 Fix todos and add broken test for mapped_grid(::Grid,...)
Jonatan Werpers <jonatan@werpers.com>
parents: 1703
diff changeset
224
e5e76c8e52c5 Fix todos and add broken test for mapped_grid(::Grid,...)
Jonatan Werpers <jonatan@werpers.com>
parents: 1703
diff changeset
225 @test_broken mapped_grid(lg, x̄, J) == mg
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
226 end
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
227
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
228 @testset "jacobian_determinant" begin
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
229 @test_broken false
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
230 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
231
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
232 @testset "metric_tensor" begin
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
233 @test_broken false
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
234 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
235
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
236 @testset "metric_tensor_inverse" begin
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
237 @test_broken false
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
238 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
239
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
240 @testset "min_spacing" begin
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
241 let g = mapped_grid(identity, x->@SMatrix[1], 11)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
242 @test min_spacing(g) ≈ 0.1
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
243 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
244
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
245 let g = mapped_grid(x->x+x.^2/2, x->@SMatrix[1 .+ x], 11)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
246 @test min_spacing(g) ≈ 0.105
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
247 end
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
248
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
249 let g = mapped_grid(x->x + x.*(1 .- x)/2, x->@SMatrix[1.5 .- x], 11)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
250 @test min_spacing(g) ≈ 0.055
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
251 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
252
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
253 let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,11)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
254 @test min_spacing(g) ≈ 0.1
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
255 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
256
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
257 let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,21)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
258 @test min_spacing(g) ≈ 0.05
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
259 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
260
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
261
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
262 @testset let a = @SVector[1,0], b = @SVector[1,1]/√2
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
263 g = mapped_grid(_skew_mapping(a,b)...,11,11)
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
264
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
265 @test min_spacing(g) ≈ 0.1*norm(b-a)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
266 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
267
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
268 @testset let a = @SVector[1,0], b = @SVector[-1,1]/√2
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
269 g = mapped_grid(_skew_mapping(a,b)...,11,11)
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
270
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
271 @test min_spacing(g) ≈ 0.1*norm(a+b)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
272 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
273 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
274
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
275 @testset "normal" begin
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
276 g = mapped_grid(_partially_curved_mapping()...,10, 11)
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
277
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
278 @test normal(g, CartesianBoundary{1,Lower}()) == fill(@SVector[-1,0], 11)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
279 @test normal(g, CartesianBoundary{1,Upper}()) == fill(@SVector[1,0], 11)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
280 @test normal(g, CartesianBoundary{2,Lower}()) == fill(@SVector[0,-1], 10)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
281 @test normal(g, CartesianBoundary{2,Upper}()) ≈ map(boundary_grid(g,CartesianBoundary{2,Upper}())|>logicalgrid) do ξ̄
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
282 α = 1-2ξ̄[1]
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
283 @SVector[α,1]/√(α^2 + 1)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
284 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
285
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
286 g = mapped_grid(_fully_curved_mapping()...,5,4)
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
287
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
288 unit(v) = v/norm(v)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
289 @testset let bId = CartesianBoundary{1,Lower}()
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
290 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
291 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
292 -unit(@SVector[1/2, η/3-1/6])
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
293 end
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
294 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
295
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
296 @testset let bId = CartesianBoundary{1,Upper}()
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
297 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
298 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
299 unit(@SVector[7/2, 2η-1]/(5 + 3η + 2η^2))
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
300 end
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
301 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
302
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
303 @testset let bId = CartesianBoundary{2,Lower}()
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
304 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
305 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
306 -unit(@SVector[-2ξ, 2]/(6 + ξ^2 - 2ξ))
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
307 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
308 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
309
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
310 @testset let bId = CartesianBoundary{2,Upper}()
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
311 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
312 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
313 unit(@SVector[-3ξ, 2]/(6 + ξ^2 + 3ξ))
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
314 end
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
315 end
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
316 end