Mercurial > repos > public > sbplib_julia
annotate src/Grids/equidistant_grid.jl @ 1449:a0b1449dba4e feature/grids/curvilinear
Remove commented code
| author | Jonatan Werpers <jonatan@werpers.com> |
|---|---|
| date | Thu, 23 Nov 2023 10:14:48 +0100 |
| parents | e3a80ef08d09 |
| children | 05eb8ba149e2 |
| rev | line source |
|---|---|
|
1247
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
1 """ |
|
1331
ed3ea0630825
Add some docs for Grid
Jonatan Werpers <jonatan@werpers.com>
parents:
1282
diff
changeset
|
2 EquidistantGrid{T,R<:AbstractRange{T}} <: Grid{T,1} |
|
ed3ea0630825
Add some docs for Grid
Jonatan Werpers <jonatan@werpers.com>
parents:
1282
diff
changeset
|
3 |
|
1335
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
4 A one-dimensional equidistant grid. Most users are expected to use |
|
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
5 [`equidistant_grid`](@ref) for constructing equidistant grids. |
|
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
6 |
|
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
7 See also: [`equidistant_grid`](@ref) |
|
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
8 |
|
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
9 |
|
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
10 ## Note |
|
cca45af5e724
Some docs for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1331
diff
changeset
|
11 The type of range used for the points can likely impact performance. |
|
1247
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
12 """ |
|
1257
198ccda331a6
Remove range dim as a type paratmeter on Grid as it is already encoded in T if available
Jonatan Werpers <jonatan@werpers.com>
parents:
1255
diff
changeset
|
13 struct EquidistantGrid{T,R<:AbstractRange{T}} <: Grid{T,1} |
| 1222 | 14 points::R |
| 15 end | |
|
75
93c833019857
Make EquidistantGrid more concrete
Jonatan Werpers <jonatan@werpers.com>
parents:
74
diff
changeset
|
16 |
|
1255
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
17 # Indexing interface |
|
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
18 Base.getindex(g::EquidistantGrid, i) = g.points[i] |
|
1344
760a4a1ec4b7
Add 2D tests for dissipation operators and fix bug
Jonatan Werpers <jonatan@werpers.com>
parents:
1335
diff
changeset
|
19 Base.eachindex(g::EquidistantGrid) = eachindex(g.points) |
|
1253
ff8f335c32d1
Fix indexing with begin and end for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1250
diff
changeset
|
20 Base.firstindex(g::EquidistantGrid) = firstindex(g.points) |
|
ff8f335c32d1
Fix indexing with begin and end for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1250
diff
changeset
|
21 Base.lastindex(g::EquidistantGrid) = lastindex(g.points) |
|
ff8f335c32d1
Fix indexing with begin and end for EquidistantGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1250
diff
changeset
|
22 |
|
1399
adbdbf1c3480
Replace `firstindex` and `lastindex` with implementation of `axes`
Jonatan Werpers <jonatan@werpers.com>
parents:
1389
diff
changeset
|
23 Base.axes(g::EquidistantGrid, d) = axes(g.points, d) |
|
1389
d2219cc8316b
Add `firstindex(g,d)` and `lastindex(g,d)` for `EquidistantGrid`
Jonatan Werpers <jonatan@werpers.com>
parents:
1365
diff
changeset
|
24 |
|
1255
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
25 # Iteration interface |
|
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
26 Base.iterate(g::EquidistantGrid) = iterate(g.points) |
|
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
27 Base.iterate(g::EquidistantGrid, state) = iterate(g.points, state) |
|
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
28 |
|
1262
5e28ae42caf2
Clean up IteratorSize and eltype for EquidistantGrid, Grid, and ZeroDimGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1259
diff
changeset
|
29 Base.IteratorSize(::Type{<:EquidistantGrid}) = Base.HasShape{1}() |
|
1255
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
30 Base.length(g::EquidistantGrid) = length(g.points) |
|
1989d432731a
Implement the interfaces for iteration and indexing on EquidistantGrid. Make collect() work
Jonatan Werpers <jonatan@werpers.com>
parents:
1253
diff
changeset
|
31 Base.size(g::EquidistantGrid) = size(g.points) |
|
1437
e3a80ef08d09
Implement size(g,d) for EquidistantGrid and TensorGrid
Jonatan Werpers <jonatan@werpers.com>
parents:
1399
diff
changeset
|
32 Base.size(g::EquidistantGrid, d) = size(g.points)[d] |
| 1222 | 33 |
| 34 | |
|
406
c377fc37c04b
Clean up EquidistantGrid and tests after deciding that side lengths must be positive.
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
405
diff
changeset
|
35 """ |
| 1222 | 36 spacing(grid::EquidistantGrid) |
| 37 | |
| 38 The spacing between grid points. | |
| 39 """ | |
| 40 spacing(g::EquidistantGrid) = step(g.points) | |
| 41 | |
|
51
614b56a017b9
Split grid.jl into AbstractGrid.jl and EquidistantGrid.jl
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
diff
changeset
|
42 |
| 1222 | 43 """ |
| 44 inverse_spacing(grid::EquidistantGrid) | |
| 45 | |
| 46 The reciprocal of the spacing between grid points. | |
| 47 """ | |
| 48 inverse_spacing(g::EquidistantGrid) = 1/step(g.points) | |
| 49 | |
| 50 | |
| 51 boundary_identifiers(::EquidistantGrid) = (Lower(), Upper()) | |
| 52 boundary_grid(g::EquidistantGrid, id::Lower) = ZeroDimGrid(g[begin]) | |
| 53 boundary_grid(g::EquidistantGrid, id::Upper) = ZeroDimGrid(g[end]) | |
| 54 | |
| 55 | |
| 56 """ | |
| 57 refine(g::EquidistantGrid, r::Int) | |
| 58 | |
|
1347
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
59 The grid where `g` is refined by the factor `r`. The factor is applied to the number of |
|
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
60 intervals, i.e., 1 less than the size of `g`. |
| 1222 | 61 |
| 62 See also: [`coarsen`](@ref) | |
| 63 """ | |
| 64 function refine(g::EquidistantGrid, r::Int) | |
| 65 new_sz = (length(g) - 1)*r + 1 | |
| 66 return EquidistantGrid(change_length(g.points, new_sz)) | |
|
877
dd2ab001a7b6
Implement refine function, move exports to the top of the file, change location of constuctors.
Jonatan Werpers <jonatan@werpers.com>
parents:
688
diff
changeset
|
67 end |
|
680
1d3e29ffc6c6
Add support for 0-dimensional grid, and add method boundary_grid
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
661
diff
changeset
|
68 |
|
909
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
69 """ |
|
1347
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
70 coarsen(g::EquidistantGrid, r::Int) |
| 1222 | 71 |
|
1347
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
72 The grid where `g` is coarsened by the factor `r`. The factor is applied to the number of |
|
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
73 intervals, i.e., 1 less than the size of `g`. If the number of |
| 1222 | 74 intervals are not divisible by `r` an error is raised. |
| 75 | |
| 76 See also: [`refine`](@ref) | |
| 77 """ | |
| 78 function coarsen(g::EquidistantGrid, r::Int) | |
| 79 if (length(g)-1)%r != 0 | |
| 80 throw(DomainError(r, "Size minus 1 must be divisible by the ratio.")) | |
| 81 end | |
| 82 | |
| 83 new_sz = (length(g) - 1)÷r + 1 | |
| 84 | |
| 1249 | 85 return EquidistantGrid(change_length(g.points, new_sz)) |
| 1222 | 86 end |
| 87 | |
| 88 | |
| 89 """ | |
| 90 equidistant_grid(size::Dims, limit_lower, limit_upper) | |
|
909
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
91 |
|
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
92 Construct an equidistant grid with corners at the coordinates `limit_lower` and |
|
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
93 `limit_upper`. |
|
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
94 |
|
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
95 The length of the domain sides are given by the components of |
|
1247
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
96 `limit_upper-limit_lower`. E.g for a 2D grid with `limit_lower=(-1,0)` and |
|
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
97 `limit_upper=(1,2)` the domain is defined as `(-1,1)x(0,2)`. The side lengths |
|
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
98 of the grid are not allowed to be negative. |
|
909
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
99 |
|
1347
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
100 The number of equispaced points in each coordinate direction are given |
|
909
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
101 by the tuple `size`. |
|
1247
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
102 |
|
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
103 Note: If `limit_lower` and `limit_upper` are integers and `size` would allow a |
|
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
104 completely integer grid, `equidistant_grid` will still return a floating point |
|
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
105 grid. This simlifies the implementation and avoids certain surprise |
|
2abec782cf5b
Add todo for EquidistantGrid docs, improve equidistant_grid docs
Jonatan Werpers <jonatan@werpers.com>
parents:
1222
diff
changeset
|
106 behaviours. |
|
909
b900fea1c057
Clean up the docs a bit
Jonatan Werpers <jonatan@werpers.com>
parents:
908
diff
changeset
|
107 """ |
| 1222 | 108 function equidistant_grid(size::Dims, limit_lower, limit_upper) |
|
1282
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
109 gs = map(equidistant_grid, size, limit_lower, limit_upper) |
| 1222 | 110 return TensorGrid(gs...) |
|
352
a18bd337a280
Add function for getting a one dimensional grid for a given dimension from a equidistant grid
Jonatan Werpers <jonatan@werpers.com>
parents:
333
diff
changeset
|
111 end |
|
658
26b0eb83aea4
Add function for getting boundary identifiers from equidistant grid
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
406
diff
changeset
|
112 |
|
1113
4e4c5011140d
Add functions orthogonal_dims and boundary_size
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1111
diff
changeset
|
113 """ |
| 1222 | 114 equidistant_grid(size::Int, limit_lower::T, limit_upper::T) |
|
1113
4e4c5011140d
Add functions orthogonal_dims and boundary_size
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1111
diff
changeset
|
115 |
| 1222 | 116 Constructs a 1D equidistant grid. |
|
1113
4e4c5011140d
Add functions orthogonal_dims and boundary_size
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1111
diff
changeset
|
117 """ |
| 1222 | 118 function equidistant_grid(size::Int, limit_lower::T, limit_upper::T) where T |
|
1282
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
119 if any(size .<= 0) |
|
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
120 throw(DomainError("size must be postive")) |
|
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
121 end |
|
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
122 |
|
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
123 if any(limit_upper.-limit_lower .<= 0) |
|
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
124 throw(DomainError("side length must be postive")) |
|
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
125 end |
|
11b08b242e48
Make equdistant_grid return an EquidistantGrid for the 1d Case
Jonatan Werpers <jonatan@werpers.com>
parents:
1280
diff
changeset
|
126 return EquidistantGrid(range(limit_lower, limit_upper, length=size)) # TBD: Should it use LinRange instead? |
|
1113
4e4c5011140d
Add functions orthogonal_dims and boundary_size
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1111
diff
changeset
|
127 end |
|
4e4c5011140d
Add functions orthogonal_dims and boundary_size
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1111
diff
changeset
|
128 |
|
1280
17d435c08773
Add missing exports and alias TensorGridBoundary to CartesianBoundary
Jonatan Werpers <jonatan@werpers.com>
parents:
1279
diff
changeset
|
129 CartesianBoundary{D,BID} = TensorGridBoundary{D,BID} # TBD: What should we do about the naming of this boundary? |
|
1111
5b3d4a8ec3ab
Change to using filter for picking out orthogonal dimensions
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
909
diff
changeset
|
130 |
|
680
1d3e29ffc6c6
Add support for 0-dimensional grid, and add method boundary_grid
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
661
diff
changeset
|
131 |
|
1d3e29ffc6c6
Add support for 0-dimensional grid, and add method boundary_grid
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
661
diff
changeset
|
132 """ |
|
1347
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
133 change_length(r::AbstractRange, n) |
|
680
1d3e29ffc6c6
Add support for 0-dimensional grid, and add method boundary_grid
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
661
diff
changeset
|
134 |
|
1347
08f06bfacd5c
Fix typos and formatting of documentation
Vidar Stiernström <vidar.stiernstrom@it.uu.se>
parents:
1344
diff
changeset
|
135 Change the length of `r` to `n`, keeping the same start and stop. |
|
877
dd2ab001a7b6
Implement refine function, move exports to the top of the file, change location of constuctors.
Jonatan Werpers <jonatan@werpers.com>
parents:
688
diff
changeset
|
136 """ |
|
1250
40ca0af6e480
Add methods to change_length and fix incorrect function declaration
Jonatan Werpers <jonatan@werpers.com>
parents:
1249
diff
changeset
|
137 function change_length end |
| 908 | 138 |
|
1250
40ca0af6e480
Add methods to change_length and fix incorrect function declaration
Jonatan Werpers <jonatan@werpers.com>
parents:
1249
diff
changeset
|
139 change_length(r::UnitRange, n) = StepRange{Int,Int}(range(r[begin], r[end], n)) |
|
40ca0af6e480
Add methods to change_length and fix incorrect function declaration
Jonatan Werpers <jonatan@werpers.com>
parents:
1249
diff
changeset
|
140 change_length(r::StepRange, n) = StepRange{Int,Int}(range(r[begin], r[end], n)) |
|
40ca0af6e480
Add methods to change_length and fix incorrect function declaration
Jonatan Werpers <jonatan@werpers.com>
parents:
1249
diff
changeset
|
141 change_length(r::StepRangeLen, n) = range(r[begin], r[end], n) |
| 1222 | 142 change_length(r::LinRange, n) = LinRange(r[begin], r[end], n) |