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

Merge and concatinate cubes on load #790

Merged
merged 1 commit into from
Aug 15, 2024
Merged

Conversation

jfrost-mo
Copy link
Member

@jfrost-mo jfrost-mo commented Aug 12, 2024

This allows the callbacks to do their work, as the automatic merging only happens before the callbacks run. Therefore when the callbacks make the cubes compatible they are not merged.

Contribution checklist

Aim to have all relevant checks ticked off before merging. See the developer's guide for more detail.

  • Documentation has been updated to reflect change.
  • New code has tests, and affected old tests have been updated.
  • All tests and CI checks pass.
  • Ensured the pull request title is descriptive.
  • Conda lock files have been updated if dependencies have changed.
  • Attributed any Generative AI, such as GitHub Copilot, used in this PR.
  • Marked the PR as ready to review.

Copy link
Contributor

github-actions bot commented Aug 12, 2024

Coverage

@jfrost-mo jfrost-mo force-pushed the merge_cubes_after_load branch 3 times, most recently from c9e050f to 9bea2fb Compare August 12, 2024 15:19
@jfrost-mo jfrost-mo self-assigned this Aug 12, 2024
@jfrost-mo jfrost-mo marked this pull request as ready for review August 12, 2024 15:35
@jfrost-mo jfrost-mo force-pushed the merge_cubes_after_load branch from f9065ff to a5bc2f1 Compare August 13, 2024 12:31
This allows the callbacks to do their work, as the automatic merging
only happens before the callbacks run. Therefore when the callbacks
make the cubes compatible they are not merged.

This is tested by loading cubes with UUID attributes, and ensuring they
concatenate into a single cube.
@jfrost-mo jfrost-mo force-pushed the merge_cubes_after_load branch from a5bc2f1 to 22751b3 Compare August 15, 2024 08:00
@jfrost-mo jfrost-mo added the bug Something isn't working label Aug 15, 2024
Copy link
Contributor

@ukmo-huw-lewis ukmo-huw-lewis left a comment

Choose a reason for hiding this comment

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

Have left 1 comment for consideration.

src/CSET/operators/read.py Show resolved Hide resolved
Copy link
Contributor

@ukmo-huw-lewis ukmo-huw-lewis left a comment

Choose a reason for hiding this comment

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

Happy with rationale and coding change.

@ukmo-huw-lewis ukmo-huw-lewis merged commit cd485e2 into main Aug 15, 2024
7 checks passed
@ukmo-huw-lewis ukmo-huw-lewis deleted the merge_cubes_after_load branch August 15, 2024 13:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants