Commit Graph

5177 Commits

Author SHA1 Message Date
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
lisazeyen
7451349fed
take eurostat year for transport demand 2024-07-23 15:10:05 +02:00
lisazeyen
d964c46a18
Merge branch 'master' into jrc-idees-2020 2024-07-22 21:53:44 +02:00
lisazeyen
3c62a3b4cb add release notes 2024-07-22 21:53:11 +02:00
Fabian Neumann
f11f8d8613 solver settings: add copt-gpu setings for pdlp solver 2024-07-22 21:51:52 +02:00
lisazeyen
8f2cea4d93
Merge branch 'master' into jrc-idees-2020 2024-07-22 21:43:03 +02:00
pre-commit-ci[bot]
fb26aaf38d [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-22 19:42:54 +00:00
lisazeyen
b957f88645 fix bugs and clean up 2024-07-22 21:40:47 +02:00
lisazeyen
53bbc28908 add eurostat data for GB agriculture 2024-07-22 21:15:40 +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
pre-commit-ci[bot]
0e1e509006 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-19 13:43:16 +00:00
lisazeyen
39e853e2b3 make sure not to divide by zero 2024-07-19 15:42:44 +02:00
AmosSchledorn
f3c898f43d build district heating heat pump COPs using approximation from Jensen et al. and values from Pieper et al. 2024-07-19 15:39:16 +02:00
AmosSchledorn
167b056def remove obsolete rural/urban COPs and rename cop_..._total to cop_..._individual_heating 2024-07-19 15:22:50 +02:00
pre-commit-ci[bot]
028d0d6e7a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-19 13:15:38 +00:00
lisazeyen
dea48c965a correct indexing of DH share 2024-07-19 15:15:12 +02:00
lisazeyen
104fa73119 remove rescale to Eurostat 2024-07-19 15:15:12 +02:00
Amos Schledorn
8fe5921e44
Fix negative district heating progress (#1168)
* impose minimum district heating progress of 0

* update release_notes

* update configtables
2024-07-19 12:30:26 +02:00
pre-commit-ci[bot]
086d46cdb4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-19 08:21:09 +00:00
lisazeyen
4c46c57fec avoid double download of JRC idees 2024-07-19 10:20:19 +02:00
lisazeyen
5f009590f5 remove todos 2024-07-18 15:48:52 +02:00
pre-commit-ci[bot]
8cc23945b5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-07-18 13:43:40 +00:00
lisazeyen
957176a20d adjustment to build_energy_totals 2024-07-18 15:39:52 +02:00