Commit Graph

4911 Commits

Author SHA1 Message Date
AmosSchledorn
81618d4be1 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-07-29 18:30:23 +02:00
AmosSchledorn
29479c50d0 pass heat source/system type to prepare_sector_network and add_existing_baseyear 2024-07-29 18:29:27 +02:00
pre-commit-ci[bot]
51f42b4a36 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-29 12:37:00 +00:00
AmosSchledorn
0edf566e3f attempt to handle heat_pump_sources dynamically 2024-07-29 14:36:30 +02:00
AmosSchledorn
9073e49085 add link to paper in release notes 2024-07-29 11:43:53 +02:00
AmosSchledorn
ff12480713 Merge branch 'update-district-heating-cops' of https://github.com/PyPSA/pypsa-eur into update-district-heating-cops 2024-07-29 11:38:32 +02:00
AmosSchledorn
1d3e39979a remove duplicate staticmethods 2024-07-29 11:36:46 +02:00
Amos Schledorn
69b01e670f
Update config/config.default.yaml
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 11:33:28 +02:00
Amos Schledorn
160cb011cc
Update doc/configtables/sector.csv
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-29 11:30:44 +02:00
Amos Schledorn
da3ad1725e
Merge branch 'master' into update-district-heating-cops 2024-07-29 10:33:39 +02:00
AmosSchledorn
9183846c6e update sector configtable 2024-07-29 10:30:23 +02:00
AmosSchledorn
6c14d20726 checkout sector configtable from master 2024-07-29 10:26:47 +02:00
Micha
f5fe0d062c
Rename ev battery master (#1116)
* 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>
2024-07-29 09:50:02 +02:00
Toni Seibold
23ea16dc14
Lifetime of Gas Pipelines (#1162)
* 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>
2024-07-29 09:47:08 +02:00
AmosSchledorn
3c5b11e4ea update release notes 2024-07-25 15:28:31 +02:00
AmosSchledorn
e21694473f Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-25 15:12:13 +02:00
pre-commit-ci[bot]
64d0f291d5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-25 13:11:08 +00:00
AmosSchledorn
8875ab6c38 add licensing info 2024-07-25 15:10:45 +02:00
AmosSchledorn
da201e1b9a udpate add_brownfield COPs 2024-07-25 15:08:42 +02:00
AmosSchledorn
d297f84ea7 update inputs for add_existing_baseyear 2024-07-25 14:50:27 +02:00
pre-commit-ci[bot]
744aaf71de [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-25 12:33:39 +00:00
AmosSchledorn
b80bb7bb7a update base year COPs 2024-07-25 14:33:14 +02:00
toniseibold
9b7831974f excluding emissions from sector ratios development
[pre-commit.ci] auto fixes from pre-commit.com hooks

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

just changing the fillna function makes the whole PR cleaner
2024-07-24 18:22:00 +02:00
AmosSchledorn
368971f2a6 remove cop_total input from prepare_sector_network 2024-07-24 17:19:42 +02:00
AmosSchledorn
f86d94c7a5 Merge remote-tracking branch 'origin/update-district-heating-cops' into update-district-heating-cops 2024-07-24 17:06:02 +02:00
AmosSchledorn
0c2f9b5daa remove rural/urban temperature 2024-07-24 17:05:04 +02:00
pre-commit-ci[bot]
8d6feb6a66 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-24 15:05:01 +00:00
AmosSchledorn
b720bd9eca Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-24 15:43:34 +02:00
AmosSchledorn
a4847a10ce update build_sector.smk 2024-07-24 15:40:21 +02:00
AmosSchledorn
eb2911cb93 rename __main__ to run 2024-07-24 15:31:48 +02:00
Fabian Neumann
0470f119cf
base_network: use GeoSeries.voronoi_polygons instead of custom solution (#1172)
* base_network: use GeoSeries.voronoi_polygons instead of custom solution

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

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

* base_network: move voronoi calculations into separate function

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

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

* base_network: fix typo in function voronoi()

* base_network: refine voronoi function

* add release note [no ci]

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2024-07-24 15:31:46 +02:00
AmosSchledorn
a9f4c6375d change default DH return temperature to 50C 2024-07-24 15:04:14 +02:00
AmosSchledorn
3fac27ff27 use module structure 2024-07-24 15:03:44 +02:00
AmosSchledorn
0e6a7377ea update configtables 2024-07-24 15:03:14 +02:00
Fabian Neumann
eab315291e
remove {scope} wildcard (#1171)
* remove {scope} wildcard

* do not create removed files
2024-07-24 13:19:57 +02:00
Fabian Neumann
8b1b1144d5
cutouts: update zenodo repository version (#1176) 2024-07-24 11:01:00 +02:00
Fabian Neumann
d142d5a50b
aggregate curtailment into single curtailment generator per bus (#1177)
* add curtailment generator mode

* add documentation
2024-07-24 10:54:15 +02:00
AmosSchledorn
de10492e10 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-23 17:30:51 +02:00
Fabian Neumann
f11f8d8613 solver settings: add copt-gpu setings for pdlp solver 2024-07-22 21:51:52 +02:00
Fabian Neumann
b8b92ace64 common.smk: make solver_threads also look for capitalised 'Threads' 2024-07-22 17:35:50 +02:00
lisazeyen
877ca3eb44
change sign sequestration store marginal cost (#1174) 2024-07-22 16:44:26 +02:00
pre-commit-ci[bot]
5361facbb7 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-22 13:39:06 +00:00
Fabian Neumann
745df4d2c1 fix typo 2024-07-22 15:22:32 +02:00
AmosSchledorn
46f9c7b520 Merge remote-tracking branch 'origin/master' into update-district-heating-cops 2024-07-22 14:45:38 +02:00
Fabian Neumann
b49895a041
determine_availability_matrix_MD_UA: enable parallelism & remove plots (#1170)
* determine_availability_matrix_MD_UA: enable parallelism through temp files and remove plots

* [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>
2024-07-19 17:43:11 +00:00
Iegor Riepin
ba55971c23
Compatibility of data processing for Ukraine (#1146)
* data: retrieve gdp and pop raw data for UA,MD

* Updated retrieval code.

* add_electricity script for UA and MD using updated, endogenised GDP and PPP data.

* Outsourced building of gdp and ppp. Only called when UA and/or MD are in country list.

* Accepted suggestion by @fneum in retrieve rule.

* Cleaned determine_availability_matrix_MD_UA.py, removed redundant code

* Updated build_gdp_pop_non_nuts3 script to use the mean to distribute GDP p.c. Added release notes. Bug fixes.

* Bug fixes --> 'ppp' to 'pop'

* Bug fix: only distribute load to buses with substation.

* Updated to download GDP and population raster via PyPSA-Eur zenodo databundle. Removal of dedicated retrieve function. Updated release notes.

* Updated release notes.

* correct input file paths

* update zenodo url for databundle release v0.3.0

* doc: update release_notes

* minor adjustments: benchmark, increase mem_mb, remove plots, handling of optional inputs

---------

Co-authored-by: bobbyxng <bobbyxng@gmail.com>
Co-authored-by: Bobby Xiong <36541459+bobbyxng@users.noreply.github.com>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-19 19:23:35 +02:00
AmosSchledorn
560373a864 add DH cops to network 2024-07-19 18:54:30 +02:00
AmosSchledorn
0c7e7cb46b fix naming, udpate docs 2024-07-19 18:54:19 +02:00
Fabian Hofmann
71efc8f12a
draft bot for automated fixed env yaml (#1049)
* draft bot for automated fixed env yaml

* Update .github/workflows/update-fixed-env.yaml

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>

---------

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-07-19 17:49:41 +02:00
AmosSchledorn
052394fa88 change naming from individual/district heating to denctral/central heating 2024-07-19 15:57:53 +02:00