Mercurial > repos > public > sbplib_julia

annotate src/SbpOperators/volumeops/derivatives/second_derivative_variable.jl @ 1374:4f3dd84891f6 feature/variable_derivatives

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify constructor for SecondDerivativeVariable
author Jonatan Werpers <jonatan@werpers.com>
date Fri, 26 May 2023 22:50:39 +0200
parents 3f7f826489a1
children e9dfc1998d31
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1370
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
1 """
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
2 second_derivative_variable(g, coeff ..., [direction])
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
3
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
4 The variable second derivative operator as a `LazyTensor` on the given grid.
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
5 `coeff` is a grid function of the variable coefficient.
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
6
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
7 Approximates the d/dξ c d/dξ on `g` along the coordinate dimension specified
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
8 by `direction`.
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
9 """
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
10 function second_derivative_variable end
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
11
1372
3f7f826489a1 Remove type annotation for coeff
Jonatan Werpers <jonatan@werpers.com>
parents: 1371
diff changeset
12 function second_derivative_variable(g::TensorGrid, coeff, stencil_set, dir::Int)
1370
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
13 inner_stencil = parse_nested_stencil(eltype(coeff), stencil_set["D2variable"]["inner_stencil"])
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
14 closure_stencils = parse_nested_stencil.(eltype(coeff), stencil_set["D2variable"]["closure_stencils"])
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
15
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
16 return second_derivative_variable(g, coeff, inner_stencil, closure_stencils, dir)
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
17 end
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
18
1372
3f7f826489a1 Remove type annotation for coeff
Jonatan Werpers <jonatan@werpers.com>
parents: 1371
diff changeset
19 function second_derivative_variable(g::EquidistantGrid, coeff, stencil_set)
1370
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
20 return second_derivative_variable(TensorGrid(g), coeff, stencil_set, 1)
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
21 end
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
22
1372
3f7f826489a1 Remove type annotation for coeff
Jonatan Werpers <jonatan@werpers.com>
parents: 1371
diff changeset
23 function second_derivative_variable(g::TensorGrid, coeff, inner_stencil::NestedStencil, closure_stencils, dir)
1371
d0e48c2e6aad Remove stencil input for 1d grid and reorder methods of second_derivative_variable
Jonatan Werpers <jonatan@werpers.com>
parents: 1370
diff changeset
24 check_coefficient(g, coeff)
d0e48c2e6aad Remove stencil input for 1d grid and reorder methods of second_derivative_variable
Jonatan Werpers <jonatan@werpers.com>
parents: 1370
diff changeset
25
d0e48c2e6aad Remove stencil input for 1d grid and reorder methods of second_derivative_variable
Jonatan Werpers <jonatan@werpers.com>
parents: 1370
diff changeset
26 Δxᵢ = spacing(g.grids[dir])
d0e48c2e6aad Remove stencil input for 1d grid and reorder methods of second_derivative_variable
Jonatan Werpers <jonatan@werpers.com>
parents: 1370
diff changeset
27 scaled_inner_stencil = scale(inner_stencil, 1/Δxᵢ^2)
d0e48c2e6aad Remove stencil input for 1d grid and reorder methods of second_derivative_variable
Jonatan Werpers <jonatan@werpers.com>
parents: 1370
diff changeset
28 scaled_closure_stencils = scale.(Tuple(closure_stencils), 1/Δxᵢ^2)
1374
4f3dd84891f6 Simplify constructor for SecondDerivativeVariable
Jonatan Werpers <jonatan@werpers.com>
parents: 1372
diff changeset
29 return SecondDerivativeVariable(coeff, scaled_inner_stencil, scaled_closure_stencils, dir)
1371
d0e48c2e6aad Remove stencil input for 1d grid and reorder methods of second_derivative_variable
Jonatan Werpers <jonatan@werpers.com>
parents: 1370
diff changeset
30 end
1370
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
31
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
32 function check_coefficient(g, coeff)
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
33 if ndims(g) != ndims(coeff)
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
34 throw(ArgumentError("The coefficient has dimension $(ndims(coeff)) while the grid is dimension $(ndims(g))"))
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
35 end
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
36
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
37 if size(g) != size(coeff)
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
38 throw(DimensionMismatch("the size $(size(coeff)) of the coefficient does not match the size $(size(g)) of the grid"))
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
39 end
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
40 end
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
41
4ef8fb75d144 Start splitting out a second_derivative_variable function
Jonatan Werpers <jonatan@werpers.com>
parents: 1368
diff changeset
42
916
fc1f03fc8d65 Remove comments
Jonatan Werpers <jonatan@werpers.com>
parents: 913
diff changeset
43 # REVIEW: Fixa docs
fc1f03fc8d65 Remove comments
Jonatan Werpers <jonatan@werpers.com>
parents: 913
diff changeset
44 """
1049
3bb94ce74697 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 940
diff changeset
45 SecondDerivativeVariable{Dir,T,D,...} <: LazyTensor{T,D,D}
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
46
916
fc1f03fc8d65 Remove comments
Jonatan Werpers <jonatan@werpers.com>
parents: 913
diff changeset
47 A second derivative operator in direction `Dir` with a variable coefficient.
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
48 """
1049
3bb94ce74697 Merge default
Jonatan Werpers <jonatan@werpers.com>
parents: 940
diff changeset
49 struct SecondDerivativeVariable{Dir,T,D,M,IStencil<:NestedStencil{T},CStencil<:NestedStencil{T},TArray<:AbstractArray} <: LazyTensor{T,D,D}
906
33c7e266e1a9 Add fix for type instability in SecondDerivativeVariable along with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 901
diff changeset
50 inner_stencil::IStencil
33c7e266e1a9 Add fix for type instability in SecondDerivativeVariable along with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 901
diff changeset
51 closure_stencils::NTuple{M,CStencil}
882
9098fc936776 Add the coefficient as a part of the struct. Wrap tests in testsets
Jonatan Werpers <jonatan@werpers.com>
parents: 881
diff changeset
52 coefficient::TArray
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
53
1374
4f3dd84891f6 Simplify constructor for SecondDerivativeVariable
Jonatan Werpers <jonatan@werpers.com>
parents: 1372
diff changeset
54 function SecondDerivativeVariable(coefficient::AbstractArray, inner_stencil::NestedStencil{T}, closure_stencils::NTuple{M,NestedStencil{T}}, dir) where {T,M}
4f3dd84891f6 Simplify constructor for SecondDerivativeVariable
Jonatan Werpers <jonatan@werpers.com>
parents: 1372
diff changeset
55 D = ndims(coefficient)
906
33c7e266e1a9 Add fix for type instability in SecondDerivativeVariable along with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 901
diff changeset
56 IStencil = typeof(inner_stencil)
33c7e266e1a9 Add fix for type instability in SecondDerivativeVariable along with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 901
diff changeset
57 CStencil = eltype(closure_stencils)
33c7e266e1a9 Add fix for type instability in SecondDerivativeVariable along with tests
Jonatan Werpers <jonatan@werpers.com>
parents: 901
diff changeset
58 TArray = typeof(coefficient)
1374
4f3dd84891f6 Simplify constructor for SecondDerivativeVariable
Jonatan Werpers <jonatan@werpers.com>
parents: 1372
diff changeset
59 return new{dir,T,D,M,IStencil,CStencil,TArray}(inner_stencil, closure_stencils, coefficient)
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
60 end
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
61 end
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
62
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
63 derivative_direction(::SecondDerivativeVariable{Dir}) where {Dir} = Dir
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
64
891
f72cc96a58c6 Add some size tests
Jonatan Werpers <jonatan@werpers.com>
parents: 889
diff changeset
65 closure_size(op::SecondDerivativeVariable) = length(op.closure_stencils)
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
66
1367
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
67 LazyTensors.range_size(op::SecondDerivativeVariable) = size(op.coefficient)
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
68 LazyTensors.domain_size(op::SecondDerivativeVariable) = size(op.coefficient)
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
69
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
70
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
71 function derivative_view(op, a, I)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
72 d = derivative_direction(op)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
73
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
74 Iview = Base.setindex(I,:,d)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
75 return @view a[Iview...]
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
76 end
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
77
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
78 function apply_lower(op::SecondDerivativeVariable, v, I...)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
79 ṽ = derivative_view(op, v, I)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
80 c̃ = derivative_view(op, op.coefficient, I)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
81
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
82 i = I[derivative_direction(op)]
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
83 return @inbounds apply_stencil(op.closure_stencils[i], c̃, ṽ, i)
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
84 end
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
85
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
86 function apply_interior(op::SecondDerivativeVariable, v, I...)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
87 ṽ = derivative_view(op, v, I)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
88 c̃ = derivative_view(op, op.coefficient, I)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
89
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
90 i = I[derivative_direction(op)]
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
91 return apply_stencil(op.inner_stencil, c̃, ṽ, i)
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
92 end
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
93
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
94 function apply_upper(op::SecondDerivativeVariable, v, I...)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
95 ṽ = derivative_view(op, v, I)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
96 c̃ = derivative_view(op, op.coefficient, I)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
97
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
98 i = I[derivative_direction(op)]
1367
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
99 sz = domain_size(op)[derivative_direction(op)]
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
100 stencil = op.closure_stencils[sz-i+1]
893
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
101 return @inbounds apply_stencil_backwards(stencil, c̃, ṽ, i)
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
102 end
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
103
893
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
104 function LazyTensors.apply(op::SecondDerivativeVariable, v::AbstractArray, I::Vararg{Index})
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
105 if I[derivative_direction(op)] isa Index{Lower}
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
106 return apply_lower(op, v, Int.(I)...)
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
107 elseif I[derivative_direction(op)] isa Index{Upper}
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
108 return apply_upper(op, v, Int.(I)...)
931
720b1358e06d More strict apply
Jonatan Werpers <jonatan@werpers.com>
parents: 930
diff changeset
109 elseif I[derivative_direction(op)] isa Index{Interior}
720b1358e06d More strict apply
Jonatan Werpers <jonatan@werpers.com>
parents: 930
diff changeset
110 return apply_interior(op, v, Int.(I)...)
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
111 else
931
720b1358e06d More strict apply
Jonatan Werpers <jonatan@werpers.com>
parents: 930
diff changeset
112 error("Invalid region")
889
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
113 end
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
114 end
069e58fb3829 Refactor as multidimensional operator
Jonatan Werpers <jonatan@werpers.com>
parents: 884
diff changeset
115
893
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
116 function LazyTensors.apply(op::SecondDerivativeVariable, v::AbstractArray, I...)
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
117 dir = derivative_direction(op)
1367
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
118 sz = domain_size(op)[dir]
893
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
119
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
120 i = I[dir]
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
121
422c9f22cf92 Make higher dimensions work
Jonatan Werpers <jonatan@werpers.com>
parents: 891
diff changeset
122 I = map(i->Index(i, Interior), I)
930
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
123 if 0 < i <= closure_size(op)
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
124 I = Base.setindex(I, Index(i, Lower), dir)
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
125 return LazyTensors.apply(op, v, I...)
1367
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
126 elseif closure_size(op) < i <= sz-closure_size(op)
930
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
127 I = Base.setindex(I, Index(i, Interior), dir)
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
128 return LazyTensors.apply(op, v, I...)
1367
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
129 elseif sz-closure_size(op) < i <= sz
930
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
130 I = Base.setindex(I, Index(i, Upper), dir)
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
131 return LazyTensors.apply(op, v, I...)
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
132 else
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
133 error("Bounds error") # TODO: Make this more standard
ba5f4a0ec879 Fix type stability for 2d operator
Jonatan Werpers <jonatan@werpers.com>
parents: 917
diff changeset
134 end
881
aa4875f9a530 Start implementing the variable second derivative
Jonatan Werpers <jonatan@werpers.com>
parents:
diff changeset
135 end
932
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
136
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
137
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
138 ## 2D Specific implementations to avoid instability
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
139 ## TODO: Should really be solved by fixing the general methods instead
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
140
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
141
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
142 ## x-direction
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
143 function apply_lower(op::SecondDerivativeVariable{1}, v, i, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
144 ṽ = @view v[:,j]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
145 c̃ = @view op.coefficient[:,j]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
146
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
147 return @inbounds apply_stencil(op.closure_stencils[i], c̃, ṽ, i)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
148 end
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
149
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
150 function apply_interior(op::SecondDerivativeVariable{1}, v, i, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
151 ṽ = @view v[:,j]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
152 c̃ = @view op.coefficient[:,j]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
153
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
154 return @inbounds apply_stencil(op.inner_stencil, c̃, ṽ, i)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
155 end
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
156
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
157 function apply_upper(op::SecondDerivativeVariable{1}, v, i, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
158 ṽ = @view v[:,j]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
159 c̃ = @view op.coefficient[:,j]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
160
1367
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
161 sz = domain_size(op)[derivative_direction(op)]
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
162 stencil = op.closure_stencils[sz-i+1]
932
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
163 return @inbounds apply_stencil_backwards(stencil, c̃, ṽ, i)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
164 end
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
165
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
166
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
167 ## y-direction
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
168 function apply_lower(op::SecondDerivativeVariable{2}, v, i, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
169 ṽ = @view v[i,:]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
170 c̃ = @view op.coefficient[i,:]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
171
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
172 return @inbounds apply_stencil(op.closure_stencils[j], c̃, ṽ, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
173 end
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
174
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
175 function apply_interior(op::SecondDerivativeVariable{2}, v, i, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
176 ṽ = @view v[i,:]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
177 c̃ = @view op.coefficient[i,:]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
178
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
179 return @inbounds apply_stencil(op.inner_stencil, c̃, ṽ, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
180 end
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
181
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
182 function apply_upper(op::SecondDerivativeVariable{2}, v, i, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
183 ṽ = @view v[i,:]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
184 c̃ = @view op.coefficient[i,:]
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
185
1367
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
186 sz = domain_size(op)[derivative_direction(op)]
71e89507dd9a Remove size field from SecondDerivativeVariable since it duplicates info from the coefficient field
Jonatan Werpers <jonatan@werpers.com>
parents: 1365
diff changeset
187 stencil = op.closure_stencils[sz-j+1]
932
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
188 return @inbounds apply_stencil_backwards(stencil, c̃, ṽ, j)
863287577ad4 Temporarily add specialized methods for 2D
Jonatan Werpers <jonatan@werpers.com>
parents: 931
diff changeset
189 end