Make nodes() return the correct indices when passed a view of a Field
#4814
Conversation
|
Should |
Not sure. I imagine this being more cumbersome for the end user, but possibly reducing code and makings things more flexible.
A little, yes. But I don't think enough as to motivate this change by itself. |
| ##### nodes | ||
| ##### | ||
|
|
||
| nodes(f::Field; kwargs...) = nodes(f.grid, instantiated_location(f)...; indices=indices(f), kwargs...) |
There was a problem hiding this comment.
| nodes(f::Field; kwargs...) = nodes(f.grid, instantiated_location(f)...; indices=indices(f), kwargs...) | |
| nodes(f::Field; kwargs...) = nodes(f.grid, instantiated_location(f)...; indices=indices(f), kwargs...) | |
There was a problem hiding this comment.
I think I'm missing something; What's different here?
There was a problem hiding this comment.
the extra line at the bottom of the file
There was a problem hiding this comment.
Ah, okay. Are we trying to always leave an extra line at the bottom of files?
| @inline λnodes(grid::LLG, ℓx::C; with_halos=false) = _property(grid.λᶜᵃᵃ, ℓx, topology(grid, 1), grid.Nx, grid.Hx, with_halos) | ||
| @inline φnodes(grid::LLG, ℓy::F; with_halos=false) = _property(grid.φᵃᶠᵃ, ℓy, topology(grid, 2), grid.Ny, grid.Hy, with_halos) | ||
| @inline φnodes(grid::LLG, ℓy::C; with_halos=false) = _property(grid.φᵃᶜᵃ, ℓy, topology(grid, 2), grid.Ny, grid.Hy, with_halos) | ||
| @inline λnodes(grid::LLG, ℓx::F; with_halos=false, indices=Colon()) = getindex(_property(grid.λᶠᵃᵃ, ℓx, topology(grid, 1), grid.Nx, grid.Hx, with_halos), indices) |
There was a problem hiding this comment.
I guess this will not work on GPU right? Probably it will return a scalar indexing issue
There was a problem hiding this comment.
Yeah I think that's why GPU tests are failing. I'll try to come up with an alternative soon
|
After #4805, it will be pretty trivial to return |
|
Basically if |
You can go ahead and make |
Resolves #4729
In addition to improving the behavior of
nodes(), this PR, together with #4730, makes it possible to write different slices of aField(or severalFields) into one NetCDF file.