Merge branch 'fix/#830-fix-emob-load-ts' into continuous-integration/…

…run-everything-over-the-weekend-2022-06-10
openego · Jul 7, 2022 · 0263884 · 0263884
2 parents 4eaab3d + 98d9e76
commit 0263884
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -371,7 +371,7 @@ Changed
 *  Update hh electricity profiles
   `#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>`_
+  `#PR775 <https://github.com/openego/eGon-data/pull/775>`_
 * Add CH4 stores in Germany for eGon100RE
   `#779 <https://github.com/openego/eGon-data/issues/779>`_
 * Assigment of H2 and CH4 capacitites for pipelines in eGon100RE
@@ -548,6 +548,8 @@ Bug Fixes
   `#783 <https://github.com/openego/eGon-data/issues/783>`_
 * Overwrite capacities for conventional power plants with data from nep list
   `#403 <https://github.com/openego/eGon-data/issues/403>`_
+* Fix model load timeseries in motorized individual travel
+  `#830 <https://github.com/openego/eGon-data/issues/830>`_
 
 .. _PR #692: https://github.com/openego/eGon-data/pull/692
 .. _#343: https://github.com/openego/eGon-data/issues/343

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
@@ -306,7 +306,7 @@ standard version 1.4.1 using the `OMI tool
 
 .. code-block:: bash
 
-  omi translate -f oep-v1.4 metadata_file.json
+  omi translate -f oep-v1.4 -t oep-v1.4 metadata_file.json
 
 If your metadata string is correct, OMI puts the keys in the correct order and
 prints the full string (use `-o` option for export).

diff --git a/src/egon/data/datasets/emobility/motorized_individual_travel/__init__.py b/src/egon/data/datasets/emobility/motorized_individual_travel/__init__.py
@@ -413,7 +413,7 @@ def generate_model_data_tasks(scenario_name):
 
         super().__init__(
             name="MotorizedIndividualTravel",
-            version="0.0.1",
+            version="0.0.2",
             dependencies=dependencies,
             tasks=(
                 create_tables,

diff --git a/src/egon/data/datasets/emobility/motorized_individual_travel/model_timeseries.py b/src/egon/data/datasets/emobility/motorized_individual_travel/model_timeseries.py
@@ -59,6 +59,7 @@
     EgonPfHvStoreTimeseries,
 )
 from egon.data.datasets.mv_grid_districts import MvGridDistricts
+
 # from egon.data.datasets.scenario_parameters import get_sector_parameters
 
 
@@ -269,8 +270,11 @@ def generate_load_time_series(
         # (I) Preserve SoC while driving
         if location == "driving":
             # Full band while driving
-            # soc_min_absolute[drive_start:drive_end+1] += soc_end * bat_cap * ev_count
-            # soc_max_absolute[drive_start:drive_end+1] += soc_start * bat_cap * ev_count
+            # soc_min_absolute[drive_start:drive_end+1] +=
+            # soc_end * bat_cap * ev_count
+            #
+            # soc_max_absolute[drive_start:drive_end+1] +=
+            # soc_start * bat_cap * ev_count
 
             # Real band (decrease SoC while driving)
             soc_min_absolute[drive_start : drive_end + 1] += (
@@ -698,7 +702,7 @@ def write_load():
                         load_id=emob_load_id,
                         temp_id=1,
                         p_set=(
-                            hourly_load_time_series_df.load_time_series.to_list()
+                            hourly_load_time_series_df.driving_load_time_series.to_list()
                         ),
                     )
                 )