Removed data files, updated docs.

PyPSA · Nov 19, 2024 · cb21f29 · cb21f29
1 parent 18e687d
commit cb21f29
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 39,018 deletions.
diff --git a/data/busmaps/base_s_1009_entsoegridkit.csv b/data/busmaps/base_s_1009_entsoegridkit.csv
diff --git a/data/busmaps/base_s_1009_osm-prebuilt.csv b/data/busmaps/base_s_1009_osm-prebuilt.csv
diff --git a/data/busmaps/base_s_314_entsoegridkit.csv b/data/busmaps/base_s_314_entsoegridkit.csv
diff --git a/data/busmaps/base_s_314_osm-prebuilt.csv b/data/busmaps/base_s_314_osm-prebuilt.csv
diff --git a/data/busmaps/base_s_318_entsoegridkit.csv b/data/busmaps/base_s_318_entsoegridkit.csv
diff --git a/data/busmaps/base_s_318_osm-prebuilt.csv b/data/busmaps/base_s_318_osm-prebuilt.csv
diff --git a/data/busmaps/base_s_37_entsoegridkit.csv b/data/busmaps/base_s_37_entsoegridkit.csv
diff --git a/data/busmaps/base_s_37_osm-prebuilt.csv b/data/busmaps/base_s_37_osm-prebuilt.csv
diff --git a/data/busmaps/base_s_41_entsoegridkit.csv b/data/busmaps/base_s_41_entsoegridkit.csv
diff --git a/data/busmaps/base_s_41_osm-prebuilt.csv b/data/busmaps/base_s_41_osm-prebuilt.csv
diff --git a/doc/configtables/electricity.csv b/doc/configtables/electricity.csv
@@ -1,7 +1,7 @@
 ,Unit,Values,Description
 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.5", "Choose the version of the prebuilt OSM network. Defaults to latest Zenodo release."
+osm-prebuilt-version, --, "float, any value in range 0.1-0.6", "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-base-network.rst b/doc/data-base-network.rst
@@ -15,11 +15,11 @@ The map might take a moment to load. To view it in full screen, click `here <bas
 
 ``data/osm-prebuilt``
 
-- **Source:** OpenStreetMap; Xiong, B., Neumann, F., & Brown, T. (2024).
+- **Source:** OpenStreetMap; Xiong, B., Fioriti, D., Neumann, F., Riepin I. & Brown, T. (2024).
   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 <https://zenodo.org/records/13981528>`)
+  [Data set]. Zenodo. https://doi.org/10.5281/zenodo.14144752
+- **Link:** https://zenodo.org/records/14144752
+- **License:** ODbL (`reference <https://zenodo.org/records/14144752>`)
 - **Description:** Pre-built data of high-voltage transmission grid in Europe from OpenStreetMap.
 
 This dataset contains a topologically connected representation of the European

diff --git a/doc/release_notes.rst b/doc/release_notes.rst
@@ -101,7 +101,7 @@ Upcoming Release
   - Single transformers for each combination of voltage level per substation. Transformers now have a capacity s_nom based on connected lines
   - Use of OSM relations where available and unambiguous (Overwriting all lines that are members of the respective relation to avoid duplicates)
 
-* Updated osm-prebuilt base network to version 0.5, for changelog, see https://zenodo.org/records/13981528
+* Updated osm-prebuilt base network to version 0.6, for changelog, see https://zenodo.org/records/14144752
 
 * Bugfix: vehicle-to-grid dispatch capacity is now limited by the fraction of vehicles participating in demand-side-management, halving the dispatch capacity under the default demand-side management participation rate of 0.5.