Master into ariadne2 august #1245
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
for more information, see https://pre-commit.ci
…to update-district-heating-cops
for more information, see https://pre-commit.ci
for more information, see https://pre-commit.ci
…nge naming from "generic" to "default"
for more information, see https://pre-commit.ci
* inf lifetime of gas pipelines avoids adding new links each planning horizon * p_nom_extendable for existing gas pipelines is set false if retrofitting to H2 is not allowed * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* rename EV battery * add release note * adjust tech colors * fix for battery renaming in plot_summary --------- Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
…SA/pypsa-eur into update-district-heating-cops
6 tasks
for more information, see https://pre-commit.ci
* retrieve urban population fraction from World Bank API * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* industry distribution: split EAF + integrated using GEM GSPT, add ammonia plants * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add release note [no ci] * add cement plant data for countries not in Hotmaps * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * add refineries data for countries not in Hotmaps --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* resolve Kosovo (XK) as separate country * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * fillna * add missing key in data/existing_infrastructure/existing_heating_raw.csv --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* feat: Add rule to build central heating temperature profiles, adjust build_cop_profiles accordingly * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * style: make new config settings prettier * docs: add file headers * docs: update configtables and module docstring * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * docs: update release notes * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * chore: use smooth ambient temperature through rolling window; remove default vals in class * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * Update doc/configtables/sector.csv --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Amos Schledorn <a.schledorn@tu-berlin.de> Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
commit a2b82195b872bae11a9e247c53756ca3ae512362
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date: Fri Aug 30 16:13:36 2024 +0200
minor adjustments
commit 4f9eb04
Merge: 7b525a5 bf2d82a
Author: Fabian Neumann <fabian.neumann@outlook.de>
Date: Fri Aug 30 16:08:58 2024 +0200
Merge branch 'master' into master
commit 7b525a5
Merge: d903337 a357ba1
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date: Mon Aug 26 13:21:06 2024 +0200
Merge branch 'master' into master
commit d903337
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date: Mon Aug 26 10:34:27 2024 +0200
Update scripts/solve_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
commit 98e6c5b
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date: Mon Aug 26 10:34:21 2024 +0200
Update scripts/solve_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
commit be19a2b
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date: Mon Aug 26 10:34:15 2024 +0200
Update scripts/solve_operations_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
commit 8093eaa
Author: danielelerede-oet <daniele.lerede@openenergytransition.org>
Date: Mon Aug 26 10:34:08 2024 +0200
Update scripts/solve_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
commit 746d176
Author: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Wed Aug 21 15:29:12 2024 +0000
[pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
commit f46fdee
Author: Daniele Lerede <daniele.lerede@openenergytransition.org>
Date: Wed Aug 21 17:11:32 2024 +0200
fix solve_operations_network
* ci: code scanning with CodeQL * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
* Add emissions and fuel consumption from fuel refinieries * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
…s to zero for overnight
for more information, see https://pre-commit.ci
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging master into ariadne2. This PR is for testing if something breaks. At the moment there is an issue with the GlobalConstraint-biomass limit.