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

Collocation of emep-mscw output with gridded data in a projection #1274

Merged
merged 9 commits into from
Jul 22, 2024

Conversation

heikoklein
Copy link
Member

@heikoklein heikoklein commented Jul 20, 2024

Change Summary

  • Add ProjectionInformation proj_info to GriddedData, the projection projection-information consist of a projection functions to convert between lat/lon and x/y in the projection, as well as of the dimension-names of the x/y-axes.
  • Read ProjectionInformation when reading a variable in mscw-ctm reader and add that to GriddedData
  • Collocation, when using the xarray-collocation is now able to convert the observations lat/lon to x/y and perform collocation on x/y values in the projection-plane when reading the gridded-data.
  • Make pyproj an explicit dependency (currently only implicit dependency of iris and cartopy)

Related issue number

solves the EMEP4NO part of #1175

Checklist

  • Start with a draft-PR
  • The PR title is a good summary of the changes
  • PR is set to AeroTools and a tentative milestone
  • Documentation reflects the changes where applicable
  • Tests for the changes exist where applicable
  • Tests pass locally
  • Tests pass on CI
  • At least 1 reviewer is selected
  • Make PR ready to review

@heikoklein heikoklein added this to the m2024-08 milestone Jul 20, 2024
Copy link

codecov bot commented Jul 22, 2024

Codecov Report

Attention: Patch coverage is 83.72093% with 21 lines in your changes missing coverage. Please review.

Project coverage is 79.00%. Comparing base (6ce6156) to head (0f6f744).
Report is 1 commits behind head on main-dev.

Files Patch % Lines
pyaerocom/projection_information.py 83.63% 9 Missing ⚠️
pyaerocom/ungriddeddata.py 78.26% 5 Missing ⚠️
pyaerocom/griddeddata.py 83.33% 4 Missing ⚠️
pyaerocom/colocation/colocation_utils.py 84.21% 3 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           main-dev    #1274      +/-   ##
============================================
+ Coverage     78.96%   79.00%   +0.03%     
============================================
  Files           133      134       +1     
  Lines         20596    20700     +104     
============================================
+ Hits          16263    16353      +90     
- Misses         4333     4347      +14     
Flag Coverage Δ
unittests 79.00% <83.72%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@heikoklein heikoklein marked this pull request as ready for review July 22, 2024 08:11
Copy link
Member

@lewisblake lewisblake left a comment

Choose a reason for hiding this comment

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

small changes, looks good

pyaerocom/scripts/testdata-minimal/README.md Outdated Show resolved Hide resolved
pyaerocom/ungriddeddata.py Outdated Show resolved Hide resolved
@heikoklein heikoklein merged commit 2f81b5f into main-dev Jul 22, 2024
6 checks passed
@heikoklein heikoklein deleted the read_projection branch July 22, 2024 09:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants