Add Western asia databundle #837
Conversation
…at89/pypsa-earth into western_asia_databundle
for more information, see https://pre-commit.ci
There was a problem hiding this comment.
Amazing @Emre-Yorat89.
This PR is almost ready to go, few comments only :)
| @@ -348,3 +348,13 @@ databundles: | |||
| output: [cutouts/cutout-2013-era5.nc] | |||
| disable_by_opt: | |||
| build_cutout: [all] | |||
|
|
|||
| bundle_cutouts_westernasia: | |||
There was a problem hiding this comment.
Amazing @Emre-Yorat89 :D
This seems to be ok, the only comment I'd recommend is to add a comment on top of the bundle similarly to the others.
You may use Asia or Africa as templates.
configs/bundle_config.yaml
Outdated
| @@ -9,7 +9,7 @@ | |||
|
|
|||
| # .. code:: yaml | |||
|
|
|||
| # bundle_name: # name of the bundle | |||
| # _name: # name of the bundle | |||
|
Hey @Emre-Yorat89! As discussed, troubles with databundle you experience may be linked with the issue recently fixed by #844. In case updating the repo doesn't help, could you please add an issue on the problem you observe? It would be very helpful to increase stability of the model |
configs/bundle_config.yaml
Outdated
| destination: "cutouts" | ||
| urls: | ||
| gdrive: https://drive.google.com/file/d/110UA0WQnmRV-20cXxYNR8WHLnLti6Qip/view?usp=drive_link | ||
| output: [cutouts/western-asia-2013-era5.nc] |
There was a problem hiding this comment.
Could you please rename file to "cutout-2013-era5.nc" to make it consistent with other cutouts names?
|
Hello @Emre-Yorat89! Thanks for looking into the issue with databundle download. It is in fact connected with "too many request" response from google server side (added a comment to #853 on that). That is quite annoying, but the good news is that the issue is not in any way caused by your PR. Feel free please to finalise it :) You may absolutely replace the current link with an updated one and fix two comments above (one of which I have just corrected, sorry for the typo before!). Then, ready to merge, I think. |
|
Hey @Emre-Yorat89! Thanks a lot for updating the link and introducing the fixes. The only point left is your consent to contribute under AGPL license which is used in the project. Would you mind to tick the first box in the check list to agree? |
There was a problem hiding this comment.
Katia advised me that she is working on finalizing the PR.
I see that the git merge has been delicate.
To try to fix it, I'd recommend to:
- copy this branch to avoid losing the changes
- hard reset the branch before the merge that may have created issues. I believe a good commit may be:73d72a7783ce0985588df183439e65fab82bc20c . So the code is: git reset --hard 73d72a7 and then git push --force
This should restore the version before the merge went wrong
ekatef
force-pushed
the
western_asia_databundle
branch
from
7e6fd95
to
73d72a7
Compare
|
Sorry @Emre-Yorat89 for taking a while to prepare PR for merge. It has been a need to add a release note and resolve merge conflicts. @davide-f thanks a lot for git spells! It has been really helpful. My feeling is that now PR is ready. IC on mac fails due to an error which looks suspiciously similar to troubles with google drive... I'd wait until IC-mac work and then merge. Would you agree? |
|
Hello @ekatef :) Congrats @Emre-Yorat89 and @ekatef :D |
Hello @davide-f! Thanks a lot for checking :D |
|
Merged 🙂 |
Closes # (if applicable).
Changes proposed in this Pull Request
Checklist
envs/environment.yamlanddoc/requirements.txt.config.default.yamlandconfig.tutorial.yaml.test/(note tests are changing the config.tutorial.yaml)doc/configtables/*.csvand line references are adjusted indoc/configuration.rstanddoc/tutorial.rst.doc/release_notes.rstis amended in the format of previous release notes, including reference to the requested PR.