Mercurial > repos > public > sbplib_julia
diff DiffOps/src/DiffOps.jl @ 291:0f94dc29c4bf
Merge in branch boundary_conditions
author | Jonatan Werpers <jonatan@werpers.com> |
---|---|
date | Mon, 22 Jun 2020 21:43:05 +0200 |
parents | ce6a2f3f732a |
children | d5475ad78b28 |
line wrap: on
line diff
--- a/DiffOps/src/DiffOps.jl Wed Jun 26 15:07:47 2019 +0200 +++ b/DiffOps/src/DiffOps.jl Mon Jun 22 21:43:05 2020 +0200 @@ -3,6 +3,7 @@ using RegionIndices using SbpOperators using Grids +using LazyTensors """ DiffOp @@ -46,7 +47,7 @@ # Maybe this should be split according to b3fbef345810 after all?! Seems like it makes performance more predictable function apply_region!(D::DiffOpCartesian{2}, u::AbstractArray{T,2}, v::AbstractArray{T,2}, r1::Type{<:Region}, r2::Type{<:Region}) where T - for I ∈ regionindices(D.grid.size, closureSize(D.op), (r1,r2)) + for I ∈ regionindices(D.grid.size, closuresize(D.op), (r1,r2)) @inbounds indextuple = (Index{r1}(I[1]), Index{r2}(I[2])) @inbounds u[I] = apply(D, v, indextuple) end @@ -69,7 +70,7 @@ using TiledIteration function apply_region_tiled!(D::DiffOpCartesian{2}, u::AbstractArray{T,2}, v::AbstractArray{T,2}, r1::Type{<:Region}, r2::Type{<:Region}) where T - ri = regionindices(D.grid.size, closureSize(D.op), (r1,r2)) + ri = regionindices(D.grid.size, closuresize(D.op), (r1,r2)) # TODO: Pass Tilesize to function for tileaxs ∈ TileIterator(axes(ri), padded_tilesize(T, (5,5), 2)) for j ∈ tileaxs[2], i ∈ tileaxs[1] @@ -97,7 +98,5 @@ include("laplace.jl") -export Laplace - end # module