Commit Graph

138 Commits

Author SHA1 Message Date
Fabian Hofmann
55370a57fb
retrieve: remove cutout protection (#1220) 2024-08-15 14:51:51 +02:00
Fabian Neumann
f263862455
use lower resolution EEZ shapes to reduce excessive RAM use (#1210) 2024-08-13 21:03:07 +02:00
lisazeyen
fe9185ef3f
Merge branch 'master' into jrc-idees-2020 2024-08-09 14:17:25 +02:00
cpschau
f8d0efbe99
Addition of unsustainable biomass potentials (#1139)
* add columns to potential df defined by difference to eurostat

* add network components

* add unsustainable bioliquids

* replaced stores by generators, still infeasible

* remove municipal waste

* remove separate treatment of waste from biomass potential calculation

* phase out unsustainble biomass potentials

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

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

* phase-out unsustainable bioliquids

* remove waste_incineration from build_sector rule

* multiple potential calculation for different planning horizons

* raised costs of unsustainable solid biomass

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

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

* stores instead of generators

* change snakemake inputs

* add phas-eout to config

* add techcolor for unsustainable bioliquids

* add config parameter to disable inclusion of unsustainable bioenergy potentials

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

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

* add biomass to params

* remove call of snakemake object in define_spatial

* Quick resolve of review part 1 (config parameters, if-clause-reduction, bioliquid spatial, fix bioliquid link capacity

* Quick resolve of review part 2 (config table, helper function, fixed build_eurostat, removed dir-change, forced unsustainable usage, reverted overnight distinction in Snakefile)

* Cast of planning_horizon parameter to int type after test run

* added JRC fuel costs for solid and liquid biofuels, BtL VOM

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

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

* clean-up after master merge

* adressed review (increase threads for build_eurostat, fixed e_max_pu of Stores, changed version of technology-data); added release note

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: lisazeyen <35347358+lisazeyen@users.noreply.github.com>
2024-08-07 15:52:00 +00:00
Fabian Neumann
fb41016c60
EEZ: Update EEZ to v12, auto-download and remove from databundle (#1188)
* eez: update to version 12, autodownload, remove pycountry

* eez: do not simplify as it distorts topology

* remove missed merge conflicts
2024-08-07 15:28:55 +02:00
lisazeyen
842d4b36e6
Merge branch 'master' into auto-dl-countries 2024-08-07 14:47:45 +02:00
lisazeyen
95903eeca7
Merge branch 'master' into jrc-idees-2020 2024-08-07 11:58:22 +02:00
Fabian Neumann
59574211a4 retrieve.smk: consistently use conda directive 2024-08-07 10:15:35 +02:00
pre-commit-ci[bot]
3c528b7b0a [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-06 15:52:01 +00:00
lisazeyen
2c7e30bb17 remove ammonia demand script 2024-08-06 17:46:23 +02:00
lisazeyen
0ec367ed7a
save idees directly in data not in bundle
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2024-08-06 17:37:36 +02:00
pre-commit-ci[bot]
89906cfdb4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-08-02 07:55:00 +00:00
Fabian Neumann
311c82d65e naturalearth: automatically download and remove from data bundle 2024-08-02 09:53:34 +02:00
lisazeyen
52c8037a3e merge master 2024-07-31 16:09:33 +02:00
lisazeyen
2f3fde26d0 update ammonia demand data to 2022 2024-07-29 16:09:38 +02:00
lisazeyen
314f6c6f0f retrieve ammonia demand data 2024-07-29 16:00:13 +02:00
Fabian Neumann
8b1b1144d5
cutouts: update zenodo repository version (#1176) 2024-07-24 11:01:00 +02:00
lisazeyen
8f2cea4d93
Merge branch 'master' into jrc-idees-2020 2024-07-22 21:43:03 +02: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
lisazeyen
ecccc1429f add rule to retrieve JRC IDEES 2021 2024-07-18 15:39:27 +02:00
Fabian Neumann
703b206e1f tidy up update_residential_from_eurostat 2024-05-21 20:16:57 +02:00
Fabian Neumann
4e85ddc5c9 Merge branch 'update_households_energy' of github.com:yerbol-akhmetov/pypsa-eur into yerbol-akhmetov-update_households_energy 2024-05-21 19:02:18 +02:00
Fabian Neumann
eb4381be4d update energy balances April 2023 link 2024-05-21 15:59:46 +02:00
Fabian Neumann
3d5d56acf3 only use ancient for inputs not outputs 2024-05-21 14:19:28 +02:00
Fabian Neumann
d32feb3aae mark downloaded files as ancient rather than protected 2024-05-20 22:37:16 +02:00
pre-commit-ci[bot]
985aecb0c4 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-05-13 19:39:02 +00:00
Fabian Neumann
0d9e0f34fd Merge branch 'master' into reduced-data-bundle 2024-05-12 15:53:08 +02:00
Fabian Neumann
a1e42db58b change in zenodo urls from record to records 2024-04-15 15:14:02 +02:00
Fabian Neumann
fe1199e981 update shipdensity_global.zip link [no ci] 2024-04-15 15:03:23 +02:00
Fabian Neumann
991eef6d97 update and reduce databundle size 2024-04-15 14:48:34 +02:00
yerbol-akhmetov
8b28f34f14 retrieve eurostat disagregated energy balances for household 2024-04-14 13:19:42 +05:00
Koen van Greevenbroek
859212b21f Use powerplantmatching IRENASTAT for add_existing_baseyear 2024-04-11 12:47:13 +02:00
Koen van Greevenbroek
fcf773c003 Copy, don't move natura.tiff to resources
Preventing problems when parallel processes attempt to move the same
file to different resources directories.
2024-03-19 09:30:37 +01:00
Koen van Greevenbroek
941de04859 Don't use log path function in IRENA retrieval rule
The `logs` function returns a path with a {run} wildcard which is not
present in the output of the retrieval rule. Follows f50ee2f2.
2024-03-18 10:40:32 +01:00
Fabian Neumann
e459c3c89d add release notes; rename artificial to synthetic 2024-03-15 14:28:01 +01:00
Fabian Neumann
f50ee2f225 do not use log() for config independent retrieve rules 2024-03-15 13:50:53 +01:00
Fabian Neumann
ee55bba568 omit synthetic load data md5 validation 2024-03-15 12:04:25 +01:00
Fabian Neumann
97d876d4e5 update synthetic load data to cover 1941-2023 2024-03-15 11:44:41 +01:00
Fabian Neumann
a429b48874 update storage provider for snakemake 8 2024-03-13 09:19:10 +01:00
Fabian Neumann
7fa6811760 Merge branch 'master' into multiyear 2024-03-13 09:13:31 +01:00
Fabian Neumann
bcd02d94d6 retrieve: remove storage(static=True) call 2024-03-09 12:10:45 +01:00
Fabian Neumann
45e955a0d8 add https:// prefix for all storage() calls 2024-03-09 12:07:47 +01:00
Fabian Neumann
105dc6470a replace remaining instances of HTTP.remote 2024-03-08 17:51:02 +01:00
Fabian Neumann
d983d79ed2 Merge branch 'master' into snakemake-8 2024-03-08 17:50:08 +01:00
Fabian Neumann
579cd0c756 Merge branch 'master' into multiyear 2024-03-06 16:34:53 +01:00
Fabian Neumann
5b513f81db move eurostat into data/eurostat subdirectory from sector-bundle 2024-03-05 18:42:15 +01:00
Fabian Neumann
8904943a87 integrate artificial load data supplement into build_electricity_demand 2024-03-04 19:37:52 +01:00
Koen van Greevenbroek
c2e7c125c7 Automatic formatting of snakemake rules 2024-03-01 13:24:02 +01:00
Koen van Greevenbroek
de0c0cd1f4 Merge remote-tracking branch 'upstream/master' into multiyear 2024-03-01 11:45:31 +01:00
Koen van Greevenbroek
90fb0b13da Various bugfixes to make multiyear branch run 2024-02-29 12:48:16 +01:00