Mercurial > repos > public > sbplib_julia
diff EquidistantGrid.jl @ 129:1aaeb46ba5f4 cell_based_test
Improve efficiency of apply by the following:
- Remove divisions in interior loop by storing and multiplying by the reciprocal of grid spacing instead.
- Add @inline to apply(::Laplace
- Remove initialization of w = 0 in apply(::Stencil) by manually unrolling first iteration of the loop.
| author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
|---|---|
| date | Thu, 14 Feb 2019 16:25:22 +0100 |
| parents | 631eb9b35d72 |
| children | 155bbecf18bb |
line wrap: on
line diff
--- a/EquidistantGrid.jl Thu Feb 14 12:46:58 2019 +0100 +++ b/EquidistantGrid.jl Thu Feb 14 16:25:22 2019 +0100 @@ -8,17 +8,21 @@ size::NTuple{Dim, Int} # First coordinate direction stored first limit_lower::NTuple{Dim, T} limit_upper::NTuple{Dim, T} - spacing::NTuple{Dim, T} + inverse_spacing::NTuple{Dim, T} # The reciprocal of the grid spacing # General constructor function EquidistantGrid(size::NTuple{Dim, Int}, limit_lower::NTuple{Dim, T}, limit_upper::NTuple{Dim, T}) where Dim where T @assert all(size.>0) @assert all(limit_upper.-limit_lower .!= 0) - spacing = abs.(limit_upper.-limit_lower)./(size.-1) - return new{Dim,T}(size, limit_lower, limit_upper, spacing) + inverse_spacing = (size.-1)./abs.(limit_upper.-limit_lower) + return new{Dim,T}(size, limit_lower, limit_upper, inverse_spacing) end end +function Base.eachindex(grid::EquidistantGrid) + CartesianIndices(grid.size) +end + # Returns the number of dimensions of an EquidistantGrid. # # @Input: grid - an EquidistantGrid @@ -27,8 +31,10 @@ return length(grid.size) end -function Base.eachindex(grid::EquidistantGrid) - CartesianIndices(grid.size) +# Returns the spacing of the grid +# +function spacing(grid::EquidistantGrid) + return 1.0./grid.inverse_spacing end # Computes the points of an EquidistantGrid as a vector of tuples. The vector is ordered