Commit Graph

119 Commits

Author SHA1 Message Date
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
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
pre-commit-ci[bot]
8dfab45453 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-27 12:35:59 +00:00
toniseibold
5bcecc62c6 retrieve eurostat data is now outside of retrieve_sector_databundle 2024-02-27 13:32:07 +01:00
toniseibold
d363aeb57d removing old eurostat data reports as an option, cleaning up code 2024-02-27 12:04:07 +01:00
Fabian Neumann
719d4dad23 Merge branch 'master' into scenario-management 2024-02-20 12:08:54 +01:00
Fabian Neumann
16e2286188 update copyright years to 2024 2024-02-19 16:21:48 +01:00
Fabian Neumann
b543bf37c9 retrieve.smk: do not protect gas network data 2024-02-17 20:48:46 +01:00
Fabian Neumann
e898781fda use wildcard input functions where applicable 2024-02-17 18:35:26 +01:00
Fabian Neumann
16e42c8fe6 further progress and bugfixes 2024-02-16 11:17:00 +01:00
Fabian Neumann
c83db4e84e add retrieve_cost_data.py script to handle config_provider and move to resources
since dependent on config setting
2024-02-12 16:54:33 +01:00
Fabian Neumann
6b013dbd40 Merge branch 'master' into scenario-management 2024-02-12 10:59:37 +01:00
Fabian Neumann
09ada56bf1 finishing touches and release notes 2024-02-12 10:49:45 +01:00
Fabian
94f72d7276 electricity demand: remove powerstastics flag, merge sources in retrieve_electricity_demand 2024-02-12 10:08:39 +01:00
Fabian
2bd8021058 retrieve electricity demand: make online version snakemake params 2024-02-12 09:48:42 +01:00
Fabian
5c7bbcd94d retrieve electricity demand: use script in order to concat time-series 2024-02-12 09:48:28 +01:00
Fabian Neumann
a9dad3f34e add new resources(), logs(), benchmarks(), config_providers() 2024-02-10 18:09:23 +01:00
Fabian Neumann
6de08bd523 Merge branch 'master' into scenario-management 2024-02-10 17:22:01 +01:00
pre-commit-ci[bot]
39890630ef [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-05 18:23:51 +00:00
pre-commit-ci[bot]
58ac6629fe [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-01-23 15:35:11 +00:00
Koen van Greevenbroek
48974edc8d Make data retrieval rules use their own minimal conda env
This means that the main conda environment can be changed for
development purposes without necessitating the re-running of data
retrieval due to software environment change by default.
2024-01-23 16:27:12 +01:00