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

Model maps with ColocatedData objects #1470

Merged
merged 9 commits into from
Jan 7, 2025
Merged

Conversation

lewisblake
Copy link
Member

@lewisblake lewisblake commented Jan 6, 2025

Change Summary

Implements the functionality to make "model" maps from a ColocatedData object.

The way to do this is to

  • provide the model_data_dir in the model entry, ensuring that the path contains the model name at the end. (i.e., "/lustre/storeB/users/lewisb/projects/CAMS2_82/coldata_testing2x2_180/ECMWF-OSUITE")
  • provide the coldata_dir in the obs entry, ensuring that the model name does not appear at the end (i.e., "/lustre/storeB/users/lewisb/projects/CAMS2_82/coldata_testing2x2_180")
  • set add_model_maps=True and optionally (depending on the resolution of the colocated data object) only_model_maps=True
  • optionally set pages = ("maps",) if you only want to show maps
  • declare which obserations and/or models should be shown in the right menu on the maps page. (e.g., right_menu = ("MODIS-TERRA", ))
  • depending on the resolution you may want to use overlay maps. The preferred way to do this is to specify this for each model and observation network. (e.g., plot_types = {"ECMWF-OSUITE": "overlay", "MODIS-TERRA": "overlay"})

image

Related issue number

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 Jan 6, 2025

Codecov Report

Attention: Patch coverage is 57.14286% with 9 lines in your changes missing coverage. Please review.

Project coverage is 78.47%. Comparing base (11c11fb) to head (2291cb1).
Report is 74 commits behind head on main-dev.

Files with missing lines Patch % Lines
pyaerocom/aeroval/modelmaps_helpers.py 50.00% 9 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           main-dev    #1470      +/-   ##
============================================
+ Coverage     78.43%   78.47%   +0.03%     
============================================
  Files           137      139       +2     
  Lines         20963    21113     +150     
============================================
+ Hits          16442    16568     +126     
- Misses         4521     4545      +24     
Flag Coverage Δ
unittests 78.47% <57.14%> (+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.

@lewisblake lewisblake added the CAMS2_82 Issues related to the CAMS2_82 contract label Jan 7, 2025
@lewisblake lewisblake added this to the m2025-01 milestone Jan 7, 2025
@lewisblake lewisblake requested a review from thorbjoernl January 7, 2025 10:58
@lewisblake lewisblake marked this pull request as ready for review January 7, 2025 10:58
pyaerocom/aeroval/modelmaps_engine.py Outdated Show resolved Hide resolved
pyaerocom/aeroval/modelmaps_helpers.py Outdated Show resolved Hide resolved
pyaerocom/aeroval/modelmaps_engine.py Outdated Show resolved Hide resolved
pyaerocom/aeroval/modelmaps_engine.py Outdated Show resolved Hide resolved
pyaerocom/aeroval/modelmaps_engine.py Show resolved Hide resolved
pyaerocom/aeroval/modelmaps_engine.py Outdated Show resolved Hide resolved
@lewisblake lewisblake requested a review from thorbjoernl January 7, 2025 12:50
Copy link
Collaborator

@thorbjoernl thorbjoernl left a comment

Choose a reason for hiding this comment

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

LGTM

@thorbjoernl thorbjoernl merged commit 373e441 into main-dev Jan 7, 2025
7 of 8 checks passed
@thorbjoernl thorbjoernl deleted the model_maps_with_coldata branch January 7, 2025 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CAMS2_82 Issues related to the CAMS2_82 contract
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants