diff src/SbpOperators/boundaryops/boundary_operator.jl @ 1047:d12ab8120d29 feature/first_derivative

Merge default
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 23 Mar 2022 12:43:03 +0100
parents 1ba8a398af9c
children 52f07c77299d 3bb94ce74697 fc57804c9bf4
line wrap: on
line diff
--- a/src/SbpOperators/boundaryops/boundary_operator.jl	Wed Mar 23 12:39:35 2022 +0100
+++ b/src/SbpOperators/boundaryops/boundary_operator.jl	Wed Mar 23 12:43:03 2022 +0100
@@ -6,7 +6,7 @@
 
 When `Dim=1`, the corresponding `BoundaryOperator` tensor mapping is returned.
 When `Dim>1`, the `BoundaryOperator` `op` is inflated by the outer product
-of `IdentityMappings` in orthogonal coordinate directions, e.g for `Dim=3`,
+of `IdentityTensors` in orthogonal coordinate directions, e.g for `Dim=3`,
 the boundary restriction operator in the y-direction direction is `Ix⊗op⊗Iz`.
 """
 function boundary_operator(grid::EquidistantGrid, closure_stencil, boundary::CartesianBoundary)
@@ -17,9 +17,9 @@
     d = dim(boundary)
     op = BoundaryOperator(restrict(grid, d), closure_stencil, r)
 
-    # Create 1D IdentityMappings for each coordinate direction
+    # Create 1D IdentityTensors for each coordinate direction
     one_d_grids = restrict.(Ref(grid), Tuple(1:dimension(grid)))
-    Is = IdentityMapping{eltype(grid)}.(size.(one_d_grids))
+    Is = IdentityTensor{eltype(grid)}.(size.(one_d_grids))
 
     # Formulate the correct outer product sequence of the identity mappings and
     # the boundary operator
@@ -28,15 +28,15 @@
 end
 
 """
-    BoundaryOperator{T,R,N} <: TensorMapping{T,0,1}
+    BoundaryOperator{T,R,N} <: LazyTensor{T,0,1}
 
-Implements the boundary operator `op` for 1D as a `TensorMapping`
+Implements the boundary operator `op` for 1D as a `LazyTensor`
 
 `op` is the restriction of a grid function to the boundary using some closure `Stencil{T,N}`.
 The boundary to restrict to is determined by `R`.
 `op'` is the prolongation of a zero dimensional array to the whole grid using the same closure stencil.
 """
-struct BoundaryOperator{T,R<:Region,N} <: TensorMapping{T,0,1}
+struct BoundaryOperator{T,R<:Region,N} <: LazyTensor{T,0,1}
     stencil::Stencil{T,N}
     size::Int
 end
@@ -62,28 +62,28 @@
 LazyTensors.range_size(op::BoundaryOperator) = ()
 LazyTensors.domain_size(op::BoundaryOperator) = (op.size,)
 
-function LazyTensors.apply(op::BoundaryOperator{T,Lower}, v::AbstractVector{T}) where T
+function LazyTensors.apply(op::BoundaryOperator{<:Any,Lower}, v::AbstractVector)
     apply_stencil(op.stencil,v,1)
 end
 
-function LazyTensors.apply(op::BoundaryOperator{T,Upper}, v::AbstractVector{T}) where T
+function LazyTensors.apply(op::BoundaryOperator{<:Any,Upper}, v::AbstractVector)
     apply_stencil_backwards(op.stencil,v,op.size)
 end
 
-function LazyTensors.apply_transpose(op::BoundaryOperator{T,Lower}, v::AbstractArray{T,0}, i::Index{Lower}) where T
+function LazyTensors.apply_transpose(op::BoundaryOperator{<:Any,Lower}, v::AbstractArray{<:Any,0}, i::Index{Lower})
     return op.stencil[Int(i)-1]*v[]
 end
 
-function LazyTensors.apply_transpose(op::BoundaryOperator{T,Upper}, v::AbstractArray{T,0}, i::Index{Upper}) where T
+function LazyTensors.apply_transpose(op::BoundaryOperator{<:Any,Upper}, v::AbstractArray{<:Any,0}, i::Index{Upper})
     return op.stencil[op.size[1] - Int(i)]*v[]
 end
 
 # Catch all combinations of Lower, Upper and Interior not caught by the two previous methods.
-function LazyTensors.apply_transpose(op::BoundaryOperator{T}, v::AbstractArray{T,0}, i::Index) where T
-    return zero(T)
+function LazyTensors.apply_transpose(op::BoundaryOperator, v::AbstractArray{<:Any,0}, i::Index)
+    return zero(eltype(v))
 end
 
-function LazyTensors.apply_transpose(op::BoundaryOperator{T}, v::AbstractArray{T,0}, i) where T
+function LazyTensors.apply_transpose(op::BoundaryOperator, v::AbstractArray{<:Any,0}, i)
     r = getregion(i, closure_size(op), op.size)
     apply_transpose(op, v, Index(i,r))
 end