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

Merging master into Ariadne 2 #177

Merged
merged 17 commits into from
Sep 3, 2024
Merged

Merging master into Ariadne 2 #177

merged 17 commits into from
Sep 3, 2024

Conversation

lindnemi
Copy link
Collaborator

Changes in our repo to accomodate upstream changes. WIP. At the moment there is an issue with the solid biomass potential. Updates submodule to PyPSA/pypsa-eur#1245

Before asking for a review for this PR make sure to complete the following checklist:

  • Workflow with target rule ariadne_all completes without errors
  • The logic of export_ariadne_variables has been adapted to the changes
  • One or several figures that validate the changes in the PR have been posted as a comment
  • A brief description of the changes has been added to Changelog.md
  • The latest main has been merged into the PR
  • The config has a new prefix of the format YYYYMMDDdescriptive_title

@lindnemi lindnemi marked this pull request as draft August 29, 2024 15:21
Copy link

github-actions bot commented Aug 29, 2024

Validator Report

I am the Validator. Download all artifacts here.
I'll be back and edit this comment for each new commit.

❗ Run failed!

Download 'logs' artifact to see more details.

  • main failed in: retrieve_databundle
  • master-into-ariadne2-august passed! ✅

Comparing master-into-ariadne2-august (835ad5a) with main (0f6e528).
Branch is 17 commits ahead and 1 commits behind.
Last updated on 2024-09-03 17:33:22 CEST.

@lindnemi lindnemi marked this pull request as ready for review September 3, 2024 14:42
@lindnemi lindnemi merged commit 0f6e528 into main Sep 3, 2024
1 check was pending
toniseibold pushed a commit that referenced this pull request Sep 23, 2024
* updating cost data for Bal scenario to technology-data 0.9.1

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update submodule

* additional path for new imports in scripts/definitions

* temporarily allow biomass transport to fix CH bug

* make computation more robust

* even more robustness for gas_frcations calculations

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* switch off biomass_transport again, but temporarily disable must_run for biogas

* fix index error

* switch back to rule get_data workflow

* adapt to upstream config rename

* account hydrogen production by industrial processes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* update submodule

* update submodule

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
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.

2 participants