Merge pull request #1083 from openego/revert-1082-revert-1052-features/…

…#1048-desagg-dsm-time-series

Features/#1048 desagg dsm time series

CHANGELOG.rst

@@ -37,7 +37,7 @@ Added
 * OSM data import as done in open_ego
   `#1 <https://github.com/openego/eGon-data/issues/1>`_
   which was updated to the latest long-term data set of the 2021-01-01 in
-  #223 <https://github.com/openego/eGon-data/issues/223>`_
+  `#223 <https://github.com/openego/eGon-data/issues/223>`_
 * Verwaltungsgebiete data import (vg250) more or less done as in open_ego
   `#3 <https://github.com/openego/eGon-data/issues/3>`_
 * Zensus population data import
@@ -232,9 +232,12 @@ Added
 * Write simBEV metadata to DB table
   `PR #978 <https://github.com/openego/eGon-data/pull/978>`_
 *  Add voltage level for electricity building loads
-  `#955 <https://github.com/openego/eGon-data/issues/955>`_
+   `#955 <https://github.com/openego/eGon-data/issues/955>`_
 * Add desaggregation of pv home batteries onto buildings
   `#988 <https://github.com/openego/eGon-data/issues/988>`_
+* Desaggregation of DSM time series onto CTS consumers per bus id and
+  individual indutry consumers.
+  `#1048 <https://github.com/openego/eGon-data/issues/1048>`_
 * Add load areas
   `#1014 <https://github.com/openego/eGon-data/issues/1014>`_
 * Add new MaStR dataset
@@ -277,7 +280,7 @@ Changed
 * Update installation of demandregio's disaggregator
   `#202 <https://github.com/openego/eGon-data/issues/202>`_
 * Update etrago tables
-  `#243 <https://github.com/openego/eGon-data/issues/243>`_and
+  `#243 <https://github.com/openego/eGon-data/issues/243>`_ and
   `#285 <https://github.com/openego/eGon-data/issues/285>`_
 * Migrate VG250 to datasets
   `#283 <https://github.com/openego/eGon-data/issues/283>`_
@@ -350,7 +353,7 @@ Changed
 * Integrate fuel and CO2 costs for eGon2035 to scenario parameters
   `#549 <https://github.com/openego/eGon-data/issues/549>`_
 *  Aggregate generators and stores for CH4
-  `#629 <https://github.com/openego/eGon-data/issues/629>`_
+   `#629 <https://github.com/openego/eGon-data/issues/629>`_
 * Fill missing household data for populated cells
   `#431 <https://github.com/openego/eGon-data/issues/431>`_
 * Fix RE potential areas outside of Germany by updating
@@ -404,7 +407,7 @@ Changed
 * Include simplified restrictions for H2 feed-in into CH4 grid
   `#790 <https://github.com/openego/eGon-data/issues/790>`_
 *  Update hh electricity profiles
-  `#735 <https://github.com/openego/eGon-data/issues/735>`_
+   `#735 <https://github.com/openego/eGon-data/issues/735>`_
 * Improve CH4 stores and productions aggregation by removing dedicated task
   `#775 <https://github.com/openego/eGon-data/pull/775>`_
 * Add CH4 stores in Germany for eGon100RE

src/egon/data/airflow/dags/pipeline.py

@@ -13,7 +13,7 @@
 from egon.data.datasets.data_bundle import DataBundle
 from egon.data.datasets.demandregio import DemandRegio
 from egon.data.datasets.district_heating_areas import DistrictHeatingAreas
-from egon.data.datasets.DSM_cts_ind import dsm_Potential
+from egon.data.datasets.DSM_cts_ind import DsmPotential
 from egon.data.datasets.electrical_neighbours import ElectricalNeighbours
 from egon.data.datasets.electricity_demand import (
     CtsElectricityDemand,
@@ -498,7 +498,7 @@
     )
 
     # DSM (demand site management)
-    components_dsm = dsm_Potential(
+    components_dsm = DsmPotential(
         dependencies=[
             cts_electricity_demand_annual,
             demand_curves_industry,

src/egon/data/datasets.yml

@@ -847,9 +847,15 @@ DSM_CTS_industry:
     ind_osm_loadcurves:
       schema: 'demand'
       table: 'egon_osm_ind_load_curves'
+    ind_osm_loadcurves_individual:
+      schema: 'demand'
+      table: 'egon_osm_ind_load_curves_individual'
     ind_sites_loadcurves:
       schema: 'demand'
       table: 'egon_sites_ind_load_curves'
+    ind_sites_loadcurves_individual:
+      schema: 'demand'
+      table: 'egon_sites_ind_load_curves_individual'
     ind_sites:
       schema: 'demand'
       table: 'egon_industrial_sites'
@@ -875,6 +881,18 @@ DSM_CTS_industry:
     store_timeseries:
       schema: 'grid'
       table: 'egon_etrago_store_timeseries'
+    cts_loadcurves_dsm:
+      schema: 'demand'
+      table: 'egon_etrago_electricity_cts_dsm_timeseries'
+    ind_osm_loadcurves_individual_dsm:
+      schema: 'demand'
+      table: 'egon_osm_ind_load_curves_individual_dsm_timeseries'
+    demandregio_ind_sites_dsm:
+      schema: 'demand'
+      table: 'egon_demandregio_sites_ind_electricity_dsm_timeseries'
+    ind_sites_loadcurves_individual:
+      schema: 'demand'
+      table: 'egon_sites_ind_load_curves_individual_dsm_timeseries'
 
 generators_etrago:
   sources: