annotate test/testSbpOperators.jl @ 594:cc86b920531a refactor/toml_operator_format

Change the readoperator function to use the .toml format
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 02 Dec 2020 15:26:13 +0100
parents 8e4f86c4bf75
children 03ef4d4740ab
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
1 using Test
335
f4e3e71a4ff4 Fix `using` commands to refer to local modules within the Sbplib package/module
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
2 using Sbplib.SbpOperators
f4e3e71a4ff4 Fix `using` commands to refer to local modules within the Sbplib package/module
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
3 using Sbplib.Grids
f4e3e71a4ff4 Fix `using` commands to refer to local modules within the Sbplib package/module
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
4 using Sbplib.RegionIndices
f4e3e71a4ff4 Fix `using` commands to refer to local modules within the Sbplib package/module
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
5 using Sbplib.LazyTensors
395
737e597e0e6d Rewrite broken tests as testing that the norm is zero
Jonatan Werpers <jonatan@werpers.com>
parents: 389
diff changeset
6 using LinearAlgebra
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
7
338
2b0c9b30ea3b Add test sets for each submodule to make the test output nicer
Jonatan Werpers <jonatan@werpers.com>
parents: 335
diff changeset
8 @testset "SbpOperators" begin
2b0c9b30ea3b Add test sets for each submodule to make the test output nicer
Jonatan Werpers <jonatan@werpers.com>
parents: 335
diff changeset
9
584
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
10 @testset "Stencil" begin
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
11 s = SbpOperators.Stencil((-2,2), (1.,2.,2.,3.,4.))
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
12 @test s isa SbpOperators.Stencil{Float64, 5}
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
13
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
14 @test eltype(s) == Float64
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
15 @test SbpOperators.scale(s, 2) == SbpOperators.Stencil((-2,2), (2.,4.,4.,6.,8.))
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
16 end
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 397
diff changeset
17
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
18 # @testset "apply_quadrature" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
19 # op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
20 # h = 0.5
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
21 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
22 # @test apply_quadrature(op, h, 1.0, 10, 100) == h
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
23 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
24 # N = 10
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
25 # qc = op.quadratureClosure
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
26 # q = h.*(qc..., ones(N-2*closuresize(op))..., reverse(qc)...)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
27 # @assert length(q) == N
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
28 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
29 # for i ∈ 1:N
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
30 # @test apply_quadrature(op, h, 1.0, i, N) == q[i]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
31 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
32 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
33 # v = [2.,3.,2.,4.,5.,4.,3.,4.,5.,4.5]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
34 # for i ∈ 1:N
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
35 # @test apply_quadrature(op, h, v[i], i, N) == q[i]*v[i]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
36 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
37 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
38
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
39 @testset "SecondDerivative" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
40 op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
41 L = 3.5
388
5223872485cd Clean up grid creation
Jonatan Werpers <jonatan@werpers.com>
parents: 387
diff changeset
42 g = EquidistantGrid(101, 0.0, L)
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
43 Dₓₓ = SecondDerivative(g,op.innerStencil,op.closureStencils)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
44
396
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
45 f0(x) = 1.
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
46 f1(x) = x
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
47 f2(x) = 1/2*x^2
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
48 f3(x) = 1/6*x^3
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
49 f4(x) = 1/24*x^4
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
50 f5(x) = sin(x)
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
51 f5ₓₓ(x) = -f5(x)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
52
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
53 v0 = evalOn(g,f0)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
54 v1 = evalOn(g,f1)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
55 v2 = evalOn(g,f2)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
56 v3 = evalOn(g,f3)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
57 v4 = evalOn(g,f4)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
58 v5 = evalOn(g,f5)
219
69a6049e14d9 Create package SbpOperators
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
59
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
60 @test Dₓₓ isa TensorMapping{T,1,1} where T
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
61 @test Dₓₓ' isa TensorMapping{T,1,1} where T
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
62
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
63 # 4th order interior stencil, 2nd order boundary stencil,
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
64 # implies that L*v should be exact for v - monomial up to order 3.
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
65 # Exact differentiation is measured point-wise. For other grid functions
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
66 # the error is measured in the l2-norm.
395
737e597e0e6d Rewrite broken tests as testing that the norm is zero
Jonatan Werpers <jonatan@werpers.com>
parents: 389
diff changeset
67 @test norm(Dₓₓ*v0) ≈ 0.0 atol=5e-10
737e597e0e6d Rewrite broken tests as testing that the norm is zero
Jonatan Werpers <jonatan@werpers.com>
parents: 389
diff changeset
68 @test norm(Dₓₓ*v1) ≈ 0.0 atol=5e-10
387
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
69 @test Dₓₓ*v2 ≈ v0 atol=5e-11
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
70 @test Dₓₓ*v3 ≈ v1 atol=5e-11
388
5223872485cd Clean up grid creation
Jonatan Werpers <jonatan@werpers.com>
parents: 387
diff changeset
71
5223872485cd Clean up grid creation
Jonatan Werpers <jonatan@werpers.com>
parents: 387
diff changeset
72 h = spacing(g)[1];
389
0433ab553d13 Rewrite l2 norm comparison to use the norm key word of isapprox
Jonatan Werpers <jonatan@werpers.com>
parents: 388
diff changeset
73 l2(v) = sqrt(h*sum(v.^2))
0433ab553d13 Rewrite l2 norm comparison to use the norm key word of isapprox
Jonatan Werpers <jonatan@werpers.com>
parents: 388
diff changeset
74 @test Dₓₓ*v4 ≈ v2 atol=5e-4 norm=l2
0433ab553d13 Rewrite l2 norm comparison to use the norm key word of isapprox
Jonatan Werpers <jonatan@werpers.com>
parents: 388
diff changeset
75 @test Dₓₓ*v5 ≈ -v5 atol=5e-4 norm=l2
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
76 end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
77
387
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
78
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
79 @testset "Laplace2D" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
80 op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
81 Lx = 1.5
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
82 Ly = 3.2
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
83 g = EquidistantGrid((102,131), (0.0, 0.0), (Lx,Ly))
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
84 L = Laplace(g, op.innerStencil, op.closureStencils)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
85
254
4ca3794fffef Add apply_quadrature to SbpOperators
Jonatan Werpers <jonatan@werpers.com>
parents: 219
diff changeset
86
396
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
87 f0(x,y) = 2.
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
88 f1(x,y) = x+y
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
89 f2(x,y) = 1/2*x^2 + 1/2*y^2
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
90 f3(x,y) = 1/6*x^3 + 1/6*y^3
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
91 f4(x,y) = 1/24*x^4 + 1/24*y^4
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
92 f5(x,y) = sin(x) + cos(y)
9aff09ca0052 Remove some type annotations
Jonatan Werpers <jonatan@werpers.com>
parents: 395
diff changeset
93 f5ₓₓ(x,y) = -f5(x,y)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
94
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
95 v0 = evalOn(g,f0)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
96 v1 = evalOn(g,f1)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
97 v2 = evalOn(g,f2)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
98 v3 = evalOn(g,f3)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
99 v4 = evalOn(g,f4)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
100 v5 = evalOn(g,f5)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
101 v5ₓₓ = evalOn(g,f5ₓₓ)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
102
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
103 @test L isa TensorMapping{T,2,2} where T
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
104 @test L' isa TensorMapping{T,2,2} where T
254
4ca3794fffef Add apply_quadrature to SbpOperators
Jonatan Werpers <jonatan@werpers.com>
parents: 219
diff changeset
105
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
106 # 4th order interior stencil, 2nd order boundary stencil,
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
107 # implies that L*v should be exact for v - monomial up to order 3.
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
108 # Exact differentiation is measured point-wise. For other grid functions
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
109 # the error is measured in the H-norm.
395
737e597e0e6d Rewrite broken tests as testing that the norm is zero
Jonatan Werpers <jonatan@werpers.com>
parents: 389
diff changeset
110 @test norm(L*v0) ≈ 0 atol=5e-10
737e597e0e6d Rewrite broken tests as testing that the norm is zero
Jonatan Werpers <jonatan@werpers.com>
parents: 389
diff changeset
111 @test norm(L*v1) ≈ 0 atol=5e-10
387
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
112 @test L*v2 ≈ v0 # Seems to be more accurate
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
113 @test L*v3 ≈ v1 atol=5e-10
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
114
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
115 h = spacing(g)
389
0433ab553d13 Rewrite l2 norm comparison to use the norm key word of isapprox
Jonatan Werpers <jonatan@werpers.com>
parents: 388
diff changeset
116 l2(v) = sqrt(prod(h)*sum(v.^2))
0433ab553d13 Rewrite l2 norm comparison to use the norm key word of isapprox
Jonatan Werpers <jonatan@werpers.com>
parents: 388
diff changeset
117 @test L*v4 ≈ v2 atol=5e-4 norm=l2
0433ab553d13 Rewrite l2 norm comparison to use the norm key word of isapprox
Jonatan Werpers <jonatan@werpers.com>
parents: 388
diff changeset
118 @test L*v5 ≈ v5ₓₓ atol=5e-4 norm=l2
254
4ca3794fffef Add apply_quadrature to SbpOperators
Jonatan Werpers <jonatan@werpers.com>
parents: 219
diff changeset
119 end
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
120
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
121 @testset "DiagonalInnerProduct" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
122 op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
123 L = 2.3
388
5223872485cd Clean up grid creation
Jonatan Werpers <jonatan@werpers.com>
parents: 387
diff changeset
124 g = EquidistantGrid(77, 0.0, L)
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
125 H = DiagonalInnerProduct(g,op.quadratureClosure)
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
126 v = ones(Float64, size(g))
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
127
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
128 @test H isa TensorMapping{T,1,1} where T
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
129 @test H' isa TensorMapping{T,1,1} where T
383
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
130 @test sum(H*v) ≈ L
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
131 @test H*v == H'*v
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
132 end
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
133
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
134 @testset "Quadrature" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
135 op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
136 Lx = 2.3
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
137 Ly = 5.2
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
138 g = EquidistantGrid((77,66), (0.0, 0.0), (Lx,Ly))
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
139
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
140 Q = Quadrature(g, op.quadratureClosure)
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
141
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
142 @test Q isa TensorMapping{T,2,2} where T
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
143 @test Q' isa TensorMapping{T,2,2} where T
382
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
144
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
145 v = ones(Float64, size(g))
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
146 @test sum(Q*v) ≈ Lx*Ly
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
147
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
148 v = 2*ones(Float64, size(g))
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
149 @test_broken sum(Q*v) ≈ 2*Lx*Ly
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
150
5c10cd0ed1fe testSbpOperators.jl: Add a test for Quadrature and mark some tests broken
Jonatan Werpers <jonatan@werpers.com>
parents: 379
diff changeset
151 @test Q*v == Q'*v
328
9cc5d1498b2d Refactor 1D diagonal inner product in quadrature.jl to separate file. Write tests for quadratures. Clean up laplace and secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 314
diff changeset
152 end
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
153
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
154 @testset "InverseDiagonalInnerProduct" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
155 op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
156 L = 2.3
388
5223872485cd Clean up grid creation
Jonatan Werpers <jonatan@werpers.com>
parents: 387
diff changeset
157 g = EquidistantGrid(77, 0.0, L)
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
158 H = DiagonalInnerProduct(g, op.quadratureClosure)
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
159 Hi = InverseDiagonalInnerProduct(g,op.quadratureClosure)
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
160 v = evalOn(g, x->sin(x))
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
161
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
162 @test Hi isa TensorMapping{T,1,1} where T
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
163 @test Hi' isa TensorMapping{T,1,1} where T
387
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
164 @test Hi*H*v ≈ v
383
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
165 @test Hi*v == Hi'*v
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
166 end
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
167
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
168 @testset "InverseQuadrature" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
169 op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
170 Lx = 7.3
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
171 Ly = 8.2
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
172 g = EquidistantGrid((77,66), (0.0, 0.0), (Lx,Ly))
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
173
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
174 Q = Quadrature(g, op.quadratureClosure)
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
175 Qinv = InverseQuadrature(g, op.quadratureClosure)
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
176 v = evalOn(g, (x,y)-> x^2 + (y-1)^2 + x*y)
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
177
356
0844069ab5ff Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents: 338
diff changeset
178 @test Qinv isa TensorMapping{T,2,2} where T
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
179 @test Qinv' isa TensorMapping{T,2,2} where T
383
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
180 @test_broken Qinv*(Q*v) ≈ v
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
181 @test Qinv*v == Qinv'*v
329
408c37b295c2 Refactor 1D tensor mapping in inverse quadrature to separate file, InverseDiagonalNorm. Add tests
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 328
diff changeset
182 end
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
183
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
184 @testset "BoundaryRestrictrion" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
185 op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
568
34d9e10f0001 Make grid larger in test to make sure there all kinds of regions are represented
Jonatan Werpers <jonatan@werpers.com>
parents: 567
diff changeset
186 g_1D = EquidistantGrid(11, 0.0, 1.0)
34d9e10f0001 Make grid larger in test to make sure there all kinds of regions are represented
Jonatan Werpers <jonatan@werpers.com>
parents: 567
diff changeset
187 g_2D = EquidistantGrid((11,15), (0.0, 0.0), (1.0,1.0))
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
188
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
189 @testset "Constructors" begin
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
190 @testset "1D" begin
580
0779713f95a2 Add constructor that infers T and N
Jonatan Werpers <jonatan@werpers.com>
parents: 578
diff changeset
191 e_l = BoundaryRestriction{Lower}(op.eClosure,size(g_1D)[1])
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
192 @test e_l == BoundaryRestriction(g_1D,op.eClosure,Lower())
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
193 @test e_l == boundary_restriction(g_1D,op.eClosure,CartesianBoundary{1,Lower}())
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
194 @test e_l isa TensorMapping{T,0,1} where T
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
195
580
0779713f95a2 Add constructor that infers T and N
Jonatan Werpers <jonatan@werpers.com>
parents: 578
diff changeset
196 e_r = BoundaryRestriction{Upper}(op.eClosure,size(g_1D)[1])
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
197 @test e_r == BoundaryRestriction(g_1D,op.eClosure,Upper())
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
198 @test e_r == boundary_restriction(g_1D,op.eClosure,CartesianBoundary{1,Upper}())
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
199 @test e_r isa TensorMapping{T,0,1} where T
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
200 end
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
201
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
202 @testset "2D" begin
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
203 e_w = boundary_restriction(g_2D,op.eClosure,CartesianBoundary{1,Upper}())
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
204 @test e_w isa InflatedTensorMapping
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
205 @test e_w isa TensorMapping{T,1,2} where T
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
206 end
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
207 end
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
208
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
209 e_l = boundary_restriction(g_1D, op.eClosure, CartesianBoundary{1,Lower}())
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
210 e_r = boundary_restriction(g_1D, op.eClosure, CartesianBoundary{1,Upper}())
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
211
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
212 e_w = boundary_restriction(g_2D, op.eClosure, CartesianBoundary{1,Lower}())
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
213 e_e = boundary_restriction(g_2D, op.eClosure, CartesianBoundary{1,Upper}())
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
214 e_s = boundary_restriction(g_2D, op.eClosure, CartesianBoundary{2,Lower}())
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
215 e_n = boundary_restriction(g_2D, op.eClosure, CartesianBoundary{2,Upper}())
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
216
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
217 @testset "Sizes" begin
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
218 @testset "1D" begin
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
219 @test domain_size(e_l) == (11,)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
220 @test domain_size(e_r) == (11,)
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
221
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
222 @test range_size(e_l) == ()
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
223 @test range_size(e_r) == ()
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
224 end
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
225
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
226 @testset "2D" begin
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
227 @test domain_size(e_w) == (11,15)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
228 @test domain_size(e_e) == (11,15)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
229 @test domain_size(e_s) == (11,15)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
230 @test domain_size(e_n) == (11,15)
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
231
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
232 @test range_size(e_w) == (15,)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
233 @test range_size(e_e) == (15,)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
234 @test range_size(e_s) == (11,)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
235 @test range_size(e_n) == (11,)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
236 end
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
237 end
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
238
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
239
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
240 @testset "Application" begin
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
241 @testset "1D" begin
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
242 v = evalOn(g_1D,x->1+x^2)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
243 u = fill(3.124)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
244 @test (e_l*v)[] == v[1]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
245 @test (e_r*v)[] == v[end]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
246 @test (e_r*v)[1] == v[end]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
247 @test e_l'*u == [u[]; zeros(10)]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
248 @test e_r'*u == [zeros(10); u[]]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
249 end
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
250
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
251 @testset "2D" begin
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
252 v = rand(11, 15)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
253 u = fill(3.124)
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
254
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
255 @test e_w*v == v[1,:]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
256 @test e_e*v == v[end,:]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
257 @test e_s*v == v[:,1]
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
258 @test e_n*v == v[:,end]
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
259
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
260
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
261 g_x = rand(11)
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
262 g_y = rand(15)
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
263
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
264 G_w = zeros(Float64, (11,15))
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
265 G_w[1,:] = g_y
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
266
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
267 G_e = zeros(Float64, (11,15))
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
268 G_e[end,:] = g_y
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
269
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
270 G_s = zeros(Float64, (11,15))
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
271 G_s[:,1] = g_x
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
272
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
273 G_n = zeros(Float64, (11,15))
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
274 G_n[:,end] = g_x
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
275
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
276 @test e_w'*g_y == G_w
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
277 @test e_e'*g_y == G_e
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
278 @test e_s'*g_x == G_s
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
279 @test e_n'*g_x == G_n
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
280 end
573
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
281
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
282 @testset "Regions" begin
576
1d4417ced79f Put test sets around 1d and 2d tests
Jonatan Werpers <jonatan@werpers.com>
parents: 575
diff changeset
283 u = fill(3.124)
573
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
284 @test (e_l'*u)[Index(1,Lower)] == 3.124
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
285 @test (e_l'*u)[Index(2,Lower)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
286 @test (e_l'*u)[Index(6,Interior)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
287 @test (e_l'*u)[Index(10,Upper)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
288 @test (e_l'*u)[Index(11,Upper)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
289
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
290 @test (e_r'*u)[Index(1,Lower)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
291 @test (e_r'*u)[Index(2,Lower)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
292 @test (e_r'*u)[Index(6,Interior)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
293 @test (e_r'*u)[Index(10,Upper)] == 0
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
294 @test (e_r'*u)[Index(11,Upper)] == 3.124
4e2490f568aa Add tests for apply_transpose and different regions
Jonatan Werpers <jonatan@werpers.com>
parents: 572
diff changeset
295 end
544
884be64e82d9 Add test case illustrating issue in split_index for region indices.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 519
diff changeset
296 end
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
297
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
298 @testset "Inferred" begin
568
34d9e10f0001 Make grid larger in test to make sure there all kinds of regions are represented
Jonatan Werpers <jonatan@werpers.com>
parents: 567
diff changeset
299 v = ones(Float64, 11)
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
300 u = fill(1.)
575
5691606851d8 Simplify and extend tests for type inferenca
Jonatan Werpers <jonatan@werpers.com>
parents: 574
diff changeset
301
578
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
302 @inferred apply(e_l, v)
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
303 @inferred apply(e_r, v)
575
5691606851d8 Simplify and extend tests for type inferenca
Jonatan Werpers <jonatan@werpers.com>
parents: 574
diff changeset
304
578
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
305 @inferred apply_transpose(e_l, u, 4)
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
306 @inferred apply_transpose(e_l, u, Index(1,Lower))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
307 @inferred apply_transpose(e_l, u, Index(2,Lower))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
308 @inferred apply_transpose(e_l, u, Index(6,Interior))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
309 @inferred apply_transpose(e_l, u, Index(10,Upper))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
310 @inferred apply_transpose(e_l, u, Index(11,Upper))
575
5691606851d8 Simplify and extend tests for type inferenca
Jonatan Werpers <jonatan@werpers.com>
parents: 574
diff changeset
311
578
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
312 @inferred apply_transpose(e_r, u, 4)
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
313 @inferred apply_transpose(e_r, u, Index(1,Lower))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
314 @inferred apply_transpose(e_r, u, Index(2,Lower))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
315 @inferred apply_transpose(e_r, u, Index(6,Interior))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
316 @inferred apply_transpose(e_r, u, Index(10,Upper))
b24b910a9025 Change inference test to be more explicit about what methods are tested
Jonatan Werpers <jonatan@werpers.com>
parents: 576
diff changeset
317 @inferred apply_transpose(e_r, u, Index(11,Upper))
565
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
318 end
15423a868d28 Restructure and extend tests for BoundaryRestriction
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 562
diff changeset
319
513
547639572208 Get some kind of tested working implementation.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 397
diff changeset
320 end
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
321 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
322 # @testset "NormalDerivative" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
323 # op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
324 # g = EquidistantGrid((5,6), (0.0, 0.0), (4.0,5.0))
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
325 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
326 # d_w = NormalDerivative(op, g, CartesianBoundary{1,Lower}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
327 # d_e = NormalDerivative(op, g, CartesianBoundary{1,Upper}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
328 # d_s = NormalDerivative(op, g, CartesianBoundary{2,Lower}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
329 # d_n = NormalDerivative(op, g, CartesianBoundary{2,Upper}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
330 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
331 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
332 # v = evalOn(g, (x,y)-> x^2 + (y-1)^2 + x*y)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
333 # v∂x = evalOn(g, (x,y)-> 2*x + y)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
334 # v∂y = evalOn(g, (x,y)-> 2*(y-1) + x)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
335 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
336 # @test d_w isa TensorMapping{T,2,1} where T
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
337 # @test d_w' isa TensorMapping{T,1,2} where T
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
338 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
339 # @test domain_size(d_w, (3,2)) == (2,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
340 # @test domain_size(d_e, (3,2)) == (2,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
341 # @test domain_size(d_s, (3,2)) == (3,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
342 # @test domain_size(d_n, (3,2)) == (3,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
343 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
344 # @test size(d_w'*v) == (6,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
345 # @test size(d_e'*v) == (6,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
346 # @test size(d_s'*v) == (5,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
347 # @test size(d_n'*v) == (5,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
348 #
387
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
349 # @test d_w'*v .≈ v∂x[1,:]
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
350 # @test d_e'*v .≈ v∂x[5,:]
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
351 # @test d_s'*v .≈ v∂y[:,1]
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
352 # @test d_n'*v .≈ v∂y[:,6]
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
353 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
354 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
355 # d_x_l = zeros(Float64, 5)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
356 # d_x_u = zeros(Float64, 5)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
357 # for i ∈ eachindex(d_x_l)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
358 # d_x_l[i] = op.dClosure[i-1]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
359 # d_x_u[i] = -op.dClosure[length(d_x_u)-i]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
360 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
361 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
362 # d_y_l = zeros(Float64, 6)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
363 # d_y_u = zeros(Float64, 6)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
364 # for i ∈ eachindex(d_y_l)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
365 # d_y_l[i] = op.dClosure[i-1]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
366 # d_y_u[i] = -op.dClosure[length(d_y_u)-i]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
367 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
368 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
369 # function prod_matrix(x,y)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
370 # G = zeros(Float64, length(x), length(y))
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
371 # for I ∈ CartesianIndices(G)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
372 # G[I] = x[I[1]]*y[I[2]]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
373 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
374 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
375 # return G
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
376 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
377 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
378 # g_x = [1,2,3,4.0,5]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
379 # g_y = [5,4,3,2,1.0,11]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
380 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
381 # G_w = prod_matrix(d_x_l, g_y)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
382 # G_e = prod_matrix(d_x_u, g_y)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
383 # G_s = prod_matrix(g_x, d_y_l)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
384 # G_n = prod_matrix(g_x, d_y_u)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
385 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
386 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
387 # @test size(d_w*g_y) == (UnknownDim,6)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
388 # @test size(d_e*g_y) == (UnknownDim,6)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
389 # @test size(d_s*g_x) == (5,UnknownDim)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
390 # @test size(d_n*g_x) == (5,UnknownDim)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
391 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
392 # # These tests should be moved to where they are possible (i.e we know what the grid should be)
387
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
393 # @test_broken d_w*g_y .≈ G_w
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
394 # @test_broken d_e*g_y .≈ G_e
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
395 # @test_broken d_s*g_x .≈ G_s
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
396 # @test_broken d_n*g_x .≈ G_n
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
397 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
398 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
399 # @testset "BoundaryQuadrature" begin
594
cc86b920531a Change the readoperator function to use the .toml format
Jonatan Werpers <jonatan@werpers.com>
parents: 586
diff changeset
400 # op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
401 # g = EquidistantGrid((10,11), (0.0, 0.0), (1.0,1.0))
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
402 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
403 # H_w = BoundaryQuadrature(op, g, CartesianBoundary{1,Lower}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
404 # H_e = BoundaryQuadrature(op, g, CartesianBoundary{1,Upper}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
405 # H_s = BoundaryQuadrature(op, g, CartesianBoundary{2,Lower}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
406 # H_n = BoundaryQuadrature(op, g, CartesianBoundary{2,Upper}())
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
407 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
408 # v = evalOn(g, (x,y)-> x^2 + (y-1)^2 + x*y)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
409 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
410 # function get_quadrature(N)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
411 # qc = op.quadratureClosure
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
412 # q = (qc..., ones(N-2*closuresize(op))..., reverse(qc)...)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
413 # @assert length(q) == N
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
414 # return q
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
415 # end
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
416 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
417 # v_w = v[1,:]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
418 # v_e = v[10,:]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
419 # v_s = v[:,1]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
420 # v_n = v[:,11]
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
421 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
422 # q_x = spacing(g)[1].*get_quadrature(10)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
423 # q_y = spacing(g)[2].*get_quadrature(11)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
424 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
425 # @test H_w isa TensorOperator{T,1} where T
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
426 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
427 # @test domain_size(H_w, (3,)) == (3,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
428 # @test domain_size(H_n, (3,)) == (3,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
429 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
430 # @test range_size(H_w, (3,)) == (3,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
431 # @test range_size(H_n, (3,)) == (3,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
432 #
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
433 # @test size(H_w*v_w) == (11,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
434 # @test size(H_e*v_e) == (11,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
435 # @test size(H_s*v_s) == (10,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
436 # @test size(H_n*v_n) == (10,)
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
437 #
387
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
438 # @test H_w*v_w .≈ q_y.*v_w
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
439 # @test H_e*v_e .≈ q_y.*v_e
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
440 # @test H_s*v_s .≈ q_x.*v_s
4686c3509b54 Switch to using isapprox operator
Jonatan Werpers <jonatan@werpers.com>
parents: 385
diff changeset
441 # @test H_n*v_n .≈ q_x.*v_n
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
442 #
383
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
443 # @test H_w'*v_w == H_w'*v_w
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
444 # @test H_e'*v_e == H_e'*v_e
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
445 # @test H_s'*v_s == H_s'*v_s
aaf8e331cb80 Remove collects around TensorMappingApplications
Jonatan Werpers <jonatan@werpers.com>
parents: 382
diff changeset
446 # @test H_n'*v_n == H_n'*v_n
314
accb0876da12 Move tests for Laplace from DiffOps/test to SbpOperators/test and add test for Secondderivative
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents: 254
diff changeset
447 # end
338
2b0c9b30ea3b Add test sets for each submodule to make the test output nicer
Jonatan Werpers <jonatan@werpers.com>
parents: 335
diff changeset
448
2b0c9b30ea3b Add test sets for each submodule to make the test output nicer
Jonatan Werpers <jonatan@werpers.com>
parents: 335
diff changeset
449 end