Commit Graph

2581 Commits

Author SHA1 Message Date
martacki
deac9f32e7 move snakemake keys (input, output, config, ...) to own variables 2022-01-14 11:05:15 +01:00
Fabian Neumann
72e277a007
update environment and address deprecations (#291)
* update environment and address deprecations

* check pandas<1.3

* limit snakemake due to ascii encoding error, address review comments

* remove version restriction on snakemake
2022-01-14 07:43:21 +00:00
Martha Frysztacki
5dd24ca87f
Merge pull request #294 from pz-max/master
Fix distribute clustering with cbc/glpk/ipopt
2022-01-13 19:02:51 +01:00
martacki
fccb59098d pull 2022-01-13 18:56:26 +01:00
martacki
9b7bb27da1 snakemake dependencies in base_network 2022-01-13 18:54:27 +01:00
Fabian Neumann
5cf649f39d
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-13 18:48:09 +01:00
Fabian Neumann
4bdce8893f
Merge branch 'master' into master 2022-01-13 18:46:26 +01:00
euronion
b660277e37
Merge pull request #303 from PyPSA/misc/improve-ci-speed
[DNMY] Improve CI performance.
2022-01-13 18:25:12 +01:00
martacki
505f093141 fix ordering of kwargs in add_co2limit 2022-01-13 18:00:22 +01:00
Martha Frysztacki
07c4870655
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-13 17:09:46 +01:00
Martha Frysztacki
d9235125cc
Merge branch 'master' into master 2022-01-13 17:00:36 +01:00
Fabian Neumann
9601ed65de
Merge pull request #304 from PyPSA/pv-correction
disable solar PV CF correction factor for default satellite data
2022-01-13 16:53:10 +01:00
Martha Frysztacki
ba9849b3bb
Merge branch 'master' into master 2022-01-13 16:50:57 +01:00
Fabian Neumann
a747c88d08 disable solar PV CF correction factor for default satellite data (closes #285) 2022-01-13 15:42:48 +01:00
Fabian Neumann
e1aae5a98e minor adjustment to memory requirements of add_electricity, cluster_network 2022-01-13 15:36:13 +01:00
Fabian Hofmann
94364cbeeb
Update scripts/cluster_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-01-11 10:31:49 +01:00
Fabian
281700751a Merge branch 'snakemake_dependencies_in_functions' of github.com:PyPSA/pypsa-eur into snakemake_dependencies_in_functions 2022-01-11 10:28:11 +01:00
Fabian
ed7fd27adc build_shapes: use country_list as argument 2022-01-11 10:24:45 +01:00
Fabian
c7a443c969 build_shapes: revise changes 2022-01-11 10:23:22 +01:00
Martha Frysztacki
418ce4be28
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-11 10:03:32 +01:00
Fabian
d1334c1670 Merge branch 'snakemake_dependencies_in_functions' of github.com:PyPSA/pypsa-eur into snakemake_dependencies_in_functions 2022-01-11 10:00:55 +01:00
Fabian
39a6753ece build_powerplants: revise changes 2022-01-11 09:59:58 +01:00
Fabian
01e93545f6 add_extra_components: revise changes 2022-01-11 09:59:34 +01:00
Fabian
acd7122aad add_electricity: revert changes in add_nice_carrier_names 2022-01-11 09:58:59 +01:00
Fabian Hofmann
2c318a247e
Update scripts/prepare_network.py
Co-authored-by: Fabian Neumann <fabian.neumann@outlook.de>
2022-01-11 09:55:22 +01:00
Fabian
66f2d36f0d add_electricity: revise code and make it leaner 2022-01-11 09:38:34 +01:00
lisazeyen
c40904a727 adjust h2_plot function to work with myopic, since build year is now in links.index 2022-01-07 16:59:48 +01:00
lisazeyen
9f8b54a3ce adjust pipe retrofitting constraint to work with myopic 2022-01-07 16:59:14 +01:00
lisazeyen
5b30f0ece6 avoid doubling of the existing natural gas grid 2022-01-07 16:53:37 +01:00
lisazeyen
030bf96d32 update mocksnakemake 2022-01-07 12:45:33 +01:00
lisazeyen
c9ce9190a7 adjust to spatital resolved gas nodes 2022-01-07 12:40:17 +01:00
lisazeyen
b5aa4234ef adjust capital cost of existing renewables to consider e.g. electricity grid connection costs as well 2022-01-07 12:09:02 +01:00
lisazeyen
953e1c883e adjust functions to new default lifetime np.inf instead of previous NaN 2022-01-07 11:38:25 +01:00
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