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.

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

Extend indexed assignment and binary operations to bounds, if present. #148

Merged
merged 28 commits into from
Nov 25, 2020

Conversation

davidhassell
Copy link
Collaborator

Fixes #146

@sadielbartholomew
Copy link
Member

I've just done a trivial merge conflict resolution to resolve one line conflicting with the PR #149 which I just merged, so that this can be merged once reviewed shortly, assuming all is good.

@davidhassell
Copy link
Collaborator Author

Thanks @sadielbartholomew. The changes discussed in #146 still need to, be added, though. I'll be looking at that again today.

@sadielbartholomew
Copy link
Member

Oops, sorry @davidhassell I thought it was ready for review. Ping me when it is ready. Thanks.

@davidhassell
Copy link
Collaborator Author

Note that the names combine_bounds_with_coordinates, OperandBoundsCombination, and 'COMBINE_BOUNDS_WITH_COORDINATES' are placeholders until we decide on what we really want to to call them.

@sadielbartholomew
Copy link
Member

Is this ready for review now @davidhassell (excluding the name which we are yet to choose, that is)?

@davidhassell
Copy link
Collaborator Author

Hi @sadielbartholomew - please do review, thanks.

@davidhassell
Copy link
Collaborator Author

(I realise that _binary_operation might need some interior_ring treatment, still ...)

@sadielbartholomew
Copy link
Member

(I realise that _binary_operation might need some interior_ring treatment, still ...)

@davidhassell I didn't start a review, and am doing some ES-DOC work until the end of my working day, so go ahead if you want to still make changes. Otherwise I'll start the review tomorrow bearing this in mind, & ignoring the name. Thanks.

Copy link
Member

@sadielbartholomew sadielbartholomew left a comment

Choose a reason for hiding this comment

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

I'm mid-review on checking through the intricacies of the various configurations, but everything seems sound generally so far. I'm leaving some minor comments while I finish up.

Changelog.rst Outdated Show resolved Hide resolved
Changelog.rst Outdated Show resolved Hide resolved
cf/constants.py Outdated Show resolved Hide resolved
cf/functions.py Show resolved Hide resolved
cf/mixin/propertiesdatabounds.py Outdated Show resolved Hide resolved
docs/source/field_analysis.rst Show resolved Hide resolved
@sadielbartholomew
Copy link
Member

Thanks for addressing those small items of feedback, I'll be an hour or so finishing up checking the functionality is watertight then can approve, but everything thus far is working as decided and documented.

Copy link
Member

@sadielbartholomew sadielbartholomew left a comment

Choose a reason for hiding this comment

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

Functionality tested completed off the state of the branch including the final name change and everything works as (well) documented. Great stuff.

One final thought I had is that it might be good to note the new method in the changelog, as well as the note about the change in behaviour. This can easily be done post-merge though.

@davidhassell
Copy link
Collaborator Author

Good idea. Changelog done. Merging. Hooray!

@davidhassell davidhassell merged commit 8a7bc3d into NCAS-CMS:master Nov 25, 2020
@davidhassell davidhassell added this to the 3.8.0 milestone Dec 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Extend indexed assignment and binary operations to bounds, if present.
2 participants