changeset 245:d9e262cb2e8d boundary_conditions

Rename apply_e and _d to _e_T and _d_T. Implement _e _d and using them in laplace.jl
author Jonatan Werpers <jonatan@werpers.com>
date Thu, 27 Jun 2019 12:49:58 +0200
parents a827568fc251
children 3d83b4d78b55 05e7bbe0af97
files DiffOps/src/laplace.jl SbpOperators/src/SbpOperators.jl
diffstat 2 files changed, 39 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/DiffOps/src/laplace.jl	Wed Jun 26 21:22:36 2019 +0200
+++ b/DiffOps/src/laplace.jl	Thu Jun 27 12:49:58 2019 +0200
@@ -22,17 +22,13 @@
 	j = I[3-dim(d.bId)]
 	N_i = size(d.grid)[dim(d.bId)]
 
-	if region(d.bId) == Lower
-		# Note, closures are indexed by offset. Fix this D:<
-		return d.grid.inverse_spacing[dim(d.bId)]*d.op.dClosure[i-1]*v[j]
-	elseif region(d.bId) == Upper
-		return -d.grid.inverse_spacing[dim(d.bId)]*d.op.dClosure[N_i-i]*v[j]
-	end
+    h_inv = d.grid.inverse_spacing[dim(d.bId)]
+    return apply_d(d.op, h_inv, v[j], N_i, i, region(d.bId))
 end
 
 function LazyTensors.apply_transpose(d::NormalDerivative, v::AbstractArray, I::NTuple{1,Int})
     u = selectdim(v,3-dim(d.bId),I[1])
-    return apply_d(d.op, d.grid.inverse_spacing[dim(d.bId)], u, region(d.bId))
+    return apply_d_T(d.op, d.grid.inverse_spacing[dim(d.bId)], u, region(d.bId))
 end
 
 
@@ -58,17 +54,12 @@
 	j = I[3-dim(e.bId)]
 	N_i = size(e.grid)[dim(e.bId)]
 
-	if region(e.bId) == Lower
-		# NOTE: closures are indexed by offset. Fix this D:<
-		return e.op.eClosure[i-1]*v[j]
-	elseif region(e.bId) == Upper
-		return e.op.eClosure[N_i-i]*v[j]
-	end
+    return apply_e(e.op, v[j], N_i, i, region(e.bId))
 end
 
 function LazyTensors.apply_transpose(e::BoundaryValue, v::AbstractArray, I::NTuple{1,Int})
 	u = selectdim(v,3-dim(e.bId),I[1])
-	return apply_e(e.op, u, region(e.bId))
+	return apply_e_T(e.op, u, region(e.bId))
 end
 
 
--- a/SbpOperators/src/SbpOperators.jl	Wed Jun 26 21:22:36 2019 +0200
+++ b/SbpOperators/src/SbpOperators.jl	Thu Jun 27 12:49:58 2019 +0200
@@ -4,7 +4,7 @@
 
 include("stencil.jl")
 
-export D2, closureSize, apply, readOperator, apply_e, apply_d
+export D2, closureSize, apply, readOperator, apply_e, apply_d, apply_e_T, apply_d_T
 
 abstract type ConstantStencilOperator end
 
@@ -102,14 +102,14 @@
 end
 
 
-function apply_e(op::D2, v::AbstractVector, ::Type{Lower})
+function apply_e_T(op::D2, v::AbstractVector, ::Type{Lower})
     @boundscheck if length(v) < closureSize(op)
         throw(BoundsError())
     end
     apply(op.eClosure,v,1)
 end
 
-function apply_e(op::D2, v::AbstractVector, ::Type{Upper})
+function apply_e_T(op::D2, v::AbstractVector, ::Type{Upper})
     @boundscheck if length(v) < closureSize(op)
         throw(BoundsError())
     end
@@ -117,20 +117,49 @@
 end
 
 
-function apply_d(op::D2, h_inv::Real, v::AbstractVector, ::Type{Lower})
+function apply_e(op::D2, v::Number, N::Integer, i::Integer, ::Type{Lower})
+    @boundscheck if !(0<length(i) <= N)
+        throw(BoundsError())
+    end
+    op.eClosure[i-1]*v
+end
+
+function apply_e(op::D2, v::Number, N::Integer, i::Integer, ::Type{Upper})
+    @boundscheck if !(0<length(i) <= N)
+        throw(BoundsError())
+    end
+    op.eClosure[N-i]*v
+end
+
+function apply_d_T(op::D2, h_inv::Real, v::AbstractVector, ::Type{Lower})
     @boundscheck if length(v) < closureSize(op)
         throw(BoundsError())
     end
     h_inv*apply(op.dClosure,v,1)
 end
 
-function apply_d(op::D2, h_inv::Real, v::AbstractVector, ::Type{Upper})
+function apply_d_T(op::D2, h_inv::Real, v::AbstractVector, ::Type{Upper})
     @boundscheck if length(v) < closureSize(op)
         throw(BoundsError())
     end
     -h_inv*apply(flip(op.dClosure),v,length(v))
 end
 
+function apply_d(op::D2, h_inv::Real, v::Number, N::Integer, i::Integer, ::Type{Lower})
+    @boundscheck if !(0<length(i) <= N)
+        throw(BoundsError())
+    end
+    h_inv*op.dClosure[i-1]*v
+end
+
+function apply_d(op::D2, h_inv::Real, v::Number, N::Integer, i::Integer, ::Type{Upper})
+    @boundscheck if !(0<length(i) <= N)
+        throw(BoundsError())
+    end
+    -h_inv*op.dClosure[N-i]*v
+end
+
+
 function readSectionedFile(filename)::Dict{String, Vector{String}}
     f = open(filename)
     sections = Dict{String, Vector{String}}()