lisazeyen
95903eeca7
Merge branch 'master' into jrc-idees-2020
2024-08-07 11:58:22 +02:00
lisazeyen
5bf36c218c
add ch data as csv
2024-08-07 11:49:33 +02:00
Fabian Neumann
59574211a4
retrieve.smk: consistently use conda directive
2024-08-07 10:15:35 +02:00
lisazeyen
682d53d1b5
remove /bundle
2024-08-07 10:07:52 +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
lisazeyen
52c8037a3e
merge master
2024-07-31 16:09:33 +02:00
lisazeyen
b92f0d0c30
update industry sector ratios to new JRC data
2024-07-30 15:26:28 +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
lisazeyen
fb2ab4c50b
update ammonia data
2024-07-29 15:44:30 +02:00
lisazeyen
201889424c
update industry to new JRC-idees
2024-07-29 15:39:01 +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
lisazeyen
8f2cea4d93
Merge branch 'master' into jrc-idees-2020
2024-07-22 21:43:03 +02:00
Fabian Neumann
b8b92ace64
common.smk: make solver_threads also look for capitalised 'Threads'
2024-07-22 17:35:50 +02:00
Fabian Neumann
745df4d2c1
fix typo
2024-07-22 15:22:32 +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
lisazeyen
957176a20d
adjustment to build_energy_totals
2024-07-18 15:39:52 +02:00
lisazeyen
ecccc1429f
add rule to retrieve JRC IDEES 2021
2024-07-18 15:39:27 +02:00
Fabian Neumann
54009e7af8
increase mem_mb for build_powerplants rule
2024-07-01 13:33:29 +01:00
Fabian Neumann
450f75a989
bugfix: correctly read threshold capacity in add_brownfield
2024-06-19 15:54:23 +02:00
Bobby Xiong
0db78a93e6
Fixed bug which generated empty pdfs when calling plot_summary from CI or snakemake. Using .svg exports instead.
2024-06-11 15:10:12 +02:00
LukasFrankenQ
2f1d6d20b1
final corrections, improved docs
2024-06-01 00:20:31 +01:00
LukasFrankenQ
2801b00100
Merge https://github.com/pypsa/pypsa-eur
2024-05-26 22:38:03 +01:00
Fabian Neumann
5397f3fe85
avoid duplicate existing RES capacities ( closes #1016 )
2024-05-24 09:47:23 +02:00
Fabian Neumann
31e41f5f5d
time_aggregation: optional rule inputs need [] not None
2024-05-23 21:52:09 +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
Fabian Neumann
9527f4cf77
Merge branch 'split-out-time-agg' of github.com:koen-vg/pypsa-eur into koen-vg-split-out-time-agg
2024-05-20 11:38:02 +02:00
lisazeyen
2223e011a0
merge master
2024-05-15 16:14:25 +02:00
Koen van Greevenbroek
354fffe6f0
Split time agg into own rule; same agg for all planning horizons
2024-05-15 13:26:03 +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
e322e21771
Merge branch 'feature/add-nodal-supply-energy' of github.com:Climact/pypsa-eur-climact into Climact-feature/add-nodal-supply-energy
2024-05-13 14:54:49 +02:00
Fabian Neumann
84d6634af0
Merge branch 'master' into implement-floating
2024-05-13 10:04:42 +02:00
Fabian Neumann
4dc350cbde
use raw not blob github link
2024-05-12 16:10:02 +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
Thomas Gilon
a139bb604a
Merge branch 'master' into feature/add-nodal-supply-energy
2024-05-02 14:28:20 +02:00
Thomas Gilon
45aa714bdc
Add calculate_nodal_supply_energy in make summary
2024-05-02 14:27:30 +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
pre-commit-ci[bot]
29f6c9507f
[pre-commit.ci] auto fixes from pre-commit.com hooks
...
for more information, see https://pre-commit.ci
2024-04-25 15:36:33 +00:00
Fabian Neumann
d101b8a95a
Merge branch 'master' into existing-caps-from-pm
2024-04-25 17:33:48 +02:00
