diff test/SbpOperators/boundaryops/boundary_restriction_test.jl @ 1207:f1c2a4fa0ee1 performance/get_region_type_inference

Merge default
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 03 Feb 2023 22:14:47 +0100
parents 7fc8df5157a7
children 1cc45207817e
line wrap: on
line diff
--- a/test/SbpOperators/boundaryops/boundary_restriction_test.jl	Mon Feb 21 10:33:58 2022 +0100
+++ b/test/SbpOperators/boundaryops/boundary_restriction_test.jl	Fri Feb 03 22:14:47 2023 +0100
@@ -2,10 +2,9 @@
 
 using Sbplib.SbpOperators
 using Sbplib.Grids
+using Sbplib.LazyTensors
 using Sbplib.RegionIndices
-using Sbplib.LazyTensors
-
-import Sbplib.SbpOperators.BoundaryOperator
+using Sbplib.SbpOperators: BoundaryOperator, Stencil
 
 @testset "boundary_restriction" begin
 	stencil_set = read_stencil_set(sbp_operators_path()*"standard_diagonal.toml"; order = 4)
@@ -15,31 +14,30 @@
 
     @testset "boundary_restriction" begin
         @testset "1D" begin
-            e_l = boundary_restriction(g_1D,e_closure,Lower())
-            @test e_l == boundary_restriction(g_1D,e_closure,CartesianBoundary{1,Lower}())
+            e_l = boundary_restriction(g_1D,e_closure,CartesianBoundary{1,Lower}())
+            @test e_l == boundary_restriction(g_1D,stencil_set,CartesianBoundary{1,Lower}())
             @test e_l == BoundaryOperator(g_1D,Stencil{Float64}(e_closure),Lower())
             @test e_l isa BoundaryOperator{T,Lower} where T
-            @test e_l isa TensorMapping{T,0,1} where T
+            @test e_l isa LazyTensor{T,0,1} where T
 
-            e_r = boundary_restriction(g_1D,e_closure,Upper())
-            @test e_r == boundary_restriction(g_1D,e_closure,CartesianBoundary{1,Upper}())
+            e_r = boundary_restriction(g_1D,e_closure,CartesianBoundary{1,Upper}())
+            @test e_r == boundary_restriction(g_1D,stencil_set,CartesianBoundary{1,Upper}())
             @test e_r == BoundaryOperator(g_1D,Stencil{Float64}(e_closure),Upper())
             @test e_r isa BoundaryOperator{T,Upper} where T
-            @test e_r isa TensorMapping{T,0,1} where T
+            @test e_r isa LazyTensor{T,0,1} where T
         end
 
         @testset "2D" begin
             e_w = boundary_restriction(g_2D,e_closure,CartesianBoundary{1,Upper}())
-            @test e_w isa InflatedTensorMapping
-            @test e_w isa TensorMapping{T,1,2} where T
+            @test e_w == boundary_restriction(g_2D,stencil_set,CartesianBoundary{1,Upper}())
+            @test e_w isa InflatedTensor
+            @test e_w isa LazyTensor{T,1,2} where T
         end
     end
 
     @testset "Application" begin
         @testset "1D" begin
-            e_l = boundary_restriction(g_1D, e_closure, CartesianBoundary{1,Lower}())
-            e_r = boundary_restriction(g_1D, e_closure, CartesianBoundary{1,Upper}())
-
+            e_l, e_r = boundary_restriction.(Ref(g_1D), Ref(e_closure), boundary_identifiers(g_1D))
             v = evalOn(g_1D,x->1+x^2)
             u = fill(3.124)
 
@@ -49,11 +47,7 @@
         end
 
         @testset "2D" begin
-            e_w = boundary_restriction(g_2D, e_closure, CartesianBoundary{1,Lower}())
-            e_e = boundary_restriction(g_2D, e_closure, CartesianBoundary{1,Upper}())
-            e_s = boundary_restriction(g_2D, e_closure, CartesianBoundary{2,Lower}())
-            e_n = boundary_restriction(g_2D, e_closure, CartesianBoundary{2,Upper}())
-
+            e_w, e_e, e_s, e_n = boundary_restriction.(Ref(g_2D), Ref(e_closure), boundary_identifiers(g_2D))
             v = rand(11, 15)
             u = fill(3.124)