Commit Graph

2548 Commits

Author SHA1 Message Date
lisazeyen
372473d76c update mocksnakemake 2022-01-07 11:32:31 +01:00
Fabian Neumann
7535a0d385
update data bundle (#216) 2022-01-06 10:29:59 +01:00
Max Parzen
6249a9b558
Merge branch 'PyPSA:master' into master 2021-12-23 12:35:10 +01:00
Fabian Neumann
510ef20937 allow H2 cavern storage in nearshore area for ecological brine disposal 2021-12-18 16:17:31 +01:00
Fabian Neumann
47ab49e86b
Merge pull request #299 from p-glaum/master
hot fix for snakemake bug
2021-12-17 01:20:50 +01:00
Philipp Glaum
ed83988ed1 hot fix for snakemake bug 2021-12-15 11:02:03 +01:00
Max Parzen
23d2b91bed
Merge branch 'master' into master 2021-12-15 10:26:14 +01:00
Martha Frysztacki
47b90682c9
Merge branch 'master' into introduce_hac_clustering 2021-12-10 17:55:43 +01:00
martacki
6c4ea69e95 clustering: own config for clustering settings 2021-12-10 17:53:40 +01:00
Fabian Neumann
d1762919c5
add option 'seqXXX' to sweep global co2 sequestration potentials (#208)
* add option 'seqXXX' to sweep global co2 sequestration potentials

* add release notes
2021-12-10 12:05:38 +01:00
Fabian Neumann
82096f92e8
fix for GlobalConstraints mu with "co2_sequestration_limit" (#211)
* fix for GlobalConstraints mu with co2_sequestration_limit

* add release notes
2021-12-06 11:31:48 +01:00
Fabian Neumann
f06c7958bc restore REUSE compliance [skip ci] 2021-12-04 18:21:08 +01:00
Fabian Neumann
e2e069fe2d default: disable gas network, enable distribution grid 2021-12-03 17:59:17 +01:00
Fabian Neumann
90c2c909cd
fix broken prepare_sector_network when running without gas grid (#207)
Co-authored-by: lisazeyen <lisa.zeyen@web.de>

Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2021-12-03 17:22:06 +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
a7fd4901c1
Merge pull request #135 from PyPSA/retrofit-gas-pipelines
Retrofit gas pipelines

Co-authored-by: lisazeyen <lisa.zeyen@web.de>
2021-11-29 09:15:09 +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
ad7dd1aa3f correct max gas pipeline loading 2021-11-28 12:11:04 +01:00
Fabian Neumann
63724279a4 Snakefile: export conda environment 2021-11-24 16:01:58 +01:00
Fabian Neumann
7760c30d3c
Merge pull request #195 from PyPSA/solve-threads
solve_network: take threads from solver setting
2021-11-24 15:08:38 +01:00
Fabian Neumann
42784030e7
Merge pull request #192 from leonsn/patch-1
Remove a wrong connection on the diagram
2021-11-24 15:07:44 +01:00
Fabian Neumann
6a92eb9d74
Merge pull request #196 from PyPSA/fix-cp-config
fix copying pypsa-eur config
2021-11-24 15:07:17 +01:00
Max Parzen
f1243c3e0c Fix distribute clustering with cbc/glpk/ipopt
Assume you have 10 nodes that need to be distributed between 2 countries.
What can happen with some of the open source solvers is that one country
gets assigned to 9.01 (float) nodes, and the other one to 0.99.

Now using .astype(int) would lead to a node distribution of 0 and 9, as
the `astype(int)` function round down by default (0.99 -> 0). This assigned
zero value breaks the code in case open source solvers are used.
Gurobi somehow does deal with it.
2021-11-24 14:16:24 +01:00
Fabian Neumann
bb9f437855 fix copying pypsa-eur config 2021-11-24 10:54:39 +01:00
Fabian Neumann
7863c269bd plot_network: gas network show max used capacity 2021-11-24 10:53:54 +01:00
Fabian Neumann
5be6c24fe7 solve_network: take threads from solver setting 2021-11-24 10:33:46 +01:00
Fabian Neumann
306170fe09
Merge pull request #194 from koen-vg/copy-default-config
Create config file from default if not found
2021-11-22 15:43:02 +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
f93ec5a381
Merge pull request #193 from koen-vg/fix-non-ascii
Remove non-ascii character from source file
2021-11-22 14:18:37 +01:00
Koen van Greevenbroek
977dbfe933 Remove non-ascii character from source file
Unfortunately Snakemake for now reads files using the default OS file
encoding, which may not be UTF-8. Therefore, it is best to be
conservative and only use ascii in source files for now.
2021-11-22 14:02:57 +01:00
Leon
42c17b2693
Add files via upload 2021-11-22 12:25:16 +01:00
Leon
ddd9bb74e3
Replacing does apparently not work on the github webinterface. 2021-11-22 12:24:31 +01:00
Leon
773c1df573
Remove connection between "methane" and "liquid hydrocarbons"
This connection should not have been there to start with.
2021-11-22 12:21:20 +01:00
Fabian Neumann
87ee8d2e69
Merge pull request #187 from PyPSA/retrofit-gas-pipelines-fneum
Retrofit gas pipelines - iteration 2
2021-11-19 08:05:09 +01:00
Fabian Neumann
8cb78f90d4
Merge pull request #190 from fwitte/master
Add missing code directive and hyphon in tar operation
2021-11-19 08:00:18 +01:00
martacki
299e71e2b3 introduce hierarchical agglomeratice clustering (hac) 2021-11-17 13:46:33 +01:00
Francesco Witte
bac7e54d23 Add missing code directive and hyphon in tar 2021-11-16 13:36:46 +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
67ba2fa813 address deprecation warnings 2021-11-14 12:57:46 +01:00
Fabian Neumann
1ff5d76a0c gas_network: add release notes 2021-11-13 18:16:10 +01:00
Fabian Neumann
d9902ad978 gas_network: recalculate lengths after clustering 2021-11-13 17:30:54 +01:00
Fabian Neumann
8c5dacbcc8 gas_network: fix bug in haversine distance 2021-11-13 17:03:13 +01:00
Fabian Neumann
dacb7152fe gas_network: remove old dataset 2021-11-13 17:02:54 +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
44ea5ef48a add local gas input capacities (p_nom) and disable p_nom_extendable 2021-11-10 18:24:13 +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 Hofmann
1da908b956
Merge pull request #289 from PyPSA/fix-build-load
Separate load data retrieval from processing with new rule `retrieve_load_data`
2021-11-10 14:55:44 +01:00