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

One way to change freq for map processing #1312

Merged
merged 13 commits into from
Oct 7, 2024
Merged

Conversation

dulte
Copy link
Collaborator

@dulte dulte commented Aug 16, 2024

Change Summary

Made it so when ModelMapsEngine is run, main_freq is changed to maps_freq. If maps_freq=coarsest, then the coarsest freq of the given freqs are chosen

Related issue number

Proposed fix to #1260

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

Copy link

codecov bot commented Aug 16, 2024

Codecov Report

Attention: Patch coverage is 79.10448% with 14 lines in your changes missing coverage. Please review.

Project coverage is 78.84%. Comparing base (af3a797) to head (85aee2e).
Report is 15 commits behind head on main-dev.

Files with missing lines Patch % Lines
pyaerocom/aeroval/modelmaps_engine.py 78.46% 14 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           main-dev    #1312      +/-   ##
============================================
- Coverage     78.84%   78.84%   -0.01%     
============================================
  Files           136      136              
  Lines         20790    20856      +66     
============================================
+ Hits          16392    16444      +52     
- Misses         4398     4412      +14     
Flag Coverage Δ
unittests 78.84% <79.10%> (-0.01%) ⬇️

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.

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.

Based on our discussion I think we approach the other way. 😸

@heikoklein heikoklein modified the milestones: m2024-09, m2024-10 Sep 10, 2024
@dulte dulte marked this pull request as ready for review September 30, 2024 09:18
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.

Looks good. Only minor changes. I would opt for model_data not modeldata because the former is more readable and modeldata isn't an English word. I like the _get_maps_freq function. We should use that in the overlay maps as well. If you haven't please merge with a recent version of main-dev as well.

pyaerocom/aeroval/modelmaps_engine.py Outdated Show resolved Hide resolved
@dulte
Copy link
Collaborator Author

dulte commented Oct 4, 2024

Looks good. Only minor changes. I would opt for model_data not modeldata because the former is more readable and modeldata isn't an English word. I like the _get_maps_freq function. We should use that in the overlay maps as well. If you haven't please merge with a recent version of main-dev as well.

Agreed. I've changed the name.

I have merged it in now. The overlay map now uses both _get_maps_freq and the new model reading method. Could you have a look over the new changes? The merging was quite messy, but I think I manged to put everything in the right order

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.

Nice! Thank you 🥇

@lewisblake lewisblake merged commit a9ab661 into main-dev Oct 7, 2024
8 checks passed
@lewisblake lewisblake deleted the maps_freq_emep branch October 7, 2024 12:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants