PI-2472: Update area weighted regridder to accept different dim data #3625
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
stephenworsley
requested changes
Jan 3, 2020
lib/iris/tests/unit/analysis/area_weighted/test_AreaWeightedRegridder.py
Show resolved
Hide resolved
abooton
commented
Jan 5, 2020
| src = self.cube(np.linspace(20, 30, 3), np.linspace(10, 25, 4)) | ||
| target = self.cube(np.linspace(6, 18, 8), np.linspace(11, 22, 9)) | ||
| target = self.cube(np.linspace(22, 28, 8), np.linspace(11, 22, 9)) | ||
| return src, target |
Contributor
Author
There was a problem hiding this comment.
Alter this so that we are passing data through the tests. It is ok to do this because all the tests already using it abort with an error and are independent of the data used.
stephenworsley
approved these changes
Jan 7, 2020
Contributor
stephenworsley
left a comment
stephenworsley
left a comment
There was a problem hiding this comment.
Looks good, this should be ok to merge now.
abooton
added a commit
to abooton/iris
that referenced
this pull request
Jan 9, 2020
* pr/3623: PI-2472: Update area weighted regridder to accept different dim data (SciTools#3625) PI-2472: Fix issue related to comparison / equality in regridding code (SciTools#3624) Remove unused variables in regridding code (SciTools#3620) Add docstring and what's new (SciTools#3619) Move calculation of area weights from perform to prepare (SciTools#3617) PI-2472: Refactor AreaWeightedRegridder (SciTools#3606) Test for AreaWeightedRegridder (SciTools#3604) Split regrid_area_weighted_rectilinear_src_and_grid into prepare and perform (SciTools#3601)
abooton
added a commit
to abooton/iris
that referenced
this pull request
Jan 9, 2020
…ciTools#3625) * Update area weighted regridder to accept data with dims in different orders * Add extra unittest to test_AreaWeightedRegridder
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Alter the area-weighted regridder to accept multidimensional src cubes (i.e. data other than 2D lat-lon data.), identifying the x-y coordinates corresponding to src grid.
Update the regridder to only cache the vital regridding information (i.e. target grid info and the weights information.
Fix bug in the tests so that the prepare and perform functions are called sequentially.
Update "test_mismatched_data_dims" to accept multidimensional data, with dimensions in differing orders.