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

Simplify mscw-reader path requirements, read year_available from files #1245

Merged
merged 7 commits into from
Jul 8, 2024

Conversation

heikoklein
Copy link
Member

@heikoklein heikoklein commented Jul 6, 2024

Change Summary

  • The mscw-reader no longer reads unknown model-files. Known model-files are now clearly stated instead of guessed by globs.
  • There is no longer a requirement of 4-digits in the data-dir which were interpreted as year.
  • years-available are now read from the model-files like Base_fullrun.nc
  • Trends/multi-year analysis can be given as a data-dir to a directory containing subdirectories with four-digits. The subdirectories must contain Base_*.nc files (with * being hour, day, month, fullrun)
  • the filepath attribute was never used and therefore removed

Related issue number

fixes #896

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 linked an issue Jul 6, 2024 that may be closed by this pull request
@heikoklein heikoklein added this to the m2024-08 milestone Jul 6, 2024
Copy link

codecov bot commented Jul 6, 2024

Codecov Report

Attention: Patch coverage is 93.33333% with 5 lines in your changes missing coverage. Please review.

Project coverage is 79.32%. Comparing base (b1fa238) to head (ea8d117).
Report is 447 commits behind head on main-dev.

Files with missing lines Patch % Lines
pyaerocom/io/mscw_ctm/reader.py 93.33% 5 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##           main-dev    #1245      +/-   ##
============================================
- Coverage     79.33%   79.32%   -0.02%     
============================================
  Files           133      133              
  Lines         20289    20301      +12     
============================================
+ Hits          16096    16103       +7     
- Misses         4193     4198       +5     
Flag Coverage Δ
unittests 79.32% <93.33%> (-0.02%) ⬇️

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 6, 2024 13:54
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.

Minor changes. Looks good otherwise

pyaerocom/io/mscw_ctm/reader.py Show resolved Hide resolved
pyaerocom/io/mscw_ctm/reader.py Show resolved Hide resolved
@lewisblake lewisblake merged commit d8dcba2 into main-dev Jul 8, 2024
7 of 8 checks passed
@lewisblake lewisblake deleted the 896-emep-reader-years-in-path branch July 8, 2024 09:05
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.

EMEP reader: Years in path
2 participants