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

Mesh saveload fix #6004

Merged
merged 8 commits into from
Jun 20, 2024
Merged

Mesh saveload fix #6004

merged 8 commits into from
Jun 20, 2024

Conversation

pp-mo
Copy link
Member

@pp-mo pp-mo commented Jun 12, 2024

🚀 Pull Request

Description

Consult Iris pull request check list

Add any of the below labels to trigger actions on this PR:

  • benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts

@pp-mo pp-mo linked an issue Jun 12, 2024 that may be closed by this pull request
Rationalising mesh dimension names #5908
Closed
@codecov Codecov
Copy link

codecov bot commented Jun 13, 2024 •
edited
Loading

Codecov Report

Attention: Patch coverage is 75.00000% with 3 lines in your changes missing coverage. Please review.

Project coverage is 89.75%. Comparing base (70e843c) to head (f7e87f5).
Report is 62 commits behind head on main.

Files with missing lines Patch % Lines
lib/iris/experimental/ugrid/load.py 75.00% 2 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main    #6004      +/-   ##
==========================================
- Coverage   89.78%   89.75%   -0.04%     
==========================================
  Files          90       90              
  Lines       22945    22951       +6     
  Branches     5026     5027       +1     
==========================================
- Hits        20602    20600       -2     
- Misses       1612     1620       +8     
  Partials      731      731

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@pp-mo
Copy link
Member Author

pp-mo commented Jun 13, 2024

Hi @ESadek-MO
I fixed the test problems + I think this is probably good to review now.
Let me know what you think !

ESadek-MO
ESadek-MO requested changes Jun 18, 2024
View reviewed changes
Copy link
Contributor

@ESadek-MO ESadek-MO left a comment

Choose a reason for hiding this comment

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

Thanks @pp-mo! Looks good to me, just need a whatsnew then happy for this to go.

@pp-mo
Copy link
Member Author

pp-mo commented Jun 19, 2024

Thanks @pp-mo! Looks good to me, just need a whatsnew then happy for this to go.

Thanks @ESadek-MO .
Hope this does it.

ESadek-MO
ESadek-MO approved these changes Jun 20, 2024
View reviewed changes
Copy link
Contributor

@ESadek-MO ESadek-MO left a comment

Choose a reason for hiding this comment

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

Looks all good! Thanks @pp-mo!

@ESadek-MO ESadek-MO enabled auto-merge (squash) June 20, 2024 09:02
@ESadek-MO ESadek-MO merged commit 02511c3 into SciTools:main Jun 20, 2024
21 checks passed
tkknight added a commit to tkknight/iris that referenced this pull request Jun 20, 2024
@tkknight
Merge remote-tracking branch 'upstream/main' into retire_napolean
ec6e2b5 
* upstream/main: (42 commits)
  Mesh saveload fix (SciTools#6004)
  used tabs for the install info (SciTools#6013)
  Fix array_equal behaviour for masked arrays (SciTools#4457)
  Bump scitools/workflows from 2024.06.1 to 2024.06.2 (SciTools#6008)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6007)
  Updated environment lockfiles (SciTools#5996)
  Added more descriptive errors within concatenate (SciTools#6005)
  Bump scitools/workflows from 2024.06.0 to 2024.06.1 (SciTools#5998)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5997)
  Bump scitools/workflows from 2024.05.1 to 2024.06.0 (SciTools#5986)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5980)
  Updated environment lockfiles (SciTools#5983)
  Bump scitools/workflows from 2024.05.0 to 2024.05.1 (SciTools#5984)
  Make `slices_over` tests go faster (SciTools#5973)
  Updated environment lockfiles (SciTools#5979)
  Update lock files with associated fixes (SciTools#5953)
  List 25 slowest tests (SciTools#5969)
  used a note to highlight some text (SciTools#5971)
  Lazy `iris.cube.Cube.rolling_window` (SciTools#5795)
  Add memory benchmarks (SciTools#5960)
  ...
pp-mo added a commit that referenced this pull request Jun 20, 2024
@pp-mo
Update test_Saver__ugrid.py
ef5acd1 
Correct comment, since after #6004 the behaviour, and the testcase changed but the comment did not !
@pp-mo pp-mo mentioned this pull request Jun 20, 2024
Merged
tkknight added a commit to tkknight/iris that referenced this pull request Jun 23, 2024
@tkknight
Merge remote-tracking branch 'upstream/main' into autoapi
afbd003 
* upstream/main: (143 commits)
  Updated environment lockfiles (SciTools#6020)
  Add `MeshCoord.collapsed` (SciTools#6003)
  Bump scitools/workflows from 2024.06.2 to 2024.06.3 (SciTools#6015)
  Mesh saveload fix (SciTools#6004)
  used tabs for the install info (SciTools#6013)
  Fix array_equal behaviour for masked arrays (SciTools#4457)
  Bump scitools/workflows from 2024.06.1 to 2024.06.2 (SciTools#6008)
  [pre-commit.ci] pre-commit autoupdate (SciTools#6007)
  Updated environment lockfiles (SciTools#5996)
  Added more descriptive errors within concatenate (SciTools#6005)
  Bump scitools/workflows from 2024.06.0 to 2024.06.1 (SciTools#5998)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5997)
  Bump scitools/workflows from 2024.05.1 to 2024.06.0 (SciTools#5986)
  [pre-commit.ci] pre-commit autoupdate (SciTools#5980)
  Updated environment lockfiles (SciTools#5983)
  Bump scitools/workflows from 2024.05.0 to 2024.05.1 (SciTools#5984)
  Make `slices_over` tests go faster (SciTools#5973)
  Updated environment lockfiles (SciTools#5979)
  Update lock files with associated fixes (SciTools#5953)
  List 25 slowest tests (SciTools#5969)
  ...
ESadek-MO pushed a commit that referenced this pull request Jul 4, 2024
@pp-mo
Update test_Saver__ugrid.py (#6017)
b857174 
* Update test_Saver__ugrid.py

Correct comment, since after #6004 the behaviour, and the testcase changed but the comment did not !

* Revert unintended change.
@pp-mo pp-mo deleted the mesh_saveload_fix branch July 23, 2024 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ESadek-MO ESadek-MO ESadek-MO approved these changes

Assignees

@pp-mo pp-mo

@ESadek-MO ESadek-MO

Labels
Feature: UGRID
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Rationalising mesh dimension names
2 participants
@pp-mo @ESadek-MO