Mercurial > repos > public > sbplib_julia
annotate src/SbpOperators/quadrature/inverse_diagonal_quadrature.jl @ 504:21fba50cb5b0 feature/quadrature_as_outer_product
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
- Replace the types Quadrature and InverseQuadrature by functions returning outer products of the 1D operators.
- Avoid convoluted naming of types. DiagonalInnerProduct is now renamed to DiagonalQuadrature, similarly for InverseDiagonalInnerProduct.
author | Vidar Stiernström <vidar.stiernstrom@it.uu.se> |
---|---|
date | Sat, 07 Nov 2020 13:07:31 +0100 |
parents | src/SbpOperators/quadrature/inverse_diagonal_inner_product.jl@0d93d406c222 |
children | c2f991b819fc |
rev | line source |
---|---|
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
1 """ |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
2 inverse_diagonal_quadrature(g,quadrature_closure) |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
3 |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
4 Constructs the diagonal quadrature inverse operator `Qi` on a grid of `Dim` dimensions as |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
5 a `TensorMapping`. The one-dimensional operator is a InverseDiagonalQuadrature, while |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
6 the multi-dimensional operator is the outer-product of the one-dimensional operators |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
7 in each coordinate direction. |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
8 """ |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
9 function inverse_diagonal_quadrature(g::EquidistantGrid{Dim}, quadrature_closure) where Dim |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
10 Hi = InverseDiagonalQuadrature(restrict(g,1), quadrature_closure) |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
11 for i ∈ 2:Dim |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
12 Hi = Hi⊗InverseDiagonalQuadrature(restrict(g,i), quadrature_closure) |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
13 end |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
14 return Hi |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
15 end |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
16 export inverse_diagonal_quadrature |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
17 |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
18 |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
19 """ |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
20 InverseDiagonalQuadrature{Dim,T<:Real,M} <: TensorMapping{T,1,1} |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
21 |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
22 Implements the inverse diagonal inner product operator `Hi` of as a 1D TensorOperator |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
23 """ |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
24 struct InverseDiagonalQuadrature{T<:Real,M} <: TensorMapping{T,1,1} |
356
0844069ab5ff
Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents:
344
diff
changeset
|
25 h_inv::T |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
26 closure::NTuple{M,T} |
356
0844069ab5ff
Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents:
344
diff
changeset
|
27 size::Tuple{Int} |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
28 end |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
29 export InverseDiagonalQuadrature |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
30 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
31 function InverseDiagonalQuadrature(g::EquidistantGrid{1}, quadrature_closure) |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
32 return InverseDiagonalQuadrature(inverse_spacing(g)[1], 1 ./ quadrature_closure, size(g)) |
356
0844069ab5ff
Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents:
344
diff
changeset
|
33 end |
0844069ab5ff
Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents:
344
diff
changeset
|
34 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
35 |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
36 LazyTensors.range_size(Hi::InverseDiagonalQuadrature) = Hi.size |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
37 LazyTensors.domain_size(Hi::InverseDiagonalQuadrature) = Hi.size |
356
0844069ab5ff
Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents:
344
diff
changeset
|
38 |
0844069ab5ff
Reinclude SbpOperators and fix most of the code and tests there.
Jonatan Werpers <jonatan@werpers.com>
parents:
344
diff
changeset
|
39 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
40 function LazyTensors.apply(Hi::InverseDiagonalQuadrature{T}, v::AbstractVector{T}, I::Index{Lower}) where T |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
41 return @inbounds Hi.h_inv*Hi.closure[Int(I)]*v[Int(I)] |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
42 end |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
43 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
44 function LazyTensors.apply(Hi::InverseDiagonalQuadrature{T}, v::AbstractVector{T}, I::Index{Upper}) where T |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
45 N = length(v); |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
46 return @inbounds Hi.h_inv*Hi.closure[N-Int(I)+1]*v[Int(I)] |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
47 end |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
48 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
49 function LazyTensors.apply(Hi::InverseDiagonalQuadrature{T}, v::AbstractVector{T}, I::Index{Interior}) where T |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
50 return @inbounds Hi.h_inv*v[Int(I)] |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
51 end |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
52 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
53 function LazyTensors.apply(Hi::InverseDiagonalQuadrature, v::AbstractVector{T}, index::Index{Unknown}) where T |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
54 N = length(v); |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
55 r = getregion(Int(index), closuresize(Hi), N) |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
56 i = Index(Int(index), r) |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
57 return LazyTensors.apply(Hi, v, i) |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
58 end |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
59 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
60 LazyTensors.apply_transpose(Hi::InverseDiagonalQuadrature{T}, v::AbstractVector{T}, I::Index) where T = LazyTensors.apply(Hi,v,I) |
342
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
61 |
3c2238c681b5
Add missing file.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
62 |
504
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
63 closuresize(Hi::InverseDiagonalQuadrature{T,M}) where {T,M} = M |
21fba50cb5b0
Use LazyOuterProduct to construct multi-dimensional quadratures. This change allwed to:
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
362
diff
changeset
|
64 export closuresize |