Merge branch 'features/#955-add-voltage-level-buildings-peak-load' in…

…to features/#1014-load-areas_#1035-add-demandregio-sq-scenario_#1001-desaggregate-industry-demand_#955-add-voltage-level-buildings-peak-load_CI-2022-11-01
openego · Nov 10, 2022 · 53d8071 · 53d8071
2 parents 5c0bade + 5da3c55
commit 53d8071
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/egon/data/datasets/electricity_demand_timeseries/cts_buildings.py b/src/egon/data/datasets/electricity_demand_timeseries/cts_buildings.py
@@ -1619,9 +1619,9 @@ def assign_voltage_level_to_buildings():
             cells_query.session.bind,
         )
 
-    df_peak_load_buildings = df_peak_loads.groupby("building_id")[
-        "peak_load_in_w"
-    ].sum()
+    df_peak_load_buildings = df_peak_loads.groupby(
+        ["building_id", "scenario"]
+    )["peak_load_in_w"].sum()
     df_peak_load_buildings = df_peak_load_buildings.to_frame()
     df_peak_load_buildings.loc[:, "voltage_level"] = 0
 
@@ -1649,7 +1649,7 @@ def assign_voltage_level_to_buildings():
         left=df_peak_loads.drop(columns="voltage_level"),
         right=df_peak_load_buildings["voltage_level"],
         how="left",
-        left_on="building_id",
+        left_on=["building_id", "scenario"],
         right_index=True,
     )