Skip to content

3-d spherical regridding and regridding to DSG feature types - #726

Merged
davidhassell merged 31 commits into
NCAS-CMS:mainfrom
davidhassell:regrid-3d
Mar 6, 2024
Merged

davidhassell merged 31 commits into
NCAS-CMS:mainfrom
davidhassell:regrid-3d

Conversation

@davidhassell

@davidhassell davidhassell commented Feb 28, 2024 •

Copy link
Copy Markdown
Collaborator

Fixes #715 and #716

Notes

  • dask_regrid.py: Added axis logic to cope with regridding 3-d input data to 1-d output data
  • data.py: Fix bug when calculating output chunksizes
  • field.py: Extend API for vertical regridding keyword parameters
  • regrid.py:
    • Extend API for vertical regridding keyword parameters
    • Extended Grid dataclass for locstream and vertical regridding parameters
    • Added functionality to infer grids from DSG featureType fields
    • Refactored the creation of esmpy.Grid instances so that 3-d spherical grids are included without any extra special treatment
    • Added the createion of esmpy.Locstream instances
    • Added extra information to output weights filess (following what ESMF itself does)
  • regridoperator.py: Included parameters for vertical and DSG regridding

@davidhassell davidhassell added enhancement New feature or request regridding Relating to regridding operations labels Feb 28, 2024
@davidhassell davidhassell added this to the 3.17.0 milestone Feb 28, 2024
@sadielbartholomew sadielbartholomew changed the title 3-d speherical regridding and regridding to DSG feature types 3-d spherical regridding and regridding to DSG feature types Feb 28, 2024
@sadielbartholomew

Copy link
Copy Markdown
Member

Thanks for the notes for review David. Is this ready for review now or shall I wait?

@davidhassell

Copy link
Copy Markdown
Collaborator Author

Good to go ...

@davidhassell davidhassell modified the milestones: 3.16.1, 3.17.0, Next release Feb 29, 2024

@sadielbartholomew sadielbartholomew left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just finalising some functional reviews, but here are my minor comments from eyeballing the code.

Comment thread docs/source/field_analysis.rst Outdated
Comment thread docs/source/field_analysis.rst
Comment thread docs/source/field_analysis.rst Outdated
Comment thread docs/source/field_analysis.rst Outdated
Comment thread cf/regrid/regridoperator.py Outdated
Comment thread cf/regrid/regrid.py Outdated
Comment thread cf/regrid/regrid.py Outdated
Comment thread cf/regrid/regrid.py Outdated
Comment thread cf/regrid/regrid.py Outdated
Comment thread cf/regrid/regrid.py Outdated
davidhassell and others added 6 commits March 5, 2024 19:10
Co-authored-by: Sadie L. Bartholomew <sadie.bartholomew@ncas.ac.uk>
Co-authored-by: Sadie L. Bartholomew <sadie.bartholomew@ncas.ac.uk>
Co-authored-by: Sadie L. Bartholomew <sadie.bartholomew@ncas.ac.uk>
Co-authored-by: Sadie L. Bartholomew <sadie.bartholomew@ncas.ac.uk>

@sadielbartholomew sadielbartholomew left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I am happy with all of the functionality introduced/changed here. It works including for our work towards VISION goals, as discussed externally.

Thanks for addressing the feedback from my previous review set. Everything looks good to me, now, and the full test suite is passing locally.

There's one spurious line now in the changelog, but once that is removed, please merge.

Comment thread Changelog.rst Outdated
Co-authored-by: Sadie L. Bartholomew <sadie.bartholomew@ncas.ac.uk>
@davidhassell
davidhassell merged commit e424e99 into NCAS-CMS:main Mar 6, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request regridding Relating to regridding operations

Projects

None yet

2 participants