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

Update CMIP6 tables to 6.9.32 #706

Merged
merged 4 commits into from
Sep 28, 2020
Merged

Update CMIP6 tables to 6.9.32 #706

merged 4 commits into from
Sep 28, 2020

Conversation

jvegreg
Copy link
Contributor

@jvegreg jvegreg commented Jul 10, 2020

As request by @bouweandela in #704

Tasks

  • Create an issue to discuss what you are going to do, if you haven't done so already (and add the link at the bottom)
  • This pull request has a descriptive title that can be used in a changelog
  • Add unit tests
  • Public functions should have a numpy-style docstring so they appear properly in the API documentation. For all other functions a one line docstring is sufficient.
  • If writing a new/modified preprocessor function, please update the documentation
  • Circle/CI tests pass. Status can be seen below your pull request. If the tests are failing, click the link to find out why.
  • Codacy code quality checks pass. Status can be seen below your pull request. If there is an error, click the link to find out why. If you suspect Codacy may be wrong, please ask by commenting.
  • Please use yamllint to check that your YAML files do not contain mistakes
  • If you make backward incompatible changes to the recipe format, make a new pull request in the ESMValTool repository and add the link below

If you need help with any of the tasks above, please do not hesitate to ask by commenting in the issue or pull request.


Closes #704

schlunma and others added 2 commits July 9, 2020 12:29
* Fixed calculation of time weights

* Fixed failing FLAKE8 test

* Added more test for time weighting and fixed cube dimensions in test
@jvegreg jvegreg added the cmor Related to the CMOR standard label Jul 10, 2020
@jvegreg
Copy link
Contributor Author

jvegreg commented Jul 10, 2020

The tests are failing because of an error of pytest. They run locally without issue

@jvegreg jvegreg requested a review from bouweandela July 10, 2020 07:42
@bouweandela
Copy link
Member

Thanks! I created a pull request to fix the failing tests: #707.

@jvegreg
Copy link
Contributor Author

jvegreg commented Jul 10, 2020

Codacy analysis was not setup for this branch. I just did it

@bouweandela bouweandela changed the base branch from v2.0.0 to master July 10, 2020 12:58
Copy link
Member

@bouweandela bouweandela 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! @mattiarighi Could you please test?

@mattiarighi
Copy link
Contributor

I think we can test this once we make the final run of all recipes.

@bouweandela
Copy link
Member

Just for clarity, do we want to have this included in v2.0.0? We've had problems in the past when updating the CMOR tables, because the format changed, so I'm not sure if it's safe to include an update this late.

@jvegreg
Copy link
Contributor Author

jvegreg commented Jul 10, 2020

Just for clarity, do we want to have this included in v2.0.0? We've had problems in the past when updating the CMOR tables, because the format changed, so I'm not sure if it's safe to include an update this late.

My answer will be yes, but not as much as to block v2.0 release. I think we can manage to do it, as it will be tested thoroughly when running all the recipes. Also, if we detect non trivial issues, reverting this change is easy and safe, as no other commits will modify the affected files.

@bouweandela
Copy link
Member

I think we can manage to do it, as it will be tested thoroughly when running all the recipes.

The main question then is, when are we going to do this? After the ESMValCore v2.0.0 release on July 20 or before it? I have tried to run about 20 recipes on the esmvaltool VM, but have no time to continue that testing before the release. @mattiarighi What are your plans in this?

@mattiarighi
Copy link
Contributor

Ideally all recipes should work with the released version.
If we share the effort, I think it's doable to test all of them before the release.

Concerning the tables, it's probably better to include this at a later stage.

@jvegreg
Copy link
Contributor Author

jvegreg commented Jul 10, 2020

Concerning the tables, it's probably better to include this at a later stage.

Ok, just beware that some model names have changed between versions. It is possible that you find errors because of this in CMIP6 recipes if the data in DKRZ has been updated

@bouweandela
Copy link
Member

Merging this now, so it will be included in the next release.

@bouweandela bouweandela merged commit fdf1d05 into master Sep 28, 2020
@bouweandela bouweandela deleted the update_cmip6_tables branch September 28, 2020 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cmor Related to the CMOR standard
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update CMIP6 CMOR tables
4 participants