diff --git a/config/config.default.yaml b/config/config.default.yaml index a475c6fdf..9194ab42e 100644 --- a/config/config.default.yaml +++ b/config/config.default.yaml @@ -84,9 +84,9 @@ co2_budget: # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#electricity electricity: - voltages: [200., 220., 300., 380., 500., 750.] + voltages: [220., 300., 330., 380., 400., 500., 750.] base_network: osm-prebuilt - osm-prebuilt-version: 0.4 + osm-prebuilt-version: 0.5 gaslimit_enable: false gaslimit: false co2limit_enable: false @@ -278,10 +278,11 @@ conventional: # docs in https://pypsa-eur.readthedocs.io/en/latest/configuration.html#lines lines: types: - 200.: "Al/St 240/40 2-bundle 200.0" 220.: "Al/St 240/40 2-bundle 220.0" 300.: "Al/St 240/40 3-bundle 300.0" + 330.: "Al/St 240/40 3-bundle 300.0" 380.: "Al/St 240/40 4-bundle 380.0" + 400.: "Al/St 240/40 4-bundle 380.0" 500.: "Al/St 240/40 4-bundle 380.0" 750.: "Al/St 560/50 4-bundle 750.0" s_max_pu: 0.7 diff --git a/doc/configtables/electricity.csv b/doc/configtables/electricity.csv index 5fe20967f..416191c8d 100644 --- a/doc/configtables/electricity.csv +++ b/doc/configtables/electricity.csv @@ -1,7 +1,7 @@ ,Unit,Values,Description -voltages,kV,"Any subset of {200., 220., 300., 380., 500., 750.}",Voltage levels to consider +voltages,kV,"Any subset of {220., 300., 330., 380., 400., 500., 750.}",Voltage levels to consider base_network, --, "Any value in {'entsoegridkit', 'osm-prebuilt', 'osm-raw}", "Specify the underlying base network, i.e. GridKit (based on ENTSO-E web map extract, OpenStreetMap (OSM) prebuilt or raw (built from raw OSM data), takes longer." -osm-prebuilt-version, --, "float, any value in range 0.1-0.4", "Choose the version of the prebuilt OSM network. Defaults to latest Zenodo release." +osm-prebuilt-version, --, "float, any value in range 0.1-0.5", "Choose the version of the prebuilt OSM network. Defaults to latest Zenodo release." gaslimit_enable,bool,true or false,Add an overall absolute gas limit configured in ``electricity: gaslimit``. gaslimit,MWhth,float or false,Global gas usage limit co2limit_enable,bool,true or false,Add an overall absolute carbon-dioxide emissions limit configured in ``electricity: co2limit`` in :mod:`prepare_network`. **Warning:** This option should currently only be used with electricity-only networks, not for sector-coupled networks.. diff --git a/doc/data_sources.rst b/doc/data_sources.rst index 128fe0063..f11714db0 100644 --- a/doc/data_sources.rst +++ b/doc/data_sources.rst @@ -299,10 +299,10 @@ Data in this section is retrieved and extracted in rules specified in ``rules/re ``data/osm-prebuilt`` - **Source:** OpenStreetMap; Xiong, B., Neumann, F., & Brown, T. (2024). - Prebuilt Electricity Network for PyPSA-Eur based on OpenStreetMap Data (0.4) - [Data set]. Zenodo. https://doi.org/10.5281/zenodo.13759222 -- **Link:** https://zenodo.org/records/13759222 -- **License:** ODbL (`reference `) + Prebuilt Electricity Network for PyPSA-Eur based on OpenStreetMap Data (0.5) + [Data set]. Zenodo. https://doi.org/10.5281/zenodo.13981528 +- **Link:** https://zenodo.org/records/13981528 +- **License:** ODbL (`reference `) - **Description:** Pre-built data of high-voltage transmission grid in Europe from OpenStreetMap. ``data/osm-raw`` diff --git a/doc/release_notes.rst b/doc/release_notes.rst index 3d16e381f..fea90a6d8 100644 --- a/doc/release_notes.rst +++ b/doc/release_notes.rst @@ -80,6 +80,9 @@ Upcoming Release * Bugfix: Bug when multiple DC links are connected to the same DC bus and the DC bus is connected to an AC bus via converter. In this case, the DC links were wrongly simplified, completely dropping the shared DC bus. Bug fixed by adding preceding converter removal. Other functionalities are not impacted. +* Updated osm-prebuilt base network to version 0.5, for changelog, see https://zenodo.org/records/13981528 + + PyPSA-Eur 0.13.0 (13th September 2024) ====================================== diff --git a/rules/retrieve.smk b/rules/retrieve.smk index 9d2d3a5b8..843fb65fc 100755 --- a/rules/retrieve.smk +++ b/rules/retrieve.smk @@ -545,6 +545,7 @@ if config["enable"]["retrieve"] and ( 0.2: "13342577", 0.3: "13358976", 0.4: "13759222", + 0.5: "13981528", } # update rule to use the correct version