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

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

Merged
merged 31 commits into from
Mar 6, 2024
Merged

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

merged 31 commits into from
Mar 6, 2024

Conversation

davidhassell
Copy link
Collaborator

@davidhassell davidhassell commented Feb 28, 2024 •
edited
Loading

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
@davidhassell davidhassell linked an issue Feb 28, 2024 that may be closed by this pull request
Allow regridding to discrete sampling geometry feature types #716
Closed
@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
Member

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

@davidhassell
Copy link
Collaborator Author

Good to go ...

@davidhassell davidhassell modified the milestones: 3.16.1, 3.17.0, Next release Feb 29, 2024
sadielbartholomew
sadielbartholomew reviewed Mar 5, 2024
View reviewed changes
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.

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

docs/source/field_analysis.rst Outdated Show resolved Hide resolved
docs/source/field_analysis.rst Show resolved Hide resolved
docs/source/field_analysis.rst Outdated Show resolved Hide resolved
docs/source/field_analysis.rst Outdated Show resolved Hide resolved
cf/regrid/regridoperator.py Outdated Show resolved Hide resolved
cf/regrid/regrid.py Outdated Show resolved Hide resolved
cf/regrid/regrid.py Outdated Show resolved Hide resolved
cf/regrid/regrid.py Outdated Show resolved Hide resolved
cf/regrid/regrid.py Outdated Show resolved Hide resolved
cf/regrid/regrid.py Outdated Show resolved Hide resolved
davidhassell and others added 6 commits March 5, 2024 19:10
@davidhassell @sadielbartholomew
Typos
2d7f1f1 
Co-authored-by: Sadie L. Bartholomew <[email protected]>
@davidhassell @sadielbartholomew
Typos
00521ba 
Co-authored-by: Sadie L. Bartholomew <[email protected]>
@davidhassell @sadielbartholomew
Remove old commented code
3423526 
Co-authored-by: Sadie L. Bartholomew <[email protected]>
@davidhassell
clearer logic
36b6128
@davidhassell @sadielbartholomew
Docs
5f51310 
Co-authored-by: Sadie L. Bartholomew <[email protected]>
@davidhassell
Merge branch 'main' into regrid-3d
82265e6
sadielbartholomew
sadielbartholomew approved these changes Mar 6, 2024
View reviewed changes
Copy link
Member

@sadielbartholomew sadielbartholomew left a comment •
edited
Loading

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.

Changelog.rst Outdated Show resolved Hide resolved
@davidhassell @sadielbartholomew
remove redundant line
1d752a3 
Co-authored-by: Sadie L. Bartholomew <[email protected]>
@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
Reviewers

@sadielbartholomew sadielbartholomew sadielbartholomew approved these changes

Assignees
No one assigned
Labels
enhancement New feature or request regridding Relating to regridding operations
Projects
None yet
Milestone
3.16.2
2 participants
@davidhassell @sadielbartholomew