bjoern/pypsa-eur
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
2,405 Commits 1 Branch 0 Tags 133 MiB
c8fa61e244
Commit Graph

318 Commits

Author SHA1 Message Date
pre-commit-ci[bot]
92080b1cd2 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2022-09-19 10:06:40 +00:00
Fabian Hofmann
5833556ea1
Merge branch 'master' into misc/precommit-ci-2 2022-09-19 12:06:23 +02:00
Fabian Neumann
e024ba68c9 build_hydro: fix cutout input 2022-09-17 10:29:35 +02:00
pre-commit-ci[bot]
5d1ef8a640 [pre-commit.ci] auto fixes from pre-commit.com hooks 
for more information, see https://pre-commit.ci
 2022-09-16 13:04:06 +00:00
Fabian Hofmann
affa1c2b88
Merge branch 'master' into misc/precommit-ci-2 2022-09-16 14:38:49 +02:00
Fabian
1536cc2787 codespell: fix typos 
Snakefile: fix unformattable parst
pre-commit: fix codespell ignore
 2022-09-16 14:36:43 +02:00
Fabian
b694337541 scenario management: use "shared_cutouts" instead of "dedicated_cutouts" 2022-09-13 14:54:58 +02:00
Fabian Hofmann
0339ed71ac
Update Snakefile 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-09-13 09:47:11 +02:00
Fabian Hofmann
1185983f8f
Update Snakefile 
Co-authored-by: Philipp Glaum <95913147+p-glaum@users.noreply.github.com>
 2022-09-08 20:32:22 +02:00
Fabian
71ba743e46 enable scneario management for different configs 2022-09-08 10:28:07 +02:00
Ebbe Kyhl Gøtske ekg@mpe.au.dk
e34bd9b7fb Change costs year in snakefile and config file 2022-08-31 13:07:43 +02:00
Ebbe Kyhl Gøtske ekg@mpe.au.dk
98dd2db622 specify memory resources 2022-08-11 10:10:35 +02:00
Fabian Neumann
ca183ba89e add zenodo dataset for download 2022-08-02 15:56:47 +02:00
lisazeyen
f683a93f08 adjust plot_summary to work with myopic, remove update config 2022-08-01 16:04:14 +02:00
lisazeyen
f10628930e move snakemake dependencies out for co2limit cb option to work 2022-08-01 15:21:11 +02:00
Philipp Glaum
ba7a5363e7 update Fabians review comments 2022-07-29 14:56:39 +02:00
Philipp Glaum
4db62fa0c6 place holder in snakefile for path to ship_raster 2022-07-29 11:52:33 +02:00
Philipp Glaum
6d070a19e0 initial ship raster implementation 2022-07-28 10:38:24 +02:00
Fabian Neumann
8fc0c57ed6 update copyright years 2022-07-26 15:05:59 +02:00
Fabian Hofmann
3ba7e2ab90
Merge branch 'master' into technology-data 2022-07-21 15:36:12 +02:00
Fabian Neumann
b3dac6d3c4 subworkflow flags amend 2022-07-20 15:53:57 +02:00
Fabian Neumann
10243398e7 do not use subworkflow flags for pure data# 
causes problems when config retrieve_databundle is disabled
 2022-07-20 15:47:47 +02:00
Fabian Neumann
3986856282 merge master 2022-07-01 10:13:33 +02:00
Fabian Neumann
a8171ec9f3 color adaptations, new features 2022-06-28 18:03:29 +02:00
Fabian
67ac464b6a add_electricity: use conventional_inputs from snakemake.input for attach_conventional_generators 2022-06-28 16:33:46 +02:00
Fabian Hofmann
e175d1aa0e
Merge branch 'eu-energy-security' into eu-energy-security-conventional-attrs 2022-06-28 13:22:39 +02:00
Fabian
522f218eed Snakefile: rename attrs to attr in add_electricity input function 2022-06-28 13:15:37 +02:00
Fabian Hofmann
917f41ef21
Update Snakefile 
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2022-06-28 13:11:08 +02:00
Fabian
9d997fbd79 generalize conventional attr handling through config 2022-06-28 10:14:26 +02:00
Fabian Neumann
74f8ca1c7f
Merge branch 'master' into eu-energy-security 2022-06-28 08:09:39 +02:00
Fabian Neumann
51de606aab
Revert "remove build/retrieve natura raster, directly use shapefile" 2022-06-27 19:00:41 +02:00
Fabian
b56d1f6f4d conventional config section: update to more general attribute assignment scheme 2022-06-27 17:35:19 +02:00
Fabian Neumann
fa43038564 remove params from input as they are not exposed to input 2022-06-27 10:35:39 +02:00
Fabian Neumann
9c6c6d243f
Adaptations to match current PyPSA-Eur version 2022-06-27 10:21:08 +02:00
Fabian Neumann
5ca231824e
Merge branch 'master' into eu-energy-security 2022-06-27 08:58:37 +02:00
Fabian Neumann
520f7e440e
Merge branch 'master' into technology-data 2022-06-25 11:05:41 +02:00
Fabian
eb59e68f35 Snakefile: remove RDIR selection 2022-06-09 20:24:28 +02:00
Fabian Neumann
d4fd472762
Merge branch 'master' into transport 2022-04-12 14:48:57 +02:00
Fabian Neumann
6ed92475c9
Add basic CI for overnight and myopic (#234) 
* Snakefile: add missing folders that are retrieved

* Snakefile: fix syntax error

* Add basic CI

* fix datafiles list to work with directories

* prepare: only add new gas pipes if augmentation not empty

* prepare: handle case where salt caverns dataframe is empty

* prepare: handle case where underwater faction not in link columns

* build_biomass: handle case where Balkan not in country list

* refer correct environment path

* fix Snakemake call

* make subworkflow dependency explicit again

* hashing pypsa-eur environment file does not seem to work

* change solver to glpk

* add data cache

* glpk without options

* try cbc

* alternative snakemake test workflow

* test: add exogenous pathways to config
 2022-04-11 17:08:25 +02:00
Fabian Neumann
f0d0edcf54 Snakefile: add powerplants to results-dir 2022-04-08 13:21:29 +02:00
Fabian Neumann
f474f8bce4 finetuning of results dir 2022-04-07 22:07:18 +02:00
Fabian Neumann
64424ed208 add results dir to simplify multiple configs (like PyPSA-Eur-Sec) 2022-04-07 21:13:48 +02:00
Fabian Neumann
7a52b6bc45 resolve cherry merge conflict 1 2022-04-05 16:22:31 +02:00
Fabian Neumann
b112da0565 prepare: separate code for transport demand and nodal energy totals 2022-04-03 18:49:35 +02:00
Fabian Neumann
7fee2944d8
Merge branch 'master' into rm-raster-natura 2022-03-28 12:07:33 +02:00
Fabian Neumann
832cc8e5e8 Windows compatibility through request string 2022-03-28 10:56:52 +02:00
Fabian Neumann
35f8b54a46 switch to Belgium for CI and tutorial 2022-03-24 15:51:36 +01:00
Fabian Neumann
855a176c51
Merge branch 'master' into rm-raster-natura 2022-03-24 14:40:14 +01:00
Fabian Neumann
f90bb92e1a automatically download NATURA2000 gpkg and use it 2022-03-24 13:37:21 +01:00
euronion
e2e98120b1 Update Snakefile 2022-03-21 10:01:34 +01:00
euronion
30cb861ca2 Update Snakefile 2022-03-21 09:37:50 +01:00
Fabian Neumann
31f9864daf omit NATURA from testing and tutorial due to file size# 2022-03-20 21:01:07 +01:00
Fabian Neumann
5a7c0d7967 remove build/retrieve natura raster, directly use shapefile 2022-03-20 10:03:17 +01:00
euronion
da72f5487d Update Snakefile 2022-03-18 14:29:50 +01:00
euronion
65e35135e1 Update Snakefile 2022-03-18 11:13:58 +01:00
Fabian
49ec143b0a Snakefile: fix memory function for clusters == 'all' 2022-03-02 14:22:16 +01:00
Fabian Neumann
3eec027db6
no more 'mv' command in Snakefile for Windows (#316) 2022-02-22 19:34:47 +01:00
Fabian Neumann
090b4908a4 Snakefile: use standard resource mem_mb rather than mem 2022-01-27 21:04:50 +01:00
Fabian Neumann
e1aae5a98e minor adjustment to memory requirements of add_electricity, cluster_network 2022-01-13 15:36:13 +01:00
Fabian Neumann
a2459881ef
allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid (#204) 
* allow H2 retrofitting from CH4 pipelines without endogenous CH4 grid

* add small capital cost to gas pipelines to incentivise decommissioning

* add release notes
 2021-11-29 12:42:10 +01:00
Fabian Neumann
d04f6c02a7
Merge branch 'master' into retrofit-gas-pipelines 2021-11-29 09:13:51 +01:00
Fabian Neumann
263628fa22
add option to automatically download and extract sector databundle (#198) 2021-11-29 09:12:55 +01:00
Fabian Neumann
3ecb761b57
add regionalised hydrogen salt cavern storage potentials (#191) 
* add regionalised hydrogen salt cavern storage potentials

* fix reading in salt-cavern potentials and typo in imports

* by default disable nearshore and offshore salt cavern potentials

Co-authored-by: lisazeyen <lisa.zeyen@web.de>
 2021-11-29 09:12:07 +01:00
Fabian Neumann
63724279a4 Snakefile: export conda environment 2021-11-24 16:01:58 +01:00
Fabian Neumann
5be6c24fe7 solve_network: take threads from solver setting 2021-11-24 10:33:46 +01:00
Koen van Greevenbroek
04e62fd52e Create config file from default if not found 
Similarly to pypsa-eur, the config file is not found, we create it as
a copy of `config.default.yaml`. This also makes it easier to include
pypsa-eur-sec as a subworkflow in a snakemake workflow.
 2021-11-22 15:00:42 +01:00
Fabian Neumann
b8a037026d gas_input: rewrite to not require pygeos via sjoin_nearest() 2021-11-14 16:51:34 +01:00
Fabian Neumann
4cd964b3bd gas_network: use IGGIELGN scigrid dataset 2021-11-13 16:48:08 +01:00
Fabian Neumann
b39a852d3b correct syntax errors 2021-11-12 12:50:46 +01:00
Fabian Neumann
12ef1302e6 add planned LNG terminals from gem.wiki and convert units to MW 2021-11-10 18:05:47 +01:00
Fabian Neumann
c0d1656091 build_load_data: separate retrieving and processing load data 2021-11-10 10:37:09 +01:00
Fabian Neumann
57c0dd29d1 disentangle gas input nodes by lng, prod, entry with mmc/d# 2021-11-09 14:52:08 +01:00
Fabian Neumann
985705403e revision gas infrastructure representation 2 2021-11-04 21:48:54 +01:00
Fabian Neumann
6a00d5bfca revision gas infrastructure representation 2021-11-03 20:34:43 +01:00
Fabian Neumann
37e2e53486
Merge branch 'master' into retrofit-gas-pipelines 2021-11-02 19:03:26 +01:00
Fabian Neumann
2e6e9c6802
Merge branch 'master' into agriculture-energy-co2 2021-10-02 10:51:28 +02:00
Fabian Neumann
90079248a3
Merge branch 'master' into dh-share 2021-09-30 14:48:26 +02:00
lisazeyen
8322350fee move calculation of district heating share to build_energy_totals 2021-09-29 14:36:56 +02:00
Fabian Neumann
8ecc54fbe6
Merge branch 'master' into dh-share 2021-09-28 17:29:29 +02:00
lisazeyen
dadfa8691b update mocksnakemake for testing 2021-09-28 16:36:40 +02:00
Fabian Neumann
8996e09dc2
Merge branch 'master' into mit-license 2021-09-20 09:28:32 +02:00
Koen van Greevenbroek
6485b98973 Mark datasets from Zenodo as static 
When retrieving a remote file over HTTP, Snakemake uses the
"last-modified" property in HTTP header as a proxy for `mtime` of the
remote file. If this time is more recent than the `mtime` of the
output of the retrieve rule, the rule is triggered and the remote file
is retrieved again (since it was apparently updated).

However, Zenodo periodically updates the "last-modified" property of
records retrieved over HTTP even if those records have not been
updated. This causes Snakemake to false assume that the records have
to downloaded again.

By setting `static=True` for datasets we know don't actually change,
we avoid this problem.
 2021-09-15 11:44:49 +02:00
Fabian Neumann
2e02af8b4b change license 2021-09-14 16:37:41 +02:00
martacki
400317d062 update plot_network and make_summary scripts to latest pypsa/-eur versions 2021-08-16 17:53:56 +02:00
Fabian Neumann
8e3ef7f86b remove unused sector wildcard constraints 2021-08-16 16:29:05 +02:00
Fabian Neumann
ad23a648c4
Merge branch 'master' into enspreso-biomass 2021-08-10 10:43:52 +02:00
Fabian Neumann
bab51b0f54 fix read-in of pypsa-eur data 2021-08-10 10:28:22 +02:00
Fabian Neumann
7ca4f04611 biomass_transport: reduce output files 2021-08-09 17:53:14 +02:00
Fabian Neumann
6711d721b9 biomass_transport: fix cost calculation and get from remote 2021-08-09 16:30:38 +02:00
Fabian Neumann
d428c1b77d fix syntax and auto-retrieve biomass transport cost 2021-08-09 14:43:51 +02:00
Fabian Neumann
0da8f8f80e
Merge branch 'master' into biomass-transport 2021-08-06 15:58:23 +02:00
huckebrink
2aa59a3905
exporting additional costs, and compatibility adjustments (#261) 
* added export for connection_cost adjustment

* removed lambda function from multiprocessing
changed true/false_values to lists

* removed double import of functools

* moved added costs to df column

* Update scripts/simplify_network.py

Co-authored-by: Leonie Plaga <leonie.plaga@ruhr-uni-bochum.de>
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2021-08-04 16:19:23 +00:00
martavp
fab31e6524
Exogenous transition path for shipping, Steel, and Aluminum production (#136) 
* Update .gitignore

* Add fictitious load to account for non-transformed shipping emissions

The share of shipping demand that is transformed is defined now for different years to be used with the myopic code.
The carbon emission from the remaining share is treated as a negative load on the atmospheric carbon dioxide bus, just like aviation and land transport emissions.

* Split colours for H2 in Industry and H2 in shipping when plotting balances.

When plotting the balance for H2, the rename dictionary merges all the demands containing H2.
This commit disables such merging and keeps different colours for H2 in shipping and H2 in industry. This is useful when one wants to look at the H2 balance and have an overview of where the H2 is consumed in the model.

* Make transformation of Steel and Aluminum production depends on year

Previously, the transformation of the Steel and Aluminum production was assumed to occur overnight.
This commit enables the definition of a transformation path via the config.yaml file.
This requires adding the {planning_horizon} to the input and output file name of the following rules:
build_industrial_production_per_country_tomorrow
build_industrial_production_per_node
build_industry_energy_demand_per_node
prepare_sector_network

* small follow-up to merge

* Add oil consumed in shipping as a load to EU oil bus

* Update scripts/prepare_sector_network.py

* add planning_horizons wildcard to benchmark paths

* fixup: double fraction_primary for steel

Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
 2021-08-04 18:19:02 +02:00
Fabian Neumann
ba9be74265 make build_biomass_transport_costs fully optional 2021-08-04 15:05:37 +02:00
Fabian Neumann
2563d1277a spatially-explicit biomass potentials from ENSPRESO (NUTS2) 2021-07-11 17:52:32 +02:00
lisazeyen
2e336e5e70 add missing wildcards for benchmarks, add new input data for district heating share 2021-07-08 14:41:13 +02:00
Fabian Neumann
732046dba0 merge master 2021-07-03 12:46:09 +02:00
Fabian Neumann
89eccd4f70 merge master 2021-07-02 15:00:19 +02:00
Fabian Neumann
fd1121af4a add rule for build_biomass_transport_costs 2021-07-02 11:07:35 +02:00
Fabian Neumann
e97c4dd3c0 merge master 2021-07-02 10:12:43 +02:00