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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor some netcdf save code #4301

Merged
merged 4 commits into from
Sep 21, 2021
Merged

Conversation

pp-mo
Copy link
Member

@pp-mo pp-mo commented Aug 31, 2021

馃殌 Pull Request

Description

Initial "tidying" to routines in netcdf.py, to prepare for the addition of UGRID saving support.

This unifies the handling codepaths for different types of cube components,
to make it easier to add the new ones which are coming (mesh-element coords and connectivities).

This is a pure refactor : by design, should not change any exisiting behaviour/results.

These same code changes have been proven against extra CDL test snapshots in #4297
.. but we don't ever intend to merge that extra testing, as it is excessive and somewhat incomplete/unpolished


Consult Iris pull request check list

@pp-mo pp-mo requested a review from bjlittle August 31, 2021 17:13
@pp-mo pp-mo changed the title Refactor onto a common multidim var routine. Refactor some netcdf save code Aug 31, 2021
This was referenced Aug 31, 2021
@bjlittle bjlittle self-assigned this Sep 13, 2021
Copy link
Member

@bjlittle bjlittle left a comment

Choose a reason for hiding this comment

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

@pp-mo Some comments to service, but this is looking good.

Thanks for taking the time to rationalise and tee things up for #4303 馃憤

lib/iris/fileformats/netcdf.py Outdated Show resolved Hide resolved
lib/iris/fileformats/netcdf.py Show resolved Hide resolved
lib/iris/fileformats/netcdf.py Show resolved Hide resolved
lib/iris/fileformats/netcdf.py Show resolved Hide resolved
lib/iris/fileformats/netcdf.py Outdated Show resolved Hide resolved
lib/iris/fileformats/netcdf.py Show resolved Hide resolved
lib/iris/fileformats/netcdf.py Outdated Show resolved Hide resolved
lib/iris/fileformats/netcdf.py Show resolved Hide resolved
@pp-mo
Copy link
Member Author

pp-mo commented Sep 14, 2021

Re-opened, and merged from new update 'mesh-data-model'.
So, this ought now to pass the tests ..

@pp-mo pp-mo changed the base branch from mesh-data-model to main September 15, 2021 13:13
@pp-mo pp-mo closed this Sep 15, 2021
@pp-mo pp-mo reopened this Sep 15, 2021
@pp-mo pp-mo mentioned this pull request Sep 15, 2021
3 tasks
@pp-mo
Copy link
Member Author

pp-mo commented Sep 21, 2021

Rebased onto 'main',
to update + tidy away the failing linkcheck

@bjlittle bjlittle merged commit cc574cb into SciTools:main Sep 21, 2021
@pp-mo
Copy link
Member Author

pp-mo commented Sep 21, 2021

馃暫 馃殌 馃尀

Thanks for sticking with it @bjlittle

tkknight added a commit to tkknight/iris that referenced this pull request Sep 22, 2021
* main: (94 commits)
  added support for make html-noapi and html-quick for the docs build (SciTools#4333)
  Refactor some netcdf save code (SciTools#4301)
  [pre-commit.ci] pre-commit autoupdate (SciTools#4329)
  Update to loading docs to cover absence of 'or' for constraints (SciTools#4321)
  update latest.rst.template (SciTools#4323)
  stable cartopy feature download (SciTools#4328)
  Skip TestConstrainedLoad if data missing (SciTools#4319)
  Add 'Good First Issue' label to reasons an issue doesn't go stale (SciTools#4317)
  Gallery: simplify quiver example (SciTools#4120)
  Improve styling in a minor way in docs (SciTools#4314)
  bump version (SciTools#4310)
  Made clear we only test on Linux. (SciTools#4309)
  Updated environment lockfiles (SciTools#4308)
  Include Discussions in Getting Involved. (SciTools#4307)
  Fixed text to show as link. (SciTools#4305)
  [pre-commit.ci] pre-commit autoupdate (SciTools#4299)
  Updated environment lockfiles (SciTools#4298)
  cartopy feature download (SciTools#4304)
  Mesh Loading (AVD-1813) (SciTools#4262)
  reset whatsnew latest (SciTools#4288)
  ...
@pp-mo pp-mo deleted the ugrid_save_preliminary branch September 24, 2021 10:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants