add tests for regular-irrgular cases

Author: ajozefiak

test/2D_3D_fast_multiplication.jl

@@ -477,8 +477,6 @@ end
     # Ly4 has 2 boundary points
     Ly4 = 4.567*CenteredDifference{2}(4,4,dy,N)
 
-
-
     # Test composition of all first-dimension operators
     A = Lx2+Lx3+Lx4
     M_temp = zeros(N,N+2)
@@ -498,3 +496,97 @@ end
     @test M_temp ≈ ((Lx2*M)[1:N,2:N+1]+(Lx3*M)[1:N,2:N+1]+(Lx4*M)[1:N,2:N+1]+(Ly2*M)[2:N+1,1:N]+(Ly3*M)[2:N+1,1:N]+(Ly4*M)[2:N+1,1:N])
 
 end
+
+@testset "regular x grid (dx=0.25) and irregular y grid" begin
+
+    N = 100
+    dx = 0.25
+    dy = cumsum(rand(N+2))
+    M = zeros(N+2,N+2)
+
+    for i in 1:N+2
+        for j in 1:N+2
+            M[i,j] = cos(dx*i)+sin(dy[j])
+        end
+    end
+
+    # Lx2 has 0 boundary points
+    Lx2 = CenteredDifference{1}(2,2,dx,N)
+    # Lx3 has 1 boundary point
+    Lx3 = 1.45*CenteredDifference{1}(3,3,dx,N)
+    # Lx4 has 2 boundary points
+    Lx4 = CenteredDifference{1}(4,4,dx,N)
+
+    # Ly2 has 0 boundary points
+    Ly2 = 8.14*CenteredDifference{2}(2,2,dy,N)
+    # Ly3 has 1 boundary point
+    Ly3 = CenteredDifference{2}(3,3,dy,N)
+    # Ly4 has 2 boundary points
+    Ly4 = 4.567*CenteredDifference{2}(4,4,dy,N)
+
+    # Test that composition of all x-operators works
+    A = Lx2 + Lx3 + Lx4
+    M_temp = zeros(N,N+2)
+    mul!(M_temp, A, M)
+    @test M_temp ≈ (Lx2*M + Lx3*M + Lx4*M)
+
+    # Test that composition of all y-operators works
+    A = Ly2 + Ly3 + Ly4
+    M_temp = zeros(N+2,N)
+    mul!(M_temp, A, M)
+    @test M_temp ≈ (Ly2*M + Ly3*M + Ly4*M)
+
+    # Test that composition of both x and y operators works
+    A = Lx2 + Ly2 + Lx3 + Ly3 + Ly4 + Lx4
+    M_temp = zeros(N,N)
+    @test_broken mul!(M_temp, A, M)
+    @test_broken M_temp ≈ ((Lx2*M)[1:N,2:N+1]+(Lx3*M)[1:N,2:N+1]+(Lx4*M)[1:N,2:N+1]+(Ly2*M)[2:N+1,1:N]+(Ly3*M)[2:N+1,1:N]+(Ly4*M)[2:N+1,1:N])
+
+end
+
+@testset "irregular x grid and regular y grid (dy = 0.25)" begin
+
+    N = 100
+    dy = 0.25
+    dx = cumsum(rand(N+2))
+    M = zeros(N+2,N+2)
+
+    for i in 1:N+2
+        for j in 1:N+2
+            M[i,j] = cos(dx[i])+sin(dy*j)
+        end
+    end
+
+    # Lx2 has 0 boundary points
+    Lx2 = CenteredDifference{1}(2,2,dx,N)
+    # Lx3 has 1 boundary point
+    Lx3 = 1.45*CenteredDifference{1}(3,3,dx,N)
+    # Lx4 has 2 boundary points
+    Lx4 = CenteredDifference{1}(4,4,dx,N)
+
+    # Ly2 has 0 boundary points
+    Ly2 = 8.14*CenteredDifference{2}(2,2,dy,N)
+    # Ly3 has 1 boundary point
+    Ly3 = CenteredDifference{2}(3,3,dy,N)
+    # Ly4 has 2 boundary points
+    Ly4 = 4.567*CenteredDifference{2}(4,4,dy,N)
+
+    # Test that composition of all x-operators works
+    A = Lx2 + Lx3 + Lx4
+    M_temp = zeros(N,N+2)
+    mul!(M_temp, A, M)
+    @test M_temp ≈ (Lx2*M + Lx3*M + Lx4*M)
+
+    # Test that composition of all y-operators works
+    A = Ly2 + Ly3 + Ly4
+    M_temp = zeros(N+2,N)
+    mul!(M_temp, A, M)
+    @test M_temp ≈ (Ly2*M + Ly3*M + Ly4*M)
+
+    # Test that composition of both x and y operators works
+    A = Lx2 + Ly2 + Lx3 + Ly3 + Ly4 + Lx4
+    M_temp = zeros(N,N)
+    @test_broken mul!(M_temp, A, M)
+    @test_broken M_temp ≈ ((Lx2*M)[1:N,2:N+1]+(Lx3*M)[1:N,2:N+1]+(Lx4*M)[1:N,2:N+1]+(Ly2*M)[2:N+1,1:N]+(Ly3*M)[2:N+1,1:N]+(Ly4*M)[2:N+1,1:N])
+
+end