Mercurial > repos > public > sbplib_julia

annotate src/SbpOperators/stencil.jl @ 1685:4aa0973bffb0 feature/grids/manifolds

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Restrict the argument types of the simplest equidistant_grid to Number to avoid ambiguity
author Jonatan Werpers <jonatan@werpers.com>
date Wed, 21 Aug 2024 19:10:37 +0200
parents 8b9cdadb845a
children d8fabe814d06 dfb43fdac9fc
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
671
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
1 export CenteredStencil
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
2 export CenteredNestedStencil
671
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
3
806
9fc6d38da03f Remove type requirement for stencil weights
Jonatan Werpers <jonatan@werpers.com>
parents: 672
diff changeset
4 struct Stencil{T,N}
899
18f63f1a0c44 Fix bugs from stencil refactor
Jonatan Werpers <jonatan@werpers.com>
parents: 898
diff changeset
5 range::UnitRange{Int64}
84
48079bd39969 Change to using tuples in stencils and ops
Jonatan Werpers <jonatan@werpers.com>
parents: 69
diff changeset
6 weights::NTuple{N,T}
126
66c239678a21 Add Assertion in stencil constructor
Ylva Rydin <ylva.rydin@telia.com>
parents: 85
diff changeset
7
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
8 function Stencil(range::UnitRange,weights::NTuple{N,T}) where {T, N}
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
9 @assert length(range) == N
126
66c239678a21 Add Assertion in stencil constructor
Ylva Rydin <ylva.rydin@telia.com>
parents: 85
diff changeset
10 new{T,N}(range,weights)
66c239678a21 Add Assertion in stencil constructor
Ylva Rydin <ylva.rydin@telia.com>
parents: 85
diff changeset
11 end
8
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
12 end
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
13
584
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
14 """
595
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
15 Stencil(weights::NTuple; center::Int)
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
16
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
17 Create a stencil with the given weights with element `center` as the center of the stencil.
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
18 """
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
19 function Stencil(weights...; center::Int)
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
20 weights = promote(weights...)
595
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
21 N = length(weights)
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
22 range = (1:N) .- center
595
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
23
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
24 return Stencil(range, weights)
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
25 end
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
26
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
27 Stencil{T,N}(s::Stencil{S,N}) where {T,S,N} = Stencil(s.range, T.(s.weights))
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
28 Stencil{T}(s::Stencil) where T = Stencil{T,length(s)}(s)
826
4433be383840 Add stencil constructor to change the type of the weights along with a convert method
Jonatan Werpers <jonatan@werpers.com>
parents: 807
diff changeset
29
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
30 Base.convert(::Type{Stencil{T1,N}}, s::Stencil{T2,N}) where {T1,T2,N} = Stencil{T1,N}(s)
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
31 Base.convert(::Type{Stencil{T1}}, s::Stencil{T2,N}) where {T1,T2,N} = Stencil{T1,N}(s)
826
4433be383840 Add stencil constructor to change the type of the weights along with a convert method
Jonatan Werpers <jonatan@werpers.com>
parents: 807
diff changeset
32
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
33 Base.promote_rule(::Type{Stencil{T1,N}}, ::Type{Stencil{T2,N}}) where {T1,T2,N} = Stencil{promote_type(T1,T2),N}
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
34
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
35 function CenteredStencil(weights...)
671
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
36 if iseven(length(weights))
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
37 throw(ArgumentError("a centered stencil must have an odd number of weights."))
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
38 end
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
39
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
40 r = length(weights) ÷ 2
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
41
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
42 return Stencil(-r:r, weights)
671
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
43 end
e14627e79a54 Add stencil constructor for centered stencils and change from tuple to vararg in stencil constructor taking cneter
Jonatan Werpers <jonatan@werpers.com>
parents: 595
diff changeset
44
672
59a81254fefc Formatting
Jonatan Werpers <jonatan@werpers.com>
parents: 671
diff changeset
45
595
03ef4d4740ab Add a constructor for Stencil where you can specify the center of the stencil
Jonatan Werpers <jonatan@werpers.com>
parents: 584
diff changeset
46 """
584
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
47 scale(s::Stencil, a)
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
48
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
49 Scale the weights of the stencil `s` with `a` and return a new stencil.
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
50 """
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
51 function scale(s::Stencil, a)
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
52 return Stencil(s.range, a.*s.weights)
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
53 end
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
54
887
0be29e65521e Add length method for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 880
diff changeset
55 Base.eltype(::Stencil{T,N}) where {T,N} = T
0be29e65521e Add length method for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 880
diff changeset
56 Base.length(::Stencil{T,N}) where {T,N} = N
584
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
57
8
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
58 function flip(s::Stencil)
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
59 range = (-s.range[2], -s.range[1])
84
48079bd39969 Change to using tuples in stencils and ops
Jonatan Werpers <jonatan@werpers.com>
parents: 69
diff changeset
60 return Stencil(range, reverse(s.weights))
8
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
61 end
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
62
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
63 # Provides index into the Stencil based on offset for the root element
128
7c0b9bb7ab4d Improve stencil application code to make it more friendly to compiler optimizations
Jonatan Werpers <jonatan@werpers.com>
parents: 122
diff changeset
64 @inline function Base.getindex(s::Stencil, i::Int)
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
65 @boundscheck if i ∉ s.range
584
4aa7fe13a984 Add scale() and eltype() methods for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 333
diff changeset
66 return zero(eltype(s))
8
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
67 end
71
18d0d794d3bb Make stencils respond to @ inbounds
Jonatan Werpers <jonatan@werpers.com>
parents: 67
diff changeset
68 return s.weights[1 + i - s.range[1]]
8
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
69 end
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
70
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
71 Base.@propagate_inbounds @inline function apply_stencil(s::Stencil, v::AbstractVector, i::Int)
1544
7cfa729e256d Remove ineffective @inline
Jonatan Werpers <jonatan@werpers.com>
parents: 1460
diff changeset
72 return sum(enumerate(s.weights)) do (k,w) #TBD: Which optimizations are needed here?
1459
c8cca833862d Try to sum over more static objects
Jonatan Werpers <jonatan@werpers.com>
parents: 1457
diff changeset
73 w*v[i + @inbounds s.range[k]]
8
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
74 end
433008d3b7d3 Move stencil to its own file
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
75 end
122
6c6979ff17f4 Introduce and use apply_backwards for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 85
diff changeset
76
897
737cd68318c7 Refactor code for regular stencils to use fewer type parameters and allow promotion
Jonatan Werpers <jonatan@werpers.com>
parents: 896
diff changeset
77 Base.@propagate_inbounds @inline function apply_stencil_backwards(s::Stencil, v::AbstractVector, i::Int)
1544
7cfa729e256d Remove ineffective @inline
Jonatan Werpers <jonatan@werpers.com>
parents: 1460
diff changeset
78 return sum(enumerate(s.weights)) do (k,w) #TBD: Which optimizations are needed here?
1459
c8cca833862d Try to sum over more static objects
Jonatan Werpers <jonatan@werpers.com>
parents: 1457
diff changeset
79 w*v[i - @inbounds s.range[k]]
122
6c6979ff17f4 Introduce and use apply_backwards for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 85
diff changeset
80 end
6c6979ff17f4 Introduce and use apply_backwards for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 85
diff changeset
81 end
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
82
1546
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
83 # There are many options for the implementation of `apply_stencil` and
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
84 # `apply_stencil_backwards`. Some alternatives were tried on the branch
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
85 # bugfix/sbp_operators/stencil_return_type and can be found at the following
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
86 # revision:
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
87 #
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
88 # * 237b980ffb91 (baseline)
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
89 # * a72bab15228e (mapreduce)
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
90 # * ffd735354d54 (multiplication)
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
91 # * b5abd5191f2c (promote_op)
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
92 # * 8d56846185fc (return_type)
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
93 #
8b9cdadb845a Add some comments
Jonatan Werpers <jonatan@werpers.com>
parents: 1544
diff changeset
94
1032
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
95 function left_pad(s::Stencil, N)
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
96 weights = LazyTensors.left_pad_tuple(s.weights, zero(eltype(s)), N)
1072
14cb97284373 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1032 905
diff changeset
97 range = (first(s.range) - (N - length(s.weights))):last(s.range)
1032
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
98
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
99 return Stencil(range, weights)
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
100 end
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
101
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
102 function right_pad(s::Stencil, N)
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
103 weights = LazyTensors.right_pad_tuple(s.weights, zero(eltype(s)), N)
1072
14cb97284373 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1032 905
diff changeset
104 range = first(s.range):(last(s.range) + (N - length(s.weights)))
1032
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
105
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
106 return Stencil(range, weights)
11767fbb29f4 Add padding functions for stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
107 end
1072
14cb97284373 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1032 905
diff changeset
108
14cb97284373 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 1032 905
diff changeset
109
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
110
880
f74189c954d6 Add argument restrictions to stencil constructors to get clearer error messages
Jonatan Werpers <jonatan@werpers.com>
parents: 879
diff changeset
111 struct NestedStencil{T,N,M}
f74189c954d6 Add argument restrictions to stencil constructors to get clearer error messages
Jonatan Werpers <jonatan@werpers.com>
parents: 879
diff changeset
112 s::Stencil{Stencil{T,N},M}
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
113 end
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
114
879
011d3ff65e9f Add methods for CenteredNestedStencil with tuple input
Jonatan Werpers <jonatan@werpers.com>
parents: 868
diff changeset
115 # Stencil input
898
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
116 NestedStencil(s::Vararg{Stencil}; center) = NestedStencil(Stencil(s... ; center))
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
117 CenteredNestedStencil(s::Vararg{Stencil}) = NestedStencil(CenteredStencil(s...))
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
118
879
011d3ff65e9f Add methods for CenteredNestedStencil with tuple input
Jonatan Werpers <jonatan@werpers.com>
parents: 868
diff changeset
119 # Tuple input
898
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
120 function NestedStencil(weights::Vararg{NTuple{N,Any}}; center) where N
868
e37ee63bf9ac Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 867
diff changeset
121 inner_stencils = map(w -> Stencil(w...; center), weights)
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
122 return NestedStencil(Stencil(inner_stencils... ; center))
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
123 end
898
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
124 function CenteredNestedStencil(weights::Vararg{NTuple{N,Any}}) where N
879
011d3ff65e9f Add methods for CenteredNestedStencil with tuple input
Jonatan Werpers <jonatan@werpers.com>
parents: 868
diff changeset
125 inner_stencils = map(w->CenteredStencil(w...), weights)
011d3ff65e9f Add methods for CenteredNestedStencil with tuple input
Jonatan Werpers <jonatan@werpers.com>
parents: 868
diff changeset
126 return CenteredNestedStencil(inner_stencils...)
011d3ff65e9f Add methods for CenteredNestedStencil with tuple input
Jonatan Werpers <jonatan@werpers.com>
parents: 868
diff changeset
127 end
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
128
894
54e36688dab8 Add functions for converting the element type of nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 887
diff changeset
129
54e36688dab8 Add functions for converting the element type of nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 887
diff changeset
130 # Conversion
898
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
131 function NestedStencil{T,N,M}(ns::NestedStencil{S,N,M}) where {T,S,N,M}
894
54e36688dab8 Add functions for converting the element type of nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 887
diff changeset
132 return NestedStencil(Stencil{Stencil{T}}(ns.s))
54e36688dab8 Add functions for converting the element type of nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 887
diff changeset
133 end
54e36688dab8 Add functions for converting the element type of nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 887
diff changeset
134
898
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
135 function NestedStencil{T}(ns::NestedStencil{S,N,M}) where {T,S,N,M}
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
136 NestedStencil{T,N,M}(ns)
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
137 end
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
138
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
139 function Base.convert(::Type{NestedStencil{T,N,M}}, s::NestedStencil{S,N,M}) where {T,S,N,M}
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
140 return NestedStencil{T,N,M}(s)
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
141 end
894
54e36688dab8 Add functions for converting the element type of nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 887
diff changeset
142 Base.convert(::Type{NestedStencil{T}}, stencil) where T = NestedStencil{T}(stencil)
54e36688dab8 Add functions for converting the element type of nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 887
diff changeset
143
898
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
144 function Base.promote_rule(::Type{NestedStencil{T,N,M}}, ::Type{NestedStencil{S,N,M}}) where {T,S,N,M}
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
145 return NestedStencil{promote_type(T,S),N,M}
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
146 end
cd6d71781137 Add promotion functionality for NestedTuples
Jonatan Werpers <jonatan@werpers.com>
parents: 897
diff changeset
147
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
148 Base.eltype(::NestedStencil{T}) where T = T
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
149
896
004324d7ed35 Add scale method for nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 894
diff changeset
150 function scale(ns::NestedStencil, a)
004324d7ed35 Add scale method for nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 894
diff changeset
151 range = ns.s.range
004324d7ed35 Add scale method for nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 894
diff changeset
152 weights = ns.s.weights
004324d7ed35 Add scale method for nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 894
diff changeset
153
004324d7ed35 Add scale method for nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 894
diff changeset
154 return NestedStencil(Stencil(range, scale.(weights,a)))
004324d7ed35 Add scale method for nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 894
diff changeset
155 end
004324d7ed35 Add scale method for nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 894
diff changeset
156
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
157 function flip(ns::NestedStencil)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
158 s_flip = flip(ns.s)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
159 return NestedStencil(Stencil(s_flip.range, flip.(s_flip.weights)))
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
160 end
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
161
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
162 Base.getindex(ns::NestedStencil, i::Int) = ns.s[i]
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
163
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
164 "Apply inner stencils to `c` and get a concrete stencil"
868
e37ee63bf9ac Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 867
diff changeset
165 Base.@propagate_inbounds function apply_inner_stencils(ns::NestedStencil, c::AbstractVector, i::Int)
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
166 weights = apply_stencil.(ns.s.weights, Ref(c), i)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
167 return Stencil(ns.s.range, weights)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
168 end
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
169
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
170 "Apply the whole nested stencil"
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
171 Base.@propagate_inbounds function apply_stencil(ns::NestedStencil, c::AbstractVector, v::AbstractVector, i::Int)
868
e37ee63bf9ac Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 867
diff changeset
172 s = apply_inner_stencils(ns,c,i)
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
173 return apply_stencil(s, v, i)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
174 end
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
175
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
176 "Apply inner stencils backwards to `c` and get a concrete stencil"
868
e37ee63bf9ac Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 867
diff changeset
177 Base.@propagate_inbounds @inline function apply_inner_stencils_backwards(ns::NestedStencil, c::AbstractVector, i::Int)
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
178 weights = apply_stencil_backwards.(ns.s.weights, Ref(c), i)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
179 return Stencil(ns.s.range, weights)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
180 end
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
181
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
182 "Apply the whole nested stencil backwards"
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
183 Base.@propagate_inbounds @inline function apply_stencil_backwards(ns::NestedStencil, c::AbstractVector, v::AbstractVector, i::Int)
868
e37ee63bf9ac Add some tests and fix some bugs
Jonatan Werpers <jonatan@werpers.com>
parents: 867
diff changeset
184 s = apply_inner_stencils_backwards(ns,c,i)
867
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
185 return apply_stencil_backwards(s, v, i)
313648b01504 Start implementing nested stencils
Jonatan Werpers <jonatan@werpers.com>
parents: 826
diff changeset
186 end