Mercurial > repos > public > sbplib_julia

annotate test/Grids/mapped_grid_test.jl @ 1744:c38eead8be17 feature/grids/curvilinear

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add checks for the size of the jacobian
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 11 Sep 2024 14:11:03 +0200
parents 49bd573ab07f
children 2f7974367cd3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1736
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
1 using Diffinitive.Grids
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
2 using Diffinitive.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
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
31 @testset "Constructor" begin
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
32 lg = equidistant_grid((0,0), (1,1), 11, 21)
1740
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
33
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
34 x̄ = map(ξ̄ -> 2ξ̄, lg)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
35 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
36 mg = MappedGrid(lg, x̄, J)
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
37
1740
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
38 @test mg isa Grid{SVector{2, Float64},2}
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
39 @test jacobian(mg) isa Array{<:AbstractMatrix}
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
40 @test logicalgrid(mg) isa Grid
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
41
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
42 @test collect(mg) == x̄
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
43 @test jacobian(mg) == J
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
44 @test logicalgrid(mg) == lg
9f2bc8ea6a07 Add some tests for the getters
Jonatan Werpers <jonatan@werpers.com>
parents: 1739
diff changeset
45
1742
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
46
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
47 x̄ = map(ξ̄ -> @SVector[ξ̄[1],ξ̄[2], ξ̄[1] + ξ̄[2]], lg)
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
48 J = map(ξ̄ -> @SMatrix[1 0; 0 1; 1 1], lg)
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
49 mg = MappedGrid(lg, x̄, J)
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
50
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
51 @test mg isa Grid{SVector{3, Float64},2}
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
52 @test jacobian(mg) isa Array{<:AbstractMatrix}
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
53 @test logicalgrid(mg) isa Grid
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
54
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
55 @test collect(mg) == x̄
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
56 @test jacobian(mg) == J
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
57 @test logicalgrid(mg) == lg
c9c601678a14 Add test for construction of Rn->Rm grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1741
diff changeset
58
1743
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
59 sz1 = (10,11)
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
60 sz2 = (10,12)
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
61 @test_throws ArgumentError("Sizes must match") MappedGrid(
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
62 equidistant_grid((0,0), (1,1), sz2...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
63 rand(SVector{2},sz1...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
64 rand(SMatrix{2,2},sz1...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
65 )
1434
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
66
1743
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
67 @test_throws ArgumentError("Sizes must match") MappedGrid(
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
68 equidistant_grid((0,0), (1,1), sz1...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
69 rand(SVector{2},sz2...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
70 rand(SMatrix{2,2},sz1...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
71 )
1434
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
72
1743
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
73 @test_throws ArgumentError("Sizes must match") MappedGrid(
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
74 equidistant_grid((0,0), (1,1), sz1...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
75 rand(SVector{2},sz1...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
76 rand(SMatrix{2,2},sz2...),
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
77 )
1434
af73340a8f0e Add todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1432
diff changeset
78
1744
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
79 # TODO: Test that the element types agree
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
80 err_str = "The size of the jacobian must match the dimensions of the grid and coordinates"
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
81 @test_throws ArgumentError(err_str) MappedGrid(
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
82 equidistant_grid((0,0), (1,1), 10, 11),
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
83 rand(SVector{3}, 10, 11),
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
84 rand(SMatrix{3,4}, 10, 11),
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
85 )
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
86
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
87 @test_throws ArgumentError(err_str) MappedGrid(
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
88 equidistant_grid((0,0), (1,1), 10, 11),
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
89 rand(SVector{3}, 10, 11),
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
90 rand(SMatrix{4,2}, 10, 11),
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
91 )
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
92 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
93
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
94 @testset "Indexing Interface" begin
1735
36986b75bf98 Add missing assignments
Jonatan Werpers <jonatan@werpers.com>
parents: 1707
diff changeset
95 lg = equidistant_grid((0,0), (1,1), 11, 21)
36986b75bf98 Add missing assignments
Jonatan Werpers <jonatan@werpers.com>
parents: 1707
diff changeset
96 x̄ = map(ξ̄ -> 2ξ̄, lg)
36986b75bf98 Add missing assignments
Jonatan Werpers <jonatan@werpers.com>
parents: 1707
diff changeset
97 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
98 mg = MappedGrid(lg, x̄, J)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
99 @test mg[1,1] == [0.0, 0.0]
1707
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
100 @test mg[4,2] == [0.6, 0.1]
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
101 @test mg[6,10] == [1., 0.9]
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
102
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
103 @test mg[begin, begin] == [0.0, 0.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
104 @test mg[end,end] == [2.0, 2.0]
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
105 @test mg[begin,end] == [0., 2.]
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
106
1707
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
107 @test axes(mg) == (1:11, 1:21)
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
108
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
109 @testset "cartesian indexing" begin
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
110 cases = [
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
111 (1,1) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
112 (3,5) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
113 (10,6),
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
114 (1,1) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
115 (3,2) ,
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
116 ]
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
117
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
118 @testset "i = $is" for (lg, is) ∈ cases
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
119 @test mg[CartesianIndex(is...)] == mg[is...]
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
120 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
121 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
122
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
123 @testset "eachindex" begin
1707
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
124 @test eachindex(mg) == CartesianIndices((11,21))
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
125 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
126
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
127 @testset "firstindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
128 @test firstindex(mg, 1) == 1
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
129 @test firstindex(mg, 2) == 1
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
130 end
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
131
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
132 @testset "lastindex" begin
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
133 @test lastindex(mg, 1) == 11
1707
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
134 @test lastindex(mg, 2) == 21
1432
64b60b42d367 Implement indexing interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1431
diff changeset
135 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
136 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
137
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
138 @testset "Iterator interface" begin
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
139 lg = equidistant_grid((0,0), (1,1), 11, 21)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
140 x̄ = map(ξ̄ -> 2ξ̄, lg)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
141 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
1743
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
142
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
143 mg = MappedGrid(lg, x̄, J)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
144
1743
49bd573ab07f Implement checking of sizes for inputs to MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1742
diff changeset
145 lg2 = equidistant_grid((0,0), (1,1), 15, 11)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
146 sg = MappedGrid(
1570
063a2bfb03da Fix bugs in calls to equidistant_grid after merge with default
Jonatan Werpers <jonatan@werpers.com>
parents: 1560
diff changeset
147 equidistant_grid((0,0), (1,1), 15, 11),
1744
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
148 map(ξ̄ -> @SArray[ξ̄[1], ξ̄[2], -ξ̄[1]], lg2), rand(SMatrix{3,2,Float64},15,11)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
149 )
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
150
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
151 @test eltype(mg) == SVector{2,Float64}
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
152 @test eltype(sg) == SVector{3,Float64}
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
153
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
154 @test eltype(typeof(mg)) == SVector{2,Float64}
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
155 @test eltype(typeof(sg)) == SVector{3,Float64}
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
156
1707
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
157 @test size(mg) == (11,21)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
158 @test size(sg) == (15,11)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
159
1707
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
160 @test size(mg,2) == 21
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
161 @test size(sg,2) == 11
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
162
1707
519a8cb1439e Change dimensions of testing grid to be different
Jonatan Werpers <jonatan@werpers.com>
parents: 1706
diff changeset
163 @test length(mg) == 231
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
164 @test length(sg) == 165
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
165
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
166 @test Base.IteratorSize(mg) == Base.HasShape{2}()
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
167 @test Base.IteratorSize(typeof(mg)) == Base.HasShape{2}()
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
168
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
169 @test Base.IteratorSize(sg) == Base.HasShape{2}()
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
170 @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
171
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
172 element, state = iterate(mg)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
173 @test element == lg[1,1].*2
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
174 element, _ = iterate(mg, state)
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
175 @test element == lg[2,1].*2
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
176
1450
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
177 element, state = iterate(sg)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
178 @test element == sg.physicalcoordinates[1,1]
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
179 element, _ = iterate(sg, state)
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
180 @test element == sg.physicalcoordinates[2,1]
647c8b18b84f Implement iterator interface
Jonatan Werpers <jonatan@werpers.com>
parents: 1434
diff changeset
181
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
182 @test collect(mg) == 2 .* lg
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
183 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
184
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
185 @testset "Base" begin
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
186 lg = equidistant_grid((0,0), (1,1), 11, 21)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
187 x̄ = map(ξ̄ -> 2ξ̄, lg)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
188 J = map(ξ̄ -> @SArray(fill(2., 2, 2)), lg)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
189 mg = MappedGrid(lg, x̄, J)
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
190
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
191 @test ndims(mg) == 2
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
192 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
193
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
194 @testset "==" begin
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
195 sz = (15,11)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
196 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
197 x = rand(SVector{3,Float64}, sz...)
1744
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
198 J = rand(SMatrix{3,2,Float64}, sz...)
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
199
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
200 sg = MappedGrid(lg, x, J)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
201
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
202 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
203
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
204 sz2 = (15,12)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
205 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
206 x2 = rand(SVector{3,Float64}, sz2...)
1744
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
207 J2 = rand(SMatrix{3,2,Float64}, sz2...)
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
208 sg2 = MappedGrid(lg2, x2, J2)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
209
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
210 sg3 = MappedGrid(lg, rand(SVector{3,Float64}, sz...), J)
1744
c38eead8be17 Add checks for the size of the jacobian
Jonatan Werpers <jonatan@werpers.com>
parents: 1743
diff changeset
211 sg4 = MappedGrid(lg, x, rand(SMatrix{3,2,Float64}, sz...))
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
212
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
213 @test sg == sg1
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
214 @test sg != sg2 # Different size
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
215 @test sg != sg3 # Different coordinates
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
216 @test sg != sg4 # Different jacobian
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
217 end
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
218
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
219 @testset "boundary_identifiers" begin
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
220 lg = equidistant_grid((0,0), (1,1), 11, 15)
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
221 x̄ = map(ξ̄ -> 2ξ̄, lg)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
222 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
223 mg = MappedGrid(lg, x̄, J)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
224 @test boundary_identifiers(mg) == boundary_identifiers(lg)
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
225 end
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
226
1493
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
227 @testset "boundary_indices" begin
1738
7573c9244e47 Factor out testset for construct and remove some Todos
Jonatan Werpers <jonatan@werpers.com>
parents: 1737
diff changeset
228 lg = equidistant_grid((0,0), (1,1), 11, 15)
1705
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
229 x̄ = map(ξ̄ -> 2ξ̄, lg)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
230 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
231 mg = MappedGrid(lg, x̄, J)
4870fc3faa25 Add tests for equallity of mapped grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1704
diff changeset
232
1736
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
233 @test boundary_indices(mg, CartesianBoundary{1,LowerBoundary}()) == boundary_indices(lg,CartesianBoundary{1,LowerBoundary}())
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
234 @test boundary_indices(mg, CartesianBoundary{2,LowerBoundary}()) == boundary_indices(lg,CartesianBoundary{2,LowerBoundary}())
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
235 @test boundary_indices(mg, CartesianBoundary{1,UpperBoundary}()) == boundary_indices(lg,CartesianBoundary{1,UpperBoundary}())
1493
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
236 end
58b8da9c7e56 Implement boundary_indices
Jonatan Werpers <jonatan@werpers.com>
parents: 1451
diff changeset
237
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
238 @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
239 x̄, J = _partially_curved_mapping()
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
240 mg = mapped_grid(x̄, J, 10, 11)
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
241 J1((ξ, η)) = @SMatrix[
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
242 1 ;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
243 η*(2ξ-1);
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
244 ]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
245 J2((ξ, η)) = @SMatrix[
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
246 0;
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
247 1+ξ*(ξ-1);
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
248 ]
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
249
1737
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
250 function expected_bg(mg, bId, Jb)
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
251 lg = logicalgrid(mg)
1737
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
252 return MappedGrid(
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
253 boundary_grid(lg, bId),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
254 map(x̄, boundary_grid(lg, bId)),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
255 map(Jb, boundary_grid(lg, bId)),
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
256 )
1737
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
257 end
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
258
1737
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
259 let bid = TensorGridBoundary{1, LowerBoundary}()
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
260 @test boundary_grid(mg, bid) == expected_bg(mg, bid, J2)
1503
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
261 end
704a84eef8b6 Add tests for boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1502
diff changeset
262
1737
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
263 let bid = TensorGridBoundary{1, UpperBoundary}()
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
264 @test boundary_grid(mg, bid) == expected_bg(mg, bid, J2)
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
265 end
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
266
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
267 let bid = TensorGridBoundary{2, LowerBoundary}()
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
268 @test boundary_grid(mg, bid) == expected_bg(mg, bid, J1)
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
269 end
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
270
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
271 let bid = TensorGridBoundary{2, UpperBoundary}()
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
272 @test boundary_grid(mg, bid) == expected_bg(mg, bid, J1)
a4e1721a7109 Simplify tests of boundary_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1736
diff changeset
273 end
1430
9fc3c1af33e5 Add testsets and a few tests
Jonatan Werpers <jonatan@werpers.com>
parents: 1426
diff changeset
274 end
1426
9c689a627244 Add src and test file for curvilinear grid type
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
275 end
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
276
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
277 @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
278 x̄, J = _partially_curved_mapping()
1506
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
279 mg = mapped_grid(x̄, J, 10, 11)
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
280 @test mg isa MappedGrid{SVector{2,Float64}, 2}
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
281
1570
063a2bfb03da Fix bugs in calls to equidistant_grid after merge with default
Jonatan Werpers <jonatan@werpers.com>
parents: 1560
diff changeset
282 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
283 @test logicalgrid(mg) == lg
535f32316637 Rename from curvilinear to mapped
Jonatan Werpers <jonatan@werpers.com>
parents: 1503
diff changeset
284 @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
285
1706
11640aa3e348 Add method and refactor mapped_grid()
Jonatan Werpers <jonatan@werpers.com>
parents: 1705
diff changeset
286 @test mapped_grid(lg, x̄, J) == mg
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
287 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
288
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
289 @testset "jacobian_determinant" begin
1739
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
290 x̄((ξ, η)) = @SVector[ξ*η, ξ + η^2]
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
291 J((ξ, η)) = @SMatrix[
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
292 η ξ;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
293 1 2η;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
294 ]
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
295
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
296 g = mapped_grid(x̄, J, 10, 11)
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
297 J = map(logicalgrid(g)) do (ξ,η)
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
298 2η^2 - ξ
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
299 end
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
300 @test jacobian_determinant(g) ≈ J
1741
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
301
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
302
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
303 lg = equidistant_grid((0,0), (1,1), 11, 21)
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
304 x̄ = map(ξ̄ -> @SVector[ξ̄[1],ξ̄[2], ξ̄[1] + ξ̄[2]], lg)
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
305 J = map(ξ̄ -> @SMatrix[1 0; 0 1; 1 1], lg)
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
306 mg = MappedGrid(lg, x̄, J)
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
307
248304f88e49 Add TBD for deciding about what jacobian_determinant should mean for Rn->Rm grids
Jonatan Werpers <jonatan@werpers.com>
parents: 1740
diff changeset
308 @test_broken jacobian(mg) isa AbstractArray{2,Float64}
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
309 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
310
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
311 @testset "metric_tensor" begin
1739
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
312 x̄((ξ, η)) = @SVector[ξ*η, ξ + η^2]
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
313 J((ξ, η)) = @SMatrix[
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
314 η ξ;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
315 1 2η;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
316 ]
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
317
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
318 g = mapped_grid(x̄, J, 10, 11)
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
319 G = map(logicalgrid(g)) do (ξ,η)
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
320 @SMatrix[
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
321 1+η^2 ξ*η+2η;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
322 ξ*η+2η ξ^2 + 4η^2;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
323 ]
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
324 end
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
325 @test metric_tensor(g) ≈ G
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
326 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
327
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
328 @testset "metric_tensor_inverse" begin
1739
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
329 x̄((ξ, η)) = @SVector[ξ + ξ^2/2, η + η^2 + ξ^2/2]
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
330 J((ξ, η)) = @SMatrix[
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
331 1+ξ 0;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
332 ξ 1+η;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
333 ]
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
334
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
335 g = mapped_grid(x̄, J, 10, 11)
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
336 G⁻¹ = map(logicalgrid(g)) do (ξ,η)
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
337 @SMatrix[
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
338 (1+η)^2 -ξ*(1+η);
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
339 -ξ*(1+η) (1+ξ)^2+ξ^2;
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
340 ]/(((1+ξ)^2+ξ^2)*(1+η)^2 - ξ^2*(1+η)^2)
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
341
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
342 end
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
343
e1ae5d8e30c3 Add tests for jacobian_determinant, metric_tensor, and metric_tensor_inverse
Jonatan Werpers <jonatan@werpers.com>
parents: 1738
diff changeset
344 @test metric_tensor_inverse(g) ≈ G⁻¹
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
345 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
346
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
347 @testset "min_spacing" begin
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
348 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
349 @test min_spacing(g) ≈ 0.1
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
350 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
351
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
352 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
353 @test min_spacing(g) ≈ 0.105
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
354 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
355
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
356 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
357 @test min_spacing(g) ≈ 0.055
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
358 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
359
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
360 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
361 @test min_spacing(g) ≈ 0.1
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
362 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
363
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
364 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
365 @test min_spacing(g) ≈ 0.05
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
366 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
367
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
368
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
369 @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
370 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
371
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
372 @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
373 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
374
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
375 @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
376 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
377
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
378 @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
379 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
380 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
381
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
382 @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
383 g = mapped_grid(_partially_curved_mapping()...,10, 11)
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
384
1736
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
385 @test normal(g, CartesianBoundary{1,LowerBoundary}()) == fill(@SVector[-1,0], 11)
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
386 @test normal(g, CartesianBoundary{1,UpperBoundary}()) == fill(@SVector[1,0], 11)
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
387 @test normal(g, CartesianBoundary{2,LowerBoundary}()) == fill(@SVector[0,-1], 10)
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
388 @test normal(g, CartesianBoundary{2,UpperBoundary}()) ≈ map(boundary_grid(g,CartesianBoundary{2,UpperBoundary}())|>logicalgrid) do ξ̄
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
389 α = 1-2ξ̄[1]
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
390 @SVector[α,1]/√(α^2 + 1)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
391 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
392
1691
5bf4a35a78c5 Factor out functions for the mappings used in tests of MappedGrid
Jonatan Werpers <jonatan@werpers.com>
parents: 1690
diff changeset
393 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
394
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
395 unit(v) = v/norm(v)
1736
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
396 @testset let bId = CartesianBoundary{1,LowerBoundary}()
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
397 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
398 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
399 -unit(@SVector[1/2, η/3-1/6])
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
400 end
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
401 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
402
1736
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
403 @testset let bId = CartesianBoundary{1,UpperBoundary}()
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
404 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
405 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
406 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
407 end
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
408 end
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
409
1736
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
410 @testset let bId = CartesianBoundary{2,LowerBoundary}()
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
411 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
412 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
413 -unit(@SVector[-2ξ, 2]/(6 + ξ^2 - 2ξ))
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
414 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
415 end
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
416
1736
863385aae454 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1735
diff changeset
417 @testset let bId = CartesianBoundary{2,UpperBoundary}()
1690
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
418 lbg = boundary_grid(logicalgrid(g), bId)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
419 @test normal(g, bId) ≈ map(lbg) do (ξ, η)
5eabe1f560f0 Reorganize nesting of tests for mapped_grid
Jonatan Werpers <jonatan@werpers.com>
parents: 1689
diff changeset
420 unit(@SVector[-3ξ, 2]/(6 + ξ^2 + 3ξ))
1689
e11b5b6940a2 Add more tests for `normal`
Jonatan Werpers <jonatan@werpers.com>
parents: 1688
diff changeset
421 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
422 end
1502
a2dc80396808 Add functions `curvilinear_grid`
Jonatan Werpers <jonatan@werpers.com>
parents: 1494
diff changeset
423 end