Mercurial > repos > public > sbplib_julia

changeset 111:18b86c33b35a cell_based_test

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backed out changeset b3fbef345810, splitting apply! just complicates things
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 08 Feb 2019 20:56:13 +0100
parents ee071b8ed58c
children 98c788cba9bf
files diffOp.jl
diffstat 1 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/diffOp.jl	Fri Feb 08 15:27:48 2019 +0100
+++ b/diffOp.jl	Fri Feb 08 20:56:13 2019 +0100
@@ -57,15 +57,10 @@
     return nothing
 end
 
-@inline function apply!(D::DiffOpCartesian{2}, u::AbstractArray{T,2}, v::AbstractArray{T,2}, r1::Type{<:Region}, r2::Type{<:Region}) where T
+function apply!(D::DiffOpCartesian{2}, u::AbstractArray{T,2}, v::AbstractArray{T,2}, r1::Type{<:Region}, r2::Type{<:Region}) where T
     N = D.grid.numberOfPointsPerDim
     closuresize = closureSize(D.op)
-    apply!(D, u, v, r1, r2, regionindices(N, closuresize, (r1,r2)))
-    return nothing
-end
-
-@inline function apply!(D::DiffOpCartesian{2}, u::AbstractArray{T,2}, v::AbstractArray{T,2}, r1::Type{<:Region}, r2::Type{<:Region}, ri::CartesianIndices{2}) where T
-    for I ∈ ri
+    for I ∈ regionindices(N, closuresize, (r1,r2))
         @inbounds indextuple = (Index{r1}(I[1]), Index{r2}(I[2]))
         @inbounds u[I] = apply(D, v, indextuple)
     end