diff --git a/data/parameter_corrections.yaml b/data/parameter_corrections.yaml index c26602e9..83a17d51 100644 --- a/data/parameter_corrections.yaml +++ b/data/parameter_corrections.yaml @@ -26,4 +26,19 @@ Link: "14537": 1000 # NEMO GB-BE "14538": 1000 # ALEGrO BE-DE "14556": 600 # Storebaelt - "12997": 1000 # Sardignia + "12997": 1000 # Sardignia + bus1: + index: + "11511": "6240" # fix wrong bus allocation from 6241 + "14559": "6240" # fix wrong bus allocation from 6241 + "12998": "1333" # combine link 12998 + 12997 in 12998 + "5627": '2309' # combine link 5627 + 5628 in 5627 + length: + index: + "12998": 409.0 + "5627": 26.39 + bus0: + index: + # set bus0 == bus1 for removing the link in remove_unconnected_components + "5628": "7276" + "12997": "7276" \ No newline at end of file diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 5b1258b7..5a9358e5 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -15,6 +15,8 @@ Upcoming Release * Add compatibility for pyomo 5.7.0 in :mod:`cluster_network` and :mod:`simplify_network`. +* Corrected HVDC link connections (a) between Norway and Denmark and (b) mainland Italy, Corsica (FR) and Sardinia (IT) (`#181 `_) + PyPSA-Eur 0.2.0 (8th June 2020) ================================== diff --git a/scripts/base_network.py b/scripts/base_network.py index c4be7357..1d5fddd7 100644 --- a/scripts/base_network.py +++ b/scripts/base_network.py @@ -542,12 +542,12 @@ def base_network(): n.import_components_from_dataframe(links, "Link") n.import_components_from_dataframe(converters, "Link") - n = _remove_unconnected_components(n) - _set_lines_s_nom_from_linetypes(n) _apply_parameter_corrections(n) + n = _remove_unconnected_components(n) + _set_countries_and_substations(n) _set_links_underwater_fraction(n)