sbplib_julia: test/Grids/mapped_grid

comparison test/Grids/mapped_grid_test.jl @ 1690:5eabe1f560f0 feature/grids/curvilinear

Reorganize nesting of tests for mapped_grid

author	Jonatan Werpers <jonatan@werpers.com>
date	Fri, 23 Aug 2024 09:45:02 +0200
parents	e11b5b6940a2
children	5bf4a35a78c5

comparison

equal deleted inserted replaced

-:e11b5b6940a2
+:5eabe1f560f0
 @testset test_boundary_grid(mg, TensorGridBoundary{1, Lower}(), J2)
 @testset test_boundary_grid(mg, TensorGridBoundary{1, Upper}(), J2)
 @testset test_boundary_grid(mg, TensorGridBoundary{2, Lower}(), J1)
 @testset test_boundary_grid(mg, TensorGridBoundary{2, Upper}(), J1)
 end
-@testset "jacobian_determinant" begin
-@test_broken false
-end
-@testset "metric_tensor" begin
-@test_broken false
-end
-@testset "metric_tensor_inverse" begin
-@test_broken false
-end
-@testset "min_spacing" begin
-let g = mapped_grid(identity, x->@SMatrix[1], 11)
-@test min_spacing(g) ≈ 0.1
-end
-let g = mapped_grid(x->x+x.^2/2, x->@SMatrix[1 .+ x], 11)
-@test min_spacing(g) ≈ 0.105
-end
-let g = mapped_grid(x->x + x.*(1 .- x)/2, x->@SMatrix[1.5 .- x], 11)
-@test min_spacing(g) ≈ 0.055
-end
-let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,11)
-@test min_spacing(g) ≈ 0.1
-end
-let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,21)
-@test min_spacing(g) ≈ 0.05
-end
-skew_grid(a,b, sz...) = mapped_grid(ξ̄->ξ̄[1]*a + ξ̄[2]*b, ξ̄->[a  b], sz...)
-@testset let a = @SVector[1,0], b = @SVector[1,1]/√2
-g = skew_grid(a,b,11,11)
-@test min_spacing(g) ≈ 0.1*norm(b-a)
-end
-@testset let a = @SVector[1,0], b = @SVector[-1,1]/√2
-g = skew_grid(a,b,11,11)
-@test min_spacing(g) ≈ 0.1*norm(a+b)
-end
-# Skevt nät
-end
 end
 @testset "mapped_grid" begin
 x̄((ξ, η)) = @SVector[ξ, η*(1+ξ*(ξ-1))]
 J((ξ, η)) = @SMatrix[
 @test mg isa MappedGrid{SVector{2,Float64}, 2}
 lg = equidistant_grid((0,0), (1,1), 10, 11)
 @test logicalgrid(mg) == lg
 @test collect(mg) == map(x̄, lg)
+end
-@testset "normal" begin
+@testset "jacobian_determinant" begin
-@test normal(mg, CartesianBoundary{1,Lower}()) == fill(@SVector[-1,0], 11)
+@test_broken false
-@test normal(mg, CartesianBoundary{1,Upper}()) == fill(@SVector[1,0], 11)
+end
-@test normal(mg, CartesianBoundary{2,Lower}()) == fill(@SVector[0,-1], 10)
-@test normal(mg, CartesianBoundary{2,Upper}()) ≈ map(boundary_grid(mg,CartesianBoundary{2,Upper}())|>logicalgrid) do ξ̄
+@testset "metric_tensor" begin
-α = 1-2ξ̄[1]
+@test_broken false
-@SVector[α,1]/√(α^2 + 1)
+end
-end
+@testset "metric_tensor_inverse" begin
+@test_broken false
-x̄((ξ, η)) = @SVector[2ξ + η*(1-η), 3η+(1+η/2)*ξ^2]
+end
-J((ξ, η)) = @SMatrix[
-2       1-2η;
+@testset "min_spacing" begin
-(2+η)*ξ 3+1/2*ξ^2;
+let g = mapped_grid(identity, x->@SMatrix[1], 11)
-]
+@test min_spacing(g) ≈ 0.1
+end
-g = mapped_grid(x̄,J,21,14)
-g = mapped_grid(x̄,J,3,4)
+let g = mapped_grid(x->x+x.^2/2, x->@SMatrix[1 .+ x], 11)
+@test min_spacing(g) ≈ 0.105
-unit(v) = v/norm(v)
+end
-@testset let bId = CartesianBoundary{1,Lower}()
-lbg = boundary_grid(logicalgrid(g), bId)
+let g = mapped_grid(x->x + x.*(1 .- x)/2, x->@SMatrix[1.5 .- x], 11)
-@test normal(g, bId) ≈ map(lbg) do (ξ, η)
+@test min_spacing(g) ≈ 0.055
--unit(@SVector[1/2,  η/3-1/6])
+end
-end
-end
+let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,11)
+@test min_spacing(g) ≈ 0.1
-@testset let bId = CartesianBoundary{1,Upper}()
+end
-lbg = boundary_grid(logicalgrid(g), bId)
-@test normal(g, bId) ≈ map(lbg) do (ξ, η)
+let g = mapped_grid(identity, x->@SMatrix[1 0; 0 1], 11,21)
-unit(@SVector[7/2, 2η-1]/(5 + 3η + 2η^2))
+@test min_spacing(g) ≈ 0.05
 end
-end
+skew_grid(a,b, sz...) = mapped_grid(ξ̄->ξ̄[1]*a + ξ̄[2]*b, ξ̄->[a  b], sz...)
-@testset let bId = CartesianBoundary{2,Lower}()
-lbg = boundary_grid(logicalgrid(g), bId)
+@testset let a = @SVector[1,0], b = @SVector[1,1]/√2
-@test normal(g, bId) ≈ map(lbg) do (ξ, η)
+g = skew_grid(a,b,11,11)
--unit(@SVector[-2ξ, 2]/(6 + ξ^2 - 2ξ))
-end
+@test min_spacing(g) ≈ 0.1*norm(b-a)
 end
-@testset let bId = CartesianBoundary{2,Upper}()
+@testset let a = @SVector[1,0], b = @SVector[-1,1]/√2
-lbg = boundary_grid(logicalgrid(g), bId)
+g = skew_grid(a,b,11,11)
-@test normal(g, bId) ≈ map(lbg) do (ξ, η)
-unit(@SVector[-3ξ, 2]/(6 + ξ^2 + 3ξ))
+@test min_spacing(g) ≈ 0.1*norm(a+b)
 end
 end
-end
-end
+@testset "normal" begin
+x̄((ξ, η)) = @SVector[ξ, η*(1+ξ*(ξ-1))]
-# TODO: Reorganize tests to not be nested.
+J((ξ, η)) = @SMatrix[
-# Want to ues "mapped_grid" to contruct tests for some of the differential geometry methods
+1         0;
+η*(2ξ-1)  1+ξ*(ξ-1);
+]
+g = mapped_grid(x̄, J, 10, 11)
+@test normal(g, CartesianBoundary{1,Lower}()) == fill(@SVector[-1,0], 11)
+@test normal(g, CartesianBoundary{1,Upper}()) == fill(@SVector[1,0], 11)
+@test normal(g, CartesianBoundary{2,Lower}()) == fill(@SVector[0,-1], 10)
+@test normal(g, CartesianBoundary{2,Upper}()) ≈ map(boundary_grid(g,CartesianBoundary{2,Upper}())|>logicalgrid) do ξ̄
+α = 1-2ξ̄[1]
+@SVector[α,1]/√(α^2 + 1)
+end
+x̄((ξ, η)) = @SVector[2ξ + η*(1-η), 3η+(1+η/2)*ξ^2]
+J((ξ, η)) = @SMatrix[
+2       1-2η;
+(2+η)*ξ 3+1/2*ξ^2;
+]
+g = mapped_grid(x̄,J,5,4)
+unit(v) = v/norm(v)
+@testset let bId = CartesianBoundary{1,Lower}()
+lbg = boundary_grid(logicalgrid(g), bId)
+@test normal(g, bId) ≈ map(lbg) do (ξ, η)
+-unit(@SVector[1/2,  η/3-1/6])
+end
+end
+@testset let bId = CartesianBoundary{1,Upper}()
+lbg = boundary_grid(logicalgrid(g), bId)
+@test normal(g, bId) ≈ map(lbg) do (ξ, η)
+unit(@SVector[7/2, 2η-1]/(5 + 3η + 2η^2))
+end
+end
+@testset let bId = CartesianBoundary{2,Lower}()
+lbg = boundary_grid(logicalgrid(g), bId)
+@test normal(g, bId) ≈ map(lbg) do (ξ, η)
+-unit(@SVector[-2ξ, 2]/(6 + ξ^2 - 2ξ))
+end
+end
+@testset let bId = CartesianBoundary{2,Upper}()
+lbg = boundary_grid(logicalgrid(g), bId)
+@test normal(g, bId) ≈ map(lbg) do (ξ, η)
+unit(@SVector[-3ξ, 2]/(6 + ξ^2 + 3ξ))
+end
+end
+end

Mercurial > repos > public > sbplib_julia

comparison test/Grids/mapped_grid_test.jl @ 1690:5eabe1f560f0 feature/grids/curvilinear