Commit Graph

140 Commits

Author SHA1 Message Date
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
Fabian Neumann
c907d59253
remove unused rule prepare_links_p_nom (#1203)
* remove rule

* [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-08-07 15:20:08 +02:00
Fabian Neumann
311c82d65e naturalearth: automatically download and remove from data bundle 2024-08-02 09:53:34 +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
Fabian Neumann
54009e7af8 increase mem_mb for build_powerplants rule 2024-07-01 13:33:29 +01:00
Fabian Neumann
5397f3fe85 avoid duplicate existing RES capacities (closes #1016) 2024-05-24 09:47:23 +02:00
lisazeyen
2223e011a0 merge master 2024-05-15 16:14:25 +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
84d6634af0
Merge branch 'master' into implement-floating 2024-05-13 10:04:42 +02:00
Fabian Neumann
0d9e0f34fd Merge branch 'master' into reduced-data-bundle 2024-05-12 15:53:08 +02:00
Philipp Glaum
da617be276 Merge branch 'master' of github.com:PyPSA/pypsa-eur into implement-floating 2024-05-10 13:29:58 +02:00
Koen van Greevenbroek
76c201ef7d Integrate build_bus_regions into base_network
Fixes a problem with the `build_bus_regions` writing to base.nc
without declaring base.nc as an output.
2024-05-03 14:53:18 +02:00
Parisra
17b3e1677d
Merge branch 'PyPSA:master' into adding_solar_tracking_single_axis 2024-04-29 14:27:26 +02:00
pre-commit-ci[bot]
105cadaf7b [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-04-25 16:08:48 +00:00
Parisra
b9cb82cc3b
Update build_renewable_profiles
Add solar-hsat to Onshore technologies
2024-04-25 11:30:42 +02:00
Parisra
91de7a891d
Update rule: determine_availability_matrix
Add solar-hsat as an Onshore technology
2024-04-25 11:28:33 +02:00
martacki
feb564506a remove connection_costs as snakemake output from simplify_network 2024-04-16 15:41:01 +02:00
Fabian Neumann
991eef6d97 update and reduce databundle size 2024-04-15 14:48:34 +02:00
toniseibold
3b31b99dd2 removing the output file eia_hydro_stats.csv 2024-04-12 10:01:09 +02:00
Fabian Neumann
e459c3c89d add release notes; rename artificial to synthetic 2024-03-15 14:28:01 +01:00
Fabian Neumann
57b487f163 handle leap days in temporal clustering 2024-03-14 15:38:36 +01:00
Fabian Neumann
0d6ba9fbd1 move leap year handling into helper function 2024-03-14 15:15:56 +01:00
Fabian Neumann
f84707ba38 drop_leap_days already in renewable profiles 2024-03-14 14:30:50 +01:00
Fabian Neumann
cbeb9834ac update hydro capacity and generation data 2024-03-14 14:08:58 +01:00
pre-commit-ci[bot]
8aa6d98f56 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-03-04 18:38:31 +00:00
Fabian Neumann
8904943a87 integrate artificial load data supplement into build_electricity_demand 2024-03-04 19:37:52 +01:00
Fabian Neumann
9d913bcb38 smaller fixes and reduction of diff 2024-03-04 19:36:41 +01:00
Fabian Neumann
030e5b15ad remove rule build_cutout_year 2024-03-04 17:51:32 +01:00
Fabian Neumann
c2011bce49 remove {weather_year} wildcard 2024-03-04 17:48:56 +01:00
Koen van Greevenbroek
1ff8321c5e Remove erroneous automatic snakefmt formatting 2024-03-01 15:56:09 +01:00
Koen van Greevenbroek
61d565ec09 Correct formatting in build_electricity.smk 2024-03-01 15:26:16 +01:00
Koen van Greevenbroek
c2e7c125c7 Automatic formatting of snakemake rules 2024-03-01 13:24:02 +01:00
Koen van Greevenbroek
f6f98c102c Use default cutout for ship and nature raster extents
This avoids the need to either collect all cutouts for all weather
years or arbitrarily pick all cutouts for a certain weather year.
2024-03-01 11:45:39 +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
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
d335275e0f build_electricity: add missing wildcard call 2024-02-17 20:43:11 +01:00
pre-commit-ci[bot]
cc3d7a4cbb [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-17 17:35:54 +00:00
Fabian Neumann
e898781fda use wildcard input functions where applicable 2024-02-17 18:35:26 +01:00
Fabian Neumann
89d0fa24b6 further adjustments to latest master branch commits 2024-02-17 17:38:46 +01:00
Fabian Neumann
35b2228891 Merge branch 'wc-to-cf' into scenario-management 2024-02-17 17:16:28 +01:00
Fabian Neumann
dd2416a59e handle all {opts} and {sector_opts} wildcard values in config 2024-02-17 11:57:16 +01:00
Fabian Neumann
16e42c8fe6 further progress and bugfixes 2024-02-16 11:17:00 +01:00
Fabian Neumann
c3feb0e283 handle complicated config-dependent inputs using unpack() with input functions 2024-02-12 16:56:00 +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
pre-commit-ci[bot]
4ff06046fc [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2024-02-10 17:09:49 +00:00