[WIP]: Making bc_coeff_compositions tests pass

Author: shivin9

src/derivative_operators/convolutions.jl

@@ -35,11 +35,18 @@ end
 function convolve_BC_left!(x_temp::AbstractVector{T}, x::AbstractVector{T}, A::DerivativeOperator) where {T<:Real}
     stencil = A.low_boundary_coefs
     coeff   = A.coefficients
-    for i in 1 : A.boundary_point_count
-        cur_stencil = stencil[i]
 
-        if cur_stencil == []
+    _bpc = A.boundary_point_count
+
+    if cur_stencil == []
+        _bpc = A.boundary_point_count + 1
+    end
+
+    for i in 1 : _bpc
+        if _bpc == 1
             cur_stencil = A.stencil_coefs
+        else
+            cur_stencil = stencil[i]
         end
 
         cur_coeff   = typeof(coeff)   <: AbstractVector ? coeff[i] : coeff isa Number ? coeff : true
@@ -57,11 +64,18 @@ function convolve_BC_right!(x_temp::AbstractVector{T}, x::AbstractVector{T}, A::
     coeff   = A.coefficients
     N       = length(x)
     L       = A.boundary_stencil_length
-    for i in 1 : A.boundary_point_count
-        cur_stencil = stencil[i]
 
-        if cur_stencil == []
+    _bpc = A.boundary_point_count
+
+    if cur_stencil == []
+        _bpc = 1
+    end
+
+    for i in 1 : _bpc
+        if _bpc == 1
             cur_stencil = A.stencil_coefs
+        else
+            cur_stencil = stencil[i]
         end
 
         cur_coeff   = typeof(coeff)   <: AbstractVector ? coeff[i] : coeff isa Number ? coeff : true
@@ -109,11 +123,18 @@ end
 function convolve_BC_left!(x_temp::AbstractVector{T}, _x::BoundaryPaddedVector, A::DerivativeOperator) where {T<:Real}
     stencil = A.low_boundary_coefs
     coeff   = A.coefficients
-    for i in 1 : A.boundary_point_count
-        cur_stencil = stencil[i]
 
-        if cur_stencil == []
+    _bpc = A.boundary_point_count
+
+    if cur_stencil == []
+        _bpc = 1
+    end
+
+    for i in 1 : _bpc
+        if _bpc == 1
             cur_stencil = A.stencil_coefs
+        else
+            cur_stencil = stencil[i]
         end
 
         cur_coeff   = typeof(coeff)   <: AbstractVector ? coeff[i] : coeff isa Number ? coeff : true
@@ -156,8 +177,20 @@ function convolve_BC_right!(x_temp::AbstractVector{T}, _x::BoundaryPaddedVector,
     L = A.boundary_stencil_length
 
     bc_start = N - bpc + 1
-    for i in 1 : A.boundary_point_count
-        cur_stencil = stencil[i]
+
+    _bpc = A.boundary_point_count
+
+    if cur_stencil == []
+        _bpc = 1
+    end
+
+    for i in 1 : _bpc
+        if _bpc == 1
+            cur_stencil = A.stencil_coefs
+        else
+            cur_stencil = stencil[i]
+        end
+
         cur_coeff   = typeof(coeff)   <: AbstractVector ? coeff[bc_start + i] : coeff isa Number ? coeff : true
         xtempi = cur_coeff*cur_stencil[end]*_x.r
         cur_stencil = use_winding(A) && cur_coeff < 0 ? reverse(cur_stencil) : cur_stencil

src/derivative_operators/derivative_operator.jl

@@ -27,7 +27,7 @@ function CenteredDifference{N}(derivative_order::Int,
     left_boundary_x         = 0:(boundary_stencil_length-1)
     right_boundary_x        = reverse(-boundary_stencil_length+1:0)
 
-    boundary_point_count    = max(1, div(stencil_length,2) - 1) # -1 due to the ghost point
+    boundary_point_count    = div(stencil_length,2) - 1 # -1 due to the ghost point
     # Because it's a N x (N+2) operator, the last stencil on the sides are the [b,0,x,x,x,x] stencils, not the [0,x,x,x,x,x] stencils, since we're never solving for the derivative at the boundary point.
     deriv_spots             = (-div(stencil_length,2)+1) : -1
     L_boundary_deriv_spots  = left_boundary_x[2:div(stencil_length,2)]
@@ -60,7 +60,7 @@ function CenteredDifference{N}(derivative_order::Int,
     stencil_length          = derivative_order + approximation_order - 1 + (derivative_order+approximation_order)%2
     boundary_stencil_length = derivative_order + approximation_order
     stencil_x               = zeros(T, stencil_length)
-    boundary_point_count    = max(1, div(stencil_length,2) - 1) # -1 due to the ghost point
+    boundary_point_count    = div(stencil_length,2) - 1# -1 due to the ghost point
 
     interior_x              = boundary_point_count+2:len+1-boundary_point_count
     dummy_x                 = -div(stencil_length,2) : div(stencil_length,2)-1
@@ -112,7 +112,7 @@ function UpwindDifference{N}(derivative_order::Int,
     boundary_stencil_length = derivative_order + approximation_order
     dummy_x                 = -div(stencil_length,2) : div(stencil_length,2)
     boundary_x              = -boundary_stencil_length+1:0
-    boundary_point_count    = max(1, div(stencil_length,2) - 1) # -1 due to the ghost point
+    boundary_point_count    = div(stencil_length,2) - 1 # -1 due to the ghost point
     # Because it's a N x (N+2) operator, the last stencil on the sides are the [b,0,x,x,x,x] stencils, not the [0,x,x,x,x,x] stencils, since we're never solving for the derivative at the boundary point.
     deriv_spots             = (-div(stencil_length,2)+1) : -1
     boundary_deriv_spots    = boundary_x[2:div(stencil_length,2)]
@@ -144,7 +144,7 @@ function UpwindDifference{N}(derivative_order::Int,
     boundary_stencil_length = derivative_order + approximation_order
     dummy_x                 = -div(stencil_length,2) : div(stencil_length,2)
     boundary_x              = -boundary_stencil_length+1:0
-    boundary_point_count    = max(div(stencil_length,2) - 1) # -1 due to the ghost point
+    boundary_point_count    = div(stencil_length,2) - 1 # -1 due to the ghost point
     # Because it's a N x (N+2) operator, the last stencil on the sides are the [b,0,x,x,x,x] stencils, not the [0,x,x,x,x,x] stencils, since we're never solving for the derivative at the boundary point.
     deriv_spots             = (-div(stencil_length,2)+1) : -1
     boundary_deriv_spots    = boundary_x[2:div(stencil_length,2)]

test/bc_coeff_compositions.jl

@@ -34,6 +34,7 @@ function second_derivative_stencil(N)
   A
 end
 
+
 @testset "Test Constructor, Multiplication, and Concretization" begin
     # Generate random parameters
     al = rand()