New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor `Fields.interpolate` to make sense for `Nothing` locations and `Flat` directions #3368

Closed

glwagner wants to merge 65 commits into main from glw/better-interpolate

Member

glwagner commented Oct 30, 2023 •

edited

Loading

This PR changes the syntax for interpolate to

interpolate(to_node, from_field, from_location, from_grid)

to interpolate from_field to_node.

Then to_node may be a 3-tuple for 3D grid/locations, 2-tuple for 2D grids/locations, or 1-tuple for 1D grids/locations.

It also makes LatitudeLongitudeGrid support Flat vertical directions.

Closes #3356

glwagner and others added 16 commits

October 18, 2023 13:16


          Change architecture(model)

29e5b07


          Make LatitudeLongitudeGrid support Flat vertical directions

3b6f574


          Fix LatitutdeLongitudeGrid constructor for default topology

56cd1f9


          remove some stray spaces

ed5c801


          Refactor interpolate

64b409d


          Eliminate merge artifacts

0ce23f5


          Bugfix

e2bb2cf


          Merge branch 'main' into glw/better-simulation-interface

788d096


          Merge remote-tracking branch 'origin/glw/better-simulation-interface'…

68406cd

… into glw/better-interpolate


          Cosmetic improvement to WENO interpolants

8c4a063


          Fix more interpolate bugs

6020ed1


          Refactor FieldTimeSeries a bit

e7c5ece


          Better input validation and show

3d8f8f9


          More support for TotallyInMemory field time series and comment on 4D …

3c691b3

…kernels


          Fix error message

b615847


          Support AbstractTime for FieldTimeSeries

0420f55

glwagner requested a review from simone-silvestri

November 1, 2023 16:15

simone-silvestri reviewed

View reviewed changes

src/Fields/interpolate.jl Outdated Show resolved Hide resolved

simone-silvestri reviewed

View reviewed changes

src/Fields/interpolate.jl Outdated Show resolved Hide resolved

simone-silvestri reviewed

View reviewed changes

src/Grids/latitude_longitude_grid.jl Outdated Show resolved Hide resolved

simone-silvestri reviewed

View reviewed changes

src/Grids/latitude_longitude_grid.jl Outdated Show resolved Hide resolved

simone-silvestri reviewed

View reviewed changes

src/Grids/latitude_longitude_grid.jl Show resolved Hide resolved

simone-silvestri approved these changes

View reviewed changes

glwagner and others added 7 commits

November 1, 2023 12:44


          Update src/Fields/interpolate.jl

6ac1f39

Co-authored-by: Simone Silvestri <[email protected]>


          Update src/Fields/interpolate.jl

0c8b340

Co-authored-by: Simone Silvestri <[email protected]>


          Update src/Grids/latitude_longitude_grid.jl

c015b8b

Co-authored-by: Simone Silvestri <[email protected]>


          Update src/Grids/latitude_longitude_grid.jl

f9e1093

Co-authored-by: Simone Silvestri <[email protected]>


          Tweak rectilinear grid constructor to match latitude longitude grid

c2b5d05


          Language tweak

a0f8fe2


          Cosmetic updates

901aa5f

glwagner added 15 commits

November 6, 2023 16:55


          Merge branch 'main' into glw/better-interpolate

cb39226


          Revert Manifest

dd548a3


          Fix puzzling bug in index_binary_search

59b0aae


          Ok dont type restrict so much

49e05b8


          Try a new way to interpolate

e8a8224


          Bugfix

48ec4e6


          Did we fix interpolate tests?

21396d0


          Fix bug in memory allocated field time series

83869ba


          Merge branch 'main' into glw/better-interpolate

8bff074


          Fix bug in update_field_time_series!

7ed8dc3


          Merge branch 'glw/better-interpolate' of https://github.com/CliMA/Oce…

c0f4037

…ananigans.jl into glw/better-interpolate


          Fix problem for Flat lat lon grids

46c411a


          Update field tests

2d67753


          Put back allowscalar to get tests to pass

778dd91


          Expose all data not just interior

1841b2c

Member Author

glwagner commented Nov 16, 2023

@simone-silvestri so close! Can you take a look at the distributed tests?

simone-silvestri and others added 9 commits

November 16, 2023 17:55


          small bugfix

a352b8d


          Merge branch 'glw/better-interpolate' of github.com:CliMA/Oceananigan…

d47a48f

…s.jl into glw/better-interpolate


          Revert "small bugfix"

110b258

This reverts commit a352b8d.


          another small one

b5067ba


          Revert "Merge branch 'glw/better-interpolate' of github.com:CliMA/Oce…

3d558ef

…ananigans.jl into glw/better-interpolate"

This reverts commit d47a48f, reversing
changes made to a352b8d.


          finally got iy

5b6abca


          small bugfix

19900b4


          last

88c0a99


          Indent

de1400f

simone-silvestri mentioned this pull request

Refactor Fields.interpolate to make sense for Nothing locations and Flat directions - take 2 #3395

Merged


          Fix bug with lat lon grid

89ccd1c

Member Author

glwagner commented Dec 5, 2023

Superceded by #3395

glwagner closed this

navidcy changed the title ~~(0.90.2) Refactor Fields.interpolate to make sense for Nothing locations and Flat directions~~ Refactor Fields.interpolate to make sense for Nothing locations and Flat directions

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet