Skip to content
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

PI-3552: Add concatenate support for Ancilary Variables and Cell Measures #3566

Merged
merged 10 commits into from
Dec 17, 2019
Merged

PI-3552: Add concatenate support for Ancilary Variables and Cell Measures #3566

merged 10 commits into from
Dec 17, 2019

Conversation

stephenworsley
Copy link
Contributor

Addresses the concatenate half of #3552.

@stephenworsley stephenworsley added this to the v3.0.0 milestone Nov 28, 2019
@stephenworsley
Copy link
Contributor Author

stephenworsley commented Nov 29, 2019 •
edited
Loading

Since this involves changing the _as_defn() method for cell measures and ancillary variables, this probably depends on the work done in #3478.

@stephenworsley stephenworsley changed the title Add concatenate support for Ancilary Variables and Cell Measures PI-3473: Add concatenate support for Ancilary Variables and Cell Measures Dec 6, 2019
@pp-mo pp-mo changed the title PI-3473: Add concatenate support for Ancilary Variables and Cell Measures PI-3483: Add concatenate support for Ancilary Variables and Cell Measures Dec 9, 2019
@pp-mo pp-mo changed the title PI-3483: Add concatenate support for Ancilary Variables and Cell Measures PI-3552: Add concatenate support for Ancilary Variables and Cell Measures Dec 9, 2019
pp-mo
pp-mo reviewed Dec 13, 2019
View reviewed changes
lib/iris/cube.py
@@ -505,6 +510,16 @@ def concatenate_cube(self, check_aux_coords=True):
is not applied to auxilliary coordinates that span the dimension
the concatenation is occuring along. Defaults to True.

* check_cell_measures
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tiny point, but this has copied a mis-spelling : 2 'r's in 'occurring'
Also above : only 1 'l' in in 'auxiliary'

However, ancillary seems to right everywhere !
Now I just need to stop saying cell methods when I mean cell measures...

pp-mo
pp-mo reviewed Dec 13, 2019
View reviewed changes
lib/iris/cube.py Outdated Show resolved Hide resolved
pp-mo
pp-mo reviewed Dec 13, 2019
View reviewed changes
lib/iris/cube.py Outdated Show resolved Hide resolved
pp-mo
pp-mo reviewed Dec 13, 2019
View reviewed changes
lib/iris/cube.py Outdated Show resolved Hide resolved
pp-mo
pp-mo reviewed Dec 13, 2019
View reviewed changes
lib/iris/cube.py Outdated Show resolved Hide resolved
@stephenworsley stephenworsley mentioned this pull request Dec 16, 2019
Closed
@pp-mo pp-mo mentioned this pull request Dec 17, 2019
Closed
pp-mo
pp-mo reviewed Dec 17, 2019
View reviewed changes
Copy link
Member

@pp-mo pp-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I've finally convinced myself that this is all ok, and tests all the options.
Except : we should be checking the cube results from the examples for concatenating with CMs and ancils. And a few typos.

Otherwise good to go I think 👍

@pp-mo
Copy link
Member

pp-mo commented Dec 17, 2019

bypass cml checking

That is neat !!

@pp-mo
Copy link
Member

pp-mo commented Dec 17, 2019

Thanks for patience @stephenworsley !

@pp-mo pp-mo merged commit 07d09c8 into SciTools:master Dec 17, 2019
@pp-mo pp-mo mentioned this pull request Dec 17, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pp-mo pp-mo pp-mo left review comments

Assignees

@pp-mo pp-mo

Labels
Type: Bug Type: Enhancement
Projects
None yet
Milestone
v3.0.0
Development

Successfully merging this pull request may close these issues.
2 participants
@stephenworsley @pp-mo