Commit Graph

788 Commits

Author SHA1 Message Date
martacki
296fb021cf join skagerrak link 2022-01-31 16:09:42 +01:00
Fabian Neumann
f6515a279a
Merge pull request #312 from PyPSA/pd-1.4-depr
address pandas 1.4 deprectations
2022-01-30 15:25:48 +01:00
Fabian Neumann
09f1135b51 address pandas 1.4 deprectations 2022-01-29 16:17:46 +01:00
Fabian Neumann
c8c1c3c46e revert ea96d499e7 2022-01-29 15:02:49 +01:00
martacki
3a6a09995d update entsoe extract with missing lines 2022-01-29 14:19:59 +01:00
Martha Frysztacki
9ae8baf71d
Merge branch 'master' into update-entsoe-gridextract 2022-01-28 15:12:36 +01:00
Fabian Neumann
e4e0751b95
Merge pull request #310 from PyPSA/smk-resources
Snakefile: use standard resource mem_mb rather than mem
2022-01-27 21:25:38 +01:00
Fabian Neumann
090b4908a4 Snakefile: use standard resource mem_mb rather than mem 2022-01-27 21:04:50 +01:00
Fabian
4341827952 Merge branch 'line-rating' of github.com:PyPSA/pypsa-eur into line-rating 2022-01-25 16:02:35 +01:00
Fabian
5ee056bb5c add_electricity: add_line_rating: move snakemake arg out of function 2022-01-25 15:57:52 +01:00
Philipp Glaum
8421fb13f1 update config location and wildcards for debugging 2022-01-25 15:22:58 +01:00
Philipp Glaum
815f9824e9 Merge remote-tracking branch 'origin/master' into line-rating 2022-01-25 08:49:11 +01:00
Fabian Neumann
2bfccebc83
Merge pull request #275 from PyPSA/snakemake_dependencies_in_functions
remove snakemake dependencies in functions
2022-01-24 20:01:40 +01:00
martacki
6cdf3a2879 use snakemake keywords directly without extracting them beforehand 2022-01-24 19:48:26 +01:00
Martha Frysztacki
c45691d305
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-24 19:15:06 +01:00
martacki
c4be81eb5e simplify_network: remove snakemake dependencies 2022-01-24 19:13:48 +01:00
Fabian Neumann
dbf0f65ab5
Update config.default.yaml 2022-01-24 11:16:23 +01:00
martacki
61a4108e60 update parameter_corrections for updated entsoe gridextract 2022-01-21 17:37:18 +01:00
martacki
10fbc9225c update entsoe gridextract 2022-01-21 17:35:15 +01:00
Fabian Neumann
4e7a5f0d95
Merge pull request #306 from Qui-Rin/Qui-Rin-build_load_data-bug-transparency
build_load_data bug: removed underscore in pattern
2022-01-19 19:19:56 +01:00
Philipp Glaum
2a231464f6 bug fix in temperature calculation 2022-01-19 09:33:11 +01:00
Philipp Glaum
bc70819aef update formate and resistance calculation 2022-01-17 08:52:25 +01:00
Qui-Rin
9f0515105b
build_load_data: Removed underscore in pattern
When using the transparency option the pattern used as a filter is created with a double underscore -> removed underscore in '_transparency'
2022-01-14 19:02:44 +01:00
martacki
dc83fd8e09 fix small bugs 2022-01-14 15:13:44 +01:00
martacki
0da77a7600 remove snakemake dependencies in plot_summary 2022-01-14 13:44:33 +01:00
martacki
f28a088ea3 arguments in function calls instead of kwarg-style 2022-01-14 11:30:15 +01:00
martacki
8cb5bd27d5 make_summary: remove snakemake dependencies 2022-01-14 11:29:01 +01:00
Martha Frysztacki
7067d924cc
Merge branch 'master' into snakemake_dependencies_in_functions 2022-01-14 11:05:54 +01:00
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