Commit Graph

690 Commits

Author SHA1 Message Date
martacki
deac9f32e7 move snakemake keys (input, output, config, ...) to own variables 2022-01-14 11:05:15 +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
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
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
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
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
Fabian Neumann
f06c7958bc restore REUSE compliance [skip ci] 2021-12-04 18:21:08 +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
Fabian Neumann
f6a145e4a3
Merge branch 'master' into fix-build-load 2021-11-10 10:38:14 +01:00
Fabian Neumann
c0d1656091 build_load_data: separate retrieving and processing load data 2021-11-10 10:37:09 +01:00
Fabian Neumann
3905cd8823
Merge branch 'master' into snakemake_dependencies_in_functions 2021-11-10 10:17:32 +01:00
Fabian Neumann
0d71d7b89c
Merge pull request #288 from fwitte/fix/typos_in_docs
Fix link appearence and missing parentheses
2021-11-10 10:04:29 +01:00
Fabian Neumann
646c5011af
Merge branch 'master' into snakemake_dependencies_in_functions 2021-11-10 09:46:57 +01:00
Francesco Witte
9379c135fd Fix link appearence and missing parentheses 2021-11-09 15:56:59 +01:00
Fabian Neumann
96af7abef4
Merge pull request #283 from PyPSA/rsync
add basic setup of rsync with files to ignore
2021-11-08 15:24:24 +01:00
Fabian Hofmann
111309cc56
Merge branch 'master' into rsync 2021-11-08 10:53:14 +01:00
Fabian Neumann
7588f90b09 Merge branch 'master' of github.com:PyPSA/pypsa-eur 2021-11-04 10:26:24 +01:00
Fabian Neumann
9c85179432
Merge pull request #281 from PyPSA/fix-scipy-import
base_network.py: fix scipy spatial import
2021-11-04 10:26:16 +01:00
Fabian Neumann
8c533c0382
Merge branch 'master' into fix-scipy-import 2021-11-04 10:25:59 +01:00
Fabian Neumann
50548b23f9 add basic setup of rsync with files to ignore 2021-10-07 12:26:48 +02:00
Fabian Hofmann
8bf7f499cf
Merge pull request #282 from PyPSA/doc-fix-css-theme
doc: fix css theme
2021-10-06 14:26:59 +02:00
Fabian Hofmann
0425817a7b
Merge branch 'master' into doc-fix-css-theme 2021-10-06 14:09:00 +02:00
Fabian Neumann
3a07804ef5
Merge pull request #279 from koen-vg/master
Update CPLEX default parameters (and documentation)
2021-10-06 12:41:49 +02:00
Fabian Neumann
a431bbd5a7
Merge branch 'master' into master 2021-10-06 12:23:14 +02:00
Fabian
fccf5323d2 doc: fix css theme 2021-10-06 12:16:12 +02:00
Fabian
23d3216d92 base_network.py: fix scipy spatial import 2021-10-05 17:30:22 +02:00
Fabian Neumann
02670c1b7f
Merge pull request #280 from PyPSA/offshore-density
config: reduce default deployment density for offshore wind
2021-10-05 12:38:27 +02:00
Fabian Neumann
1b2c6e17c5 add release note for offshore density reduction 2021-10-05 12:21:45 +02:00
Fabian Neumann
af625d7379 config: reduce default deployment density for offshore wind 2021-10-05 12:18:10 +02:00
Koen van Greevenbroek
66524bf797 Update obsolete link to CPLEX documentation 2021-10-05 11:21:17 +02:00
Koen van Greevenbroek
08349d7897 Also update the default CPLEX configuration in test config 2021-10-05 11:08:32 +02:00
Koen van Greevenbroek
5ee280b96f Update default CPLEX options following PyPSA update
For more recent versions of CPLEX and PyPSA, using dotted options
works while the current default crashes a CPLEX solve with
"AttributeError: 'RootParameterGroup' object has no attribute
'barrier_convergetol'". See https://github.com/PyPSA/PyPSA/pull/168.
2021-10-05 11:00:30 +02:00
Fabian Neumann
a54f66a686
Merge pull request #278 from PyPSA/wake-simpl
add correction factor to offshore wind for wake losses
2021-09-27 14:04:03 +02:00