Merge branch 'dev' into features/#169-renaming-gid-and-subst_id

CHANGELOG.rst

@@ -124,6 +124,8 @@ Added
   `#237 <https://github.com/openego/eGon-data/issues/237>`_
 * Merge electrical loads per bus and export to etrago tables
   `#328 <https://github.com/openego/eGon-data/issues/328>`_
+* Integrate existing CHP and extdended CHP > 10MW_el
+  `#266 <https://github.com/openego/eGon-data/issues/266>`_
 
 .. _PR #159: https://github.com/openego/eGon-data/pull/159
 
@@ -233,4 +235,7 @@ Bug fixes
   `#387 <https://github.com/openego/eGon-data/issues/387>`_
 * Fix unnecessary columns in normal mode for inserting the gas production
   `#387 <https://github.com/openego/eGon-data/issues/390>`_
+* Add xlrd and openpyxl to installation setup
+  `#400 <https://github.com/openego/eGon-data/issues/400>`_
+
 

CONTRIBUTING.rst

@@ -189,10 +189,15 @@ Before requesting a review, please
 1. Include passing tests (run ``tox``). [#tox-note]_
 2. Let the workflow run in :ref:`Test mode` once from scratch to verify
    successful execution
-3. Update documentation when there's new API, functionality etc.
-4. Add a note to ``CHANGELOG.rst`` about the changes and refer to the
+3. Make sure that your changes are tested in integration with other
+   tasks and on a complete run at least once by merging them into the
+   `continuous-integration/run-everything-over-the-weekend`_ branch.
+   This branch will regularly be checked out and tested on a complete
+   workflow run on friday evening.
+4. Update documentation when there's new API, functionality etc.
+5. Add a note to ``CHANGELOG.rst`` about the changes and refer to the
    corresponding Github issue.
-5. Add yourself to ``AUTHORS.rst``.
+6. Add yourself to ``AUTHORS.rst``.
 
 .. [#tox-note]
     If you don't have all the necessary Python versions available locally
@@ -202,6 +207,7 @@ Before requesting a review, please
     It will be slower though ...
 
 .. _run the tests: https://github.com/openego/eGon-data/actions?query=workflow%3A%22Tests%2C+code+style+%26+coverage%22
+.. _continuous-integration/run-everything-over-the-weekend: https://github.com/openego/eGon-data/tree/continuous-integration/run-everything-over-the-weekend
 
 
 When requesting reviews, please keep in mind it might be a significant effort

setup.py

@@ -92,13 +92,15 @@ def read(*names, **kwargs):
         "matplotlib",
         "netcdf4",
         "oedialect==0.0.8",
+        "openpyxl",
         "pandas>1.2.0,<1.3.0",
         "psycopg2",
         "pyaml",
         "rasterio",
         "rtree",
         "sqlalchemy<1.4",
         "xarray",
+        "xlrd",
         "rioxarray",
     ],
     extras_require={

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

@@ -6,6 +6,7 @@
 import importlib_resources as resources
 
 from egon.data.datasets import database
+from egon.data.datasets.chp import Chp
 from egon.data.datasets.data_bundle import DataBundle
 from egon.data.datasets.demandregio import DemandRegio
 from egon.data.datasets.district_heating_areas import DistrictHeatingAreas
@@ -365,11 +366,23 @@
     etrago_input_data >> solar_rooftop_etrago
     map_zensus_grid_districts >> solar_rooftop_etrago
 
+    # CHP locations
+    chp = Chp(
+        dependencies=[mv_grid_districts,
+                      mastr_data])
+
+    chp_locations_nep = tasks["chp.insert-chp-egon2035"]
+    chp_heat_bus = tasks["chp.assign-heat-bus"]
+
+    nep_insert_data >> chp_locations_nep
+    create_gas_polygons >> chp_locations_nep
+    import_district_heating_areas >> chp_locations_nep
+
     # Heat supply
     heat_supply = HeatSupply(
         dependencies=[data_bundle, zensus_mv_grid_districts,
                       district_heating_areas, power_plants,
-                      zensus_mv_grid_districts])
+                      zensus_mv_grid_districts, chp])
 
     # Heat to eTraGo
     heat_etrago = HeatEtrago(

src/egon/data/datasets.yml

@@ -459,9 +459,9 @@ heat_supply:
     district_heating_areas:
       schema: 'demand'
       table: 'egon_district_heating_areas'
-    power_plants:
+    chp:
       schema: 'supply'
-      table: 'egon_power_plants'
+      table: 'egon_chp'
     federal_states:
       schema: 'boundaries'
       table: 'vg250_lan'
@@ -480,6 +480,9 @@ heat_supply:
     map_dh:
       schema: 'demand'
       table: 'egon_map_zensus_district_heating_areas'
+    etrago_buses:
+      table: 'egon_pf_hv_bus'
+      schema: 'grid'
   targets:
     district_heating_supply:
       schema: 'supply'
@@ -641,5 +644,38 @@ etrago_electricity:
       table: 'egon_etrago_load_timeseries'
 
 
-
+chp_location:
+  sources:
+    list_conv_pp:
+      table: 'nep_2021_conv_powerplants'
+      schema: 'supply'
+    mastr_combustion: 'bnetza_mastr_combustion_cleaned.csv'
+    mastr_location: 'location_elec_generation_raw.csv'
+    mv_grid_districts: 'grid.mv_grid_districts'
+    ehv_voronoi: "grid.egon_ehv_substation_voronoi"
+    etrago_buses:
+      table: 'egon_pf_hv_bus'
+      schema: 'grid'
+    osm_landuse:
+      table: 'osm_landuse'
+      schema: 'openstreetmap'
+    osm_polygon:
+      table: 'osm_polygon'
+      schema: 'openstreetmap'
+    district_heating_areas:
+      schema: 'demand'
+      table: 'egon_district_heating_areas'
+    industrial_demand_osm:
+      schema: 'demand'
+      table: 'egon_demandregio_osm_ind_electricity'
+    vg250_lan:
+      schema: 'boundaries'
+      table: 'vg250_lan'
+  targets:
+    chp_table:
+      table: 'egon_chp'
+      schema: 'supply'
+    mastr_conventional_without_chp:
+      table: 'egon_mastr_conventional_without_chp'
+      schema: 'supply'