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

Cmorize gpcc fix #1982

Merged
merged 8 commits into from
Feb 17, 2021
Merged

Cmorize gpcc fix #1982

merged 8 commits into from
Feb 17, 2021

Conversation

mwjury
Copy link
Contributor

@mwjury mwjury commented Jan 13, 2021

This fix improves cmorization of GPCC based on:

  • correct treatment of time points and bounds

Checklist

It is the responsibility of the author to make sure the PR is ready to review. The icons indicate whether the item will be subject to the 🛠 Technical or 🧪 Scientific review.

New or updated data reformatting script:

@Peter9192
Copy link
Contributor

Peter9192 commented Jan 14, 2021

#1980 is causing the failed tests.

@mwjury mwjury mentioned this pull request Jan 19, 2021
10 tasks
@bouweandela
Copy link
Member

To fix the failing tests on CircleCI, you'll need to merge the latest master branch into this branch.

@valeriupredoi
Copy link
Contributor

valeriupredoi commented Feb 4, 2021

cheers @mwjury this looks good - it'd be nice to have a test here too, to test the new functionality 🍺 EDIT - nevermind the test, there is no test module for it anyway 👍

Copy link
Contributor

@valeriupredoi valeriupredoi left a comment

Choose a reason for hiding this comment

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

cheers @mwjury - I will merge once we merge the fix to the iris documentation from #2012 🍺

@remi-kazeroni remi-kazeroni self-requested a review February 4, 2021 16:12
@remi-kazeroni
Copy link
Contributor

I will also try this cmorizer and put the data at DKRZ and CEDA before we merge this

@valeriupredoi
Copy link
Contributor

great! cheers muchly @remi-kazeroni 🍺

@remi-kazeroni
Copy link
Contributor

Nothing to do here. The data were already available in the OBS directories as this PR is a fix to a cmorizer.

@remi-kazeroni remi-kazeroni removed their request for review February 9, 2021 12:34
@valeriupredoi
Copy link
Contributor

excellent, cheers @remi-kazeroni -> @mwjury now that #2011 has been fixed it would be good if you merged master here and in all your other PRs that are ready for merging please, so we merge with clean tests 👍

@bouweandela
Copy link
Member

The data were already available in the OBS directories as this PR is a fix to a cmorizer.

@remi-kazeroni If this fix is needed, I would expect that the data currently in the OBS directories is wrong and needs to be updated after this has been merged?

@bouweandela
Copy link
Member

Just applying some new labels to make the status of all open pull requests more clear. Note that the tests on CircleCI and the documentation build must be successful (green) before the label 'approved by technical reviewer' can be applied.

@remi-kazeroni
Copy link
Contributor

@remi-kazeroni If this fix is needed, I would expect that the data currently in the OBS directories is wrong and needs to be updated after this has been merged?

Good point @bouweandela. Would you suggest that I only look at the cmorizer PRs once they are merged and apply the merged cmorizer script to produce cmorized data that I store in OBS directories? One issue is that sometimes the data used to develop the cmorizer is no longer available online and replaced by a newer version (with different names). Recent examples being #1977 #1851 or #1991. So if the cmorizer has not been checked against available data shortly before the merge, it may not be useful in pratice due to data version issues.

@remi-kazeroni remi-kazeroni self-requested a review February 9, 2021 17:01
@bouweandela
Copy link
Member

apply the merged cmorizer script to produce cmorized data that I store in OBS directories?

Yes, I think that would be the best approach. That way we at least have a copy of the script used to CMORize the data in the OBS directories, that will make the process more reproducible and debugging that data easier.

Would you suggest that I only look at the cmorizer PRs once they are merged

It would be better if you could take an active interest in these pull requests, because there are currently many open and the progress on getting them merged is extremely slow. But it's up to you to decide how much time you can spend on this of course.

So if the cmorizer has not been checked against available data shortly before the merge, it may not be useful in practice due to data version issues.

Maybe we could make it the rule that CMORizer pull requests are always merged by you, so you can run a final check to make sure that everything is in order just before pressing the merge button?

@remi-kazeroni
Copy link
Contributor

Yes, I think that would be the best approach. That way we at least have a copy of the script used to CMORize the data in the OBS directories, that will make the process more reproducible and debugging that data easier.

Agreed. It would be nice to merge a script that is consistent with the data available at the time of the merge.

It would be better if you could take an active interest in these pull requests, because there are currently many open and the progress on getting them merged is extremely slow. But it's up to you to decide how much time you can spend on this of course.

Sure, I'll do my best to contribute to these PRs.

Maybe we could make it the rule that CMORizer pull requests are always merged by you, so you can run a final check to make sure that everything is in order just before pressing the merge button?

That is what I had in mind. I'm fine with that. Thanks for your clarification @bouweandela

@bouweandela
Copy link
Member

Thanks @remi-kazeroni! I have created a pull request to clarify this in the documentation here: #2017.

@valeriupredoi
Copy link
Contributor

@remi-kazeroni I changed the label to "sci review in progress" - that's you, mate, as soon as you happy with the data versioning bits this can be merged 👍

Copy link
Contributor

@remi-kazeroni remi-kazeroni left a comment

Choose a reason for hiding this comment

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

Everything fine. Good to merge 👍

@valeriupredoi
Copy link
Contributor

valeriupredoi commented Feb 17, 2021

@mwjury could you please do this next time: when you have a branch that fixes something off another unmerged branch (like #1995 fixed bits in here) please merge the two branches together and open a single pull request that contains all needed changes; this avoids conflicts and the reviewers depending on merging branches into other branches to be able to test; this would be welcomed, if changes in the branch that fixes stuff in the other branch are minor ie not much code, as is the case with #1995 fixing bits in #1982 (here) 👍 Otherwise, if two branches need to be kept, please provide a note which one of them needs to be merged first, that'll help avoiding conflicts as well 🍺

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants