Merge pull request #795 from openego/features/#553-motorized-individu…

…al-travel-dev-run Features/#553 motorized individual travel dev run
openego · Jun 3, 2022 · 042172c · 042172c
2 parents f07c442 + a928875
commit 042172c
Show file tree

Hide file tree

Showing 11 changed files with 2,454 additions and 15 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -2,4 +2,4 @@
 Authors
 =======
 
-* Guido Pleßmann, Ilka Cußman, Stephan Günther, Jonathan Amme, Julian Endres - https://github.com/openego/eGon-data
+* Guido Pleßmann, Ilka Cußmann, Stephan Günther, Jonathan Amme, Julian Endres, Kilian Helfenbein - https://github.com/openego/eGon-data
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -193,6 +193,8 @@ Added
   seems like the best course of action for now. Done via `PR #703`_ and
   hopefully prevents issues `#702`_ and `#267`_ from ever occurring
   again.
+* Provide wrapper to catch DB unique violation
+  `#514 <https://github.com/openego/eGon-data/issues/514>`_
 * Add electric scenario parameters for eGon100RE
   `#699 <https://github.com/openego/eGon-data/issues/699>`_
 * Introduce Sanity checks for eGon2035 

diff --git a/src/egon/data/airflow/dags/pipeline.py b/src/egon/data/airflow/dags/pipeline.py
@@ -24,6 +24,9 @@
     hh_buildings,
     hh_profiles,
 )
+from egon.data.datasets.emobility.motorized_individual_travel import (
+    MotorizedIndividualTravel,
+)
 from egon.data.datasets.era5 import WeatherData
 from egon.data.datasets.etrago_setup import EtragoSetup
 from egon.data.datasets.fill_etrago_gen import Egon_etrago_gen
@@ -526,6 +529,31 @@
     storage_etrago = StorageEtrago(
         dependencies=[pumped_hydro, scenario_parameters, setup_etrago]
     )
+
+    # eMobility: motorized individual travel
+    emobility_mit = MotorizedIndividualTravel(
+        dependencies=[
+            data_bundle,
+            mv_grid_districts,
+            scenario_parameters,
+            setup_etrago,
+            zensus_mv_grid_districts,
+            zensus_vg250,
+            storage_etrago,
+            hts_etrago_table,
+            chp_etrago,
+            components_dsm,
+            heat_etrago,
+            fill_etrago_generators,
+            create_ocgt,
+            insert_H2_storage,
+            insert_power_to_h2_installations,
+            insert_h2_to_ch4_grid_links,
+            create_gas_polygons_egon100RE,
+            gas_production_insert_data,
+            insert_data_ch4_storages,
+        ]
+    )
 
     # Sanity Checks
     sanity_checks = SanityChecks(
@@ -535,4 +563,4 @@
            fill_etrago_generators, 
         ]
     )
-    
+
diff --git a/src/egon/data/datasets.yml b/src/egon/data/datasets.yml
@@ -1037,4 +1037,34 @@ gas_neighbours:
       table: 'egon_etrago_store'
     links:
       schema: 'grid'
-      table: 'egon_etrago_link'
+      table: 'egon_etrago_link'
+
+emobility_mit:
+  original_data:
+    sources:
+      RS7:
+        url: "https://www.bmvi.de/SharedDocs/DE/Anlage/G/regiostar-referenzdateien.xlsx?__blob=publicationFile"
+        file: "regiostar-referenzdateien.xlsx"
+        file_processed: "regiostar-referenzdateien_preprocessed.csv"
+        sheet: "ReferenzGebietsstand2020"
+      KBA:
+        url: "https://www.kba.de/SharedDocs/Downloads/DE/Statistik/Fahrzeuge/FZ1/fz1_2021.xlsx?__blob=publicationFile&v=2"
+        file: "fz1_2021.xlsx"
+        file_processed: "fz1_2021_preprocessed.csv"
+        sheet: "FZ1.1"
+        columns: "D, J:N"
+        skiprows: 8
+      trips:
+        eGon2035:
+          file: "eGon2035_RS7_min2k_2022-05-13_120240_simbev_run.tar.gz"
+          file_metadata: "metadata_simbev_run.json"
+        eGon100RE:
+          file: "eGon100RE_RS7_min2k_2022-05-13_120301_simbev_run.tar.gz"
+          file_metadata: "metadata_simbev_run.json"
+  scenario:
+    variation:
+      eGon2035: "NEP C 2035"
+      eGon100RE: "Reference 2050"
+  model_timeseries:
+    reduce_memory: True
+    export_results_to_csv: True