Commit Graph

408 Commits

Author SHA1 Message Date
Fabian
b7436da57e Merge branch 'master' of github.com:PyPSA/pypsa-eur into line-rating 2022-03-03 01:13:28 +01:00
Fabian
752ff28538 cluster_network.py: allow cluster wildcard to be 'all' 2022-03-02 14:43:04 +01:00
FabianHofmann
7d7b3d4cf9 Merge branch 'master' of github.com:PyPSA/pypsa-eur into line-rating 2022-03-02 14:14:56 +01:00
Fabian Neumann
8dafb7bc83
fix custom clustering by checking explicitly for series (#318) 2022-02-27 08:07:11 +01:00
Philipp Glaum
caaca688c4 add_electricity: add optional clipping and small changes 2022-02-23 12:06:51 +01:00
Philipp Glaum
7e692f01e3 adjust s_max_pu clipping 2022-02-21 09:18:20 +01:00
Philipp Glaum
86942b0afc add_electricity: fix minor bug and clip s_max_pu_cap values 2022-02-17 14:50:11 +01:00
Fabian
1d975bb814 build_line_rating: apply black style 2022-02-16 14:32:33 +01:00
Fabian
75b695eed4 line-rating: clip s_max_pu to account for max voltage angle difference 2022-02-16 14:29:44 +01:00
Koen van Greevenbroek
f7ee47238a Fix random state for kmean clustering
When the kmeans algorithm is used to cluster networks, this is not
deterministic by default. The result is that repeated runs of the
`simplify_network` and `cluster_network` rules can and usually do
produce different results that vary somewhat randomly. This makes
results less reproducible when given only a pypsa-eur configuration
file.

The fix is to supply a fixed random state to the k-means algorithm.
2022-02-10 15:57:16 +01:00
Philipp Glaum
246d5f5964 fix operations network infeasibilities 2022-02-04 15:58:29 +01:00
Fabian Neumann
835bfc0f6a bugfix: access right config variables in build renewable profiles 2022-02-01 08:51:47 +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
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
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
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
martacki
9b7bb27da1 snakemake dependencies in base_network 2022-01-13 18:54:27 +01:00
martacki
505f093141 fix ordering of kwargs in add_co2limit 2022-01-13 18:00:22 +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
Philipp Glaum
b05cddae77 update calculate_line_rating function 2022-01-10 14:45:46 +01:00
Philipp Glaum
e51d714d55 update line rating(documentation, bundles) 2021-12-28 08:28:07 +01:00
Max Parzen
6249a9b558
Merge branch 'PyPSA:master' into master 2021-12-23 12:35:10 +01:00
Philipp Glaum
fba50492a5 only consider relevant lines for line rating 2021-12-21 07:36:59 +01:00
Philipp Glaum
af4bccfb39 line rating assigned in add_electricity.py 2021-12-15 13:53:38 +01:00
Philipp Glaum
ed83988ed1 hot fix for snakemake bug 2021-12-15 11:02:03 +01:00