Merge pull request #1167 from openego/revert-1166-features/#450-add-m…

…etadata

Revert "Features/#450 add metadata"

CHANGELOG.rst

@@ -458,8 +458,6 @@ Changed
   `#882 <https://github.com/openego/eGon-data/issues/882>`_
 * Insert crossboarding gas pipeline with Germany in eGon100RE
   `#881 <https://github.com/openego/eGon-data/issues/881>`_
-* Harmonize H2 carrier names in eGon100RE
-  `#929 <https://github.com/openego/eGon-data/issues/929>`_
 * Rename noflex to lowflex scenario for motorized individual travel
   `#921 <https://github.com/openego/eGon-data/issues/921>`_
 * Update creation of heat demand timeseries
@@ -479,8 +477,6 @@ Changed
   `#519 <https://github.com/openego/eGon-data/issues/519>`_
 * Add missing VOM costs for heat sector components
   `#942 <https://github.com/openego/eGon-data/issues/942>`_
-* Add sanity checks for gas sector in eGon2035
-  `#864 <https://github.com/openego/eGon-data/issues/864>`_
 * Desaggregate industry demands to OSM areas and industrial sites
   `#1001 <https://github.com/openego/eGon-data/issues/1001>`_
 * Add gas generator in Norway
@@ -490,8 +486,6 @@ Changed
   created for a single process. This fixes issue `#799`_.
 * Insert rural heat per supply technology
   `#1026 <https://github.com/openego/eGon-data/issues/1026>`_
-* Insert lifetime for components from p-e-s in eGon100RE
-  `#1073 <https://github.com/openego/eGon-data/issues/1073>`_
 * Change hgv data source to use database
   `#1086 <https://github.com/openego/eGon-data/issues/1086>`_
 * Rename eMob MIT carrier names (use underscores)
@@ -737,17 +731,13 @@ Bug Fixes
 * Fix URL of TYNDP scenario dataset
 * Automatically generated tasks now get unique :code:`task_id`\s.
   Fixes issue `#985`_ via PR `#986`_.
-* Adjust capcities of German CH4 stores
-  `#1096 <https://github.com/openego/eGon-data/issues/1096>`_
 * Fix faulty DSM time series
   `#1088 <https://github.com/openego/eGon-data/issues/1088>`_
 * Set upper limit on commissioning date for units from MaStR
   dataset
   `#1098 <https://github.com/openego/eGon-data/issues/1098>`_
 * Fix conversion factor for CH4 loads abroad in eGon2035
   `#1104 <https://github.com/openego/eGon-data/issues/1104>`_
-* Change structure of documentation in rtd
-  `#11126 <https://github.com/openego/eGon-data/issues/1126>`_
 
 .. _PR #692: https://github.com/openego/eGon-data/pull/692
 .. _#343: https://github.com/openego/eGon-data/issues/343

docs/conf.py

@@ -47,8 +47,3 @@
 
 add_module_names = False
 modindex_common_prefix = ["egon.data.", "egon.data.datasets."]
-
-autodoc_type_aliases = {
-    "Dependencies": "egon.data.datasets.Dependencies",
-    "Tasks": "egon.data.datasets.Tasks"
-}

docs/data.rst

@@ -1,124 +1,21 @@
 ****
 Data
 ****
-The description of the methods, input data and results of the eGon-data pipeline is given in the following section.
-References to datasets and functions are integrated if more detailed information is required.
-
-Main input data and their processing
-====================================
-
-All methods in the eGon-data workflow rely on public and freely available data from different external sources. The most important data sources
-and their processing within the eGon-data pipeline are described here.
-
-.. include:: data/input_data.rst
-
-Grid models
-===========
-
-Power grid models of different voltage levels form a central part of the eGon data model, which is required for cross-grid-level optimization.
-In addition, sector coupling necessitates the representation of the gas grid infrastructure, which is also described in this section.
-
-Electricity grid
-----------------
-
-.. include:: data/electricity_grids.rst
-
-Gas grid
---------
-
-.. include:: data/gas_grids.rst
-
-Demand
-======
-
-Electricity, heat and gas demands from different consumption sectors are taken into account in eGon-data. The related methods to distribute and
-process the demand data are described in the following chapters for the different consumption sectors separately.
-
-.. _electricity-demand-ref:
-
-Electricity
------------
-
-.. include:: data/electricity_demand.rst
-
-Heat
-----
-
-.. include:: data/heat_demand.rst
-
-Gas
----
-
-.. include:: data/gas_demand.rst
-
-.. _mobility-demand-ref:
-
-Mobility
---------
-
-.. include:: data/mobility_demand.rst
-
-
-Supply
-======
-
-The distribution and assignment of supply capacities or potentials are carried out technology-specific. The different methods are described in the
-following chapters.
-
-Electricity
------------
-
-.. include:: data/electricity_supply.rst
-
-Heat
-----
-
-.. include:: data/heat_supply.rst
-
-Gas
----
-.. include:: data/gas_supply.rst
-
-
-Flexibility options
-===================
-
-Different flexibility options are part of the model and can be utilized in the optimization of the energy system. Therefore detailed information about
-flexibility potentials and their distribution are needed. The considered technologies described in the following chapters range from different storage units,
-through dynamic line rating to Demand-Side-Management measures.
-
-Demand-Side-Management
-----------------------
-
-.. include:: data/DSM.rst
-
-Dynamic line rating
--------------------
-
-.. include:: data/DLR.rst
-
-E-Mobility
-----------
-
-.. include:: data/e-mobility.rst
-
-Battery stores
-----------------
-
-.. include:: data/batteries.rst
-
-Gas stores
------------------
-
-.. include:: data/gas_stores.rst
-
-Heat stores
--------------
-
-.. include:: data/heat_stores.rst
 
+Scenarios
+=========
 
 Published data
 ==============
 
+Data bundle
+-----------
 
+The data bundle is published on
+`zenodo <https://sandbox.zenodo.org/record/1167119>`_. It contains several data
+sets, which serve as a basis for egon-data. One such data set is the geocoding
+for the `MaStR data set <https://sandbox.zenodo.org/record/1132987>`_ which is
+used for eGon-data as well. Whenever the MaStR data set is updated it is
+necessary to redo the geocoding with the new data set and update the data
+bundle accordingly. The geocoding can be done based on the
+`mastr-geocoding repository <https://github.com/RLI-sandbox/mastr-geocoding>`_.