sbplib_julia: test/testSbpOperators.jl comparison

comparison test/testSbpOperators.jl @ 620:bfc893d03cbf feature/volume_and_boundary_operators

Add NormalDerivative as a BoundaryOperator and reintroduce tests.

author	Vidar Stiernström <vidar.stiernstrom@it.uu.se>
date	Mon, 07 Dec 2020 14:05:47 +0100
parents	332f65c1abf3
children	60d7c1752cfa

comparison

equal deleted inserted replaced

-:332f65c1abf3
+:bfc893d03cbf
 @test e_s'*g_x == G_s
 @test e_n'*g_x == G_n
 end
 end
 end
-#
-# @testset "NormalDerivative" begin
+@testset "NormalDerivative" begin
-#     op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
+op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
-#     g = EquidistantGrid((5,6), (0.0, 0.0), (4.0,5.0))
+g = EquidistantGrid((5,6), (0.0, 0.0), (4.0,5.0))
-#
-#     d_w = NormalDerivative(op, g, CartesianBoundary{1,Lower}())
+d_w = NormalDerivative(g, op.dClosure, CartesianBoundary{1,Lower}())
-#     d_e = NormalDerivative(op, g, CartesianBoundary{1,Upper}())
+d_e = NormalDerivative(g, op.dClosure, CartesianBoundary{1,Upper}())
-#     d_s = NormalDerivative(op, g, CartesianBoundary{2,Lower}())
+d_s = NormalDerivative(g, op.dClosure, CartesianBoundary{2,Lower}())
-#     d_n = NormalDerivative(op, g, CartesianBoundary{2,Upper}())
+d_n = NormalDerivative(g, op.dClosure, CartesianBoundary{2,Upper}())
-#
-#
-#     v = evalOn(g, (x,y)-> x^2 + (y-1)^2 + x*y)
+v = evalOn(g, (x,y)-> x^2 + (y-1)^2 + x*y)
-#     v∂x = evalOn(g, (x,y)-> 2*x + y)
+v∂x = evalOn(g, (x,y)-> 2*x + y)
-#     v∂y = evalOn(g, (x,y)-> 2*(y-1) + x)
+v∂y = evalOn(g, (x,y)-> 2*(y-1) + x)
-#
-#     @test d_w  isa TensorMapping{T,2,1} where T
+@test d_w isa TensorMapping{T,1,2} where T
-#     @test d_w' isa TensorMapping{T,1,2} where T
-#
+@test d_w*v ≈ v∂x[1,:]
-#     @test domain_size(d_w, (3,2)) == (2,)
+@test d_e*v ≈ -v∂x[end,:]
-#     @test domain_size(d_e, (3,2)) == (2,)
+@test d_s*v ≈ v∂y[:,1]
-#     @test domain_size(d_s, (3,2)) == (3,)
+@test d_n*v ≈ -v∂y[:,end]
-#     @test domain_size(d_n, (3,2)) == (3,)
-#
-#     @test size(d_w'*v) == (6,)
+d_x_l = zeros(Float64, size(g)[1])
-#     @test size(d_e'*v) == (6,)
+d_x_u = zeros(Float64, size(g)[1])
-#     @test size(d_s'*v) == (5,)
+for i ∈ eachindex(d_x_l)
-#     @test size(d_n'*v) == (5,)
+d_x_l[i] = op.dClosure[i-1]
-#
+d_x_u[i] = op.dClosure[length(d_x_u)-i]
-#     @test d_w'*v .≈ v∂x[1,:]
+end
-#     @test d_e'*v .≈ v∂x[5,:]
-#     @test d_s'*v .≈ v∂y[:,1]
+d_y_l = zeros(Float64, size(g)[2])
-#     @test d_n'*v .≈ v∂y[:,6]
+d_y_u = zeros(Float64, size(g)[2])
-#
+for i ∈ eachindex(d_y_l)
-#
+d_y_l[i] = op.dClosure[i-1]
-#     d_x_l = zeros(Float64, 5)
+d_y_u[i] = op.dClosure[length(d_y_u)-i]
-#     d_x_u = zeros(Float64, 5)
+end
-#     for i ∈ eachindex(d_x_l)
-#         d_x_l[i] = op.dClosure[i-1]
+function prod_matrix(x,y)
-#         d_x_u[i] = -op.dClosure[length(d_x_u)-i]
+G = zeros(Float64, length(x), length(y))
-#     end
+for I ∈ CartesianIndices(G)
-#
+G[I] = x[I[1]]*y[I[2]]
-#     d_y_l = zeros(Float64, 6)
+end
-#     d_y_u = zeros(Float64, 6)
-#     for i ∈ eachindex(d_y_l)
+return G
-#         d_y_l[i] = op.dClosure[i-1]
+end
-#         d_y_u[i] = -op.dClosure[length(d_y_u)-i]
-#     end
+g_x = [1,2,3,4.0,5]
-#
+g_y = [5,4,3,2,1.0,11]
-#     function prod_matrix(x,y)
-#         G = zeros(Float64, length(x), length(y))
+G_w = prod_matrix(d_x_l, g_y)
-#         for I ∈ CartesianIndices(G)
+G_e = prod_matrix(d_x_u, g_y)
-#             G[I] = x[I[1]]*y[I[2]]
+G_s = prod_matrix(g_x, d_y_l)
-#         end
+G_n = prod_matrix(g_x, d_y_u)
-#
-#         return G
+@test d_w'*g_y ≈ G_w
-#     end
+@test_broken d_e'*g_y ≈ G_e
-#
+@test d_s'*g_x ≈ G_s
-#     g_x = [1,2,3,4.0,5]
+@test_broken d_n'*g_x ≈ G_n
-#     g_y = [5,4,3,2,1.0,11]
+end
-#
-#     G_w = prod_matrix(d_x_l, g_y)
-#     G_e = prod_matrix(d_x_u, g_y)
-#     G_s = prod_matrix(g_x, d_y_l)
-#     G_n = prod_matrix(g_x, d_y_u)
-#
-#
-#     @test size(d_w*g_y) == (UnknownDim,6)
-#     @test size(d_e*g_y) == (UnknownDim,6)
-#     @test size(d_s*g_x) == (5,UnknownDim)
-#     @test size(d_n*g_x) == (5,UnknownDim)
-#
-#     # These tests should be moved to where they are possible (i.e we know what the grid should be)
-#     @test_broken d_w*g_y .≈ G_w
-#     @test_broken d_e*g_y .≈ G_e
-#     @test_broken d_s*g_x .≈ G_s
-#     @test_broken d_n*g_x .≈ G_n
-# end
 #
 # @testset "BoundaryQuadrature" begin
 #     op = read_D2_operator(sbp_operators_path()*"standard_diagonal.toml"; order=4)
 #     g = EquidistantGrid((10,11), (0.0, 0.0), (1.0,1.0))
 #

Mercurial > repos > public > sbplib_julia

comparison test/testSbpOperators.jl @ 620:bfc893d03cbf feature/volume_and_boundary_operators