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

Add support for daily output frequency #9

Closed
wants to merge 7 commits into from
Closed

Add support for daily output frequency #9

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
18964ea
Add support for daily output frequency
duncanwp Oct 14, 2022
a3f6873
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 14, 2022
1391ba7
Fix exception style
duncanwp Oct 14, 2022
625a911
Revert unintended change
duncanwp Oct 14, 2022
7fbe763
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Oct 14, 2022
2ba4f64
Update pangeo_forge_esgf/dynamic_kwargs.py
duncanwp Jan 23, 2023
49035f0
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions pangeo_forge_esgf/dynamic_kwargs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,32 @@
# TODO: I might not want to allow this in the ocean and ice fields. Lets see
)

daily_divisors = sorted([1, 30, 360, 365, 3653])

allowed_divisors = {
"Omon": monthly_divisors,
"SImon": monthly_divisors,
"Amon": monthly_divisors,
"day": daily_divisors,
Copy link
Owner

Choose a reason for hiding this comment

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

Would these dividers also work generally for other daily data (see here: https://github.com/WCRP-CMIP/CMIP6_CVs/blob/master/CMIP6_table_id.json)?

Copy link
Author

Choose a reason for hiding this comment

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

I honestly have no idea, I didn't realise there were different day table_id and can't find any documentation on what they represent. They might be the same but it seems a bit redundant. Happy to include them or not depending on how much you want to protect against potential future issues.

Copy link
Owner

Choose a reason for hiding this comment

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

I will try to check this PR out in the next few days, and maybe run some tests with the 'other' daily frequencies.

} # Add table_ids and allowed divisors as needed


def get_timesteps_simple(dates, table_id):
assert (
"mon" in table_id
) # this needs some more careful treatment for other timefrequencies.
timesteps = [
months = [
(int(d[1][0:4]) - int(d[0][0:4])) * 12 + (int(d[1][4:6]) - int(d[0][4:6]) + 1)
for d in dates
]
if "mon" in table_id:
timesteps = months
elif "day" in table_id:
timesteps = [
m * 30 for m in months
] # This is close enough without worrying about calendars etc.
Copy link
Owner

Choose a reason for hiding this comment

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

See my comment above. I guess dealing with calendars is a whole can of worms, but I am thinking it might be worth to put some of these thoughts into a dedicated issue to keep track of it? Again for now this seems fine for me!

Copy link
Author

Choose a reason for hiding this comment

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

Sure, that sounds like a plan

else:
# this needs some more careful treatment for other timefrequencies.
raise NotImplementedError(
"Only daily and monthly time frequencies are currently supported"
)
return timesteps


Expand Down