Add results plotting

src/G0_oemof_simulate.py

@@ -48,6 +48,7 @@
     SHARE_BACKUP,
     SHARE_USAGE,
     SHARE_HYBRID,
+    CRITICAL,
     EVALUATION_TIME,
     LCOE,
     CASE_NAME,
@@ -138,6 +139,8 @@ def run(experiment, case_dict):
 
     electricity_bus_dc = solph.views.node(results, BUS_ELECTRICITY_DC)
 
+    critical = solph.views.node(results, CRITICAL)
+
     try:
 
         e_flows_df = timeseries.get_demand(
@@ -147,6 +150,14 @@ def run(experiment, case_dict):
             electricity_bus_dc,
             experiment,
         )
+        e_flows_df = timeseries.get_demand(
+            case_dict,
+            oemof_results,
+            electricity_bus_ac,
+            electricity_bus_dc,
+            critical,
+            experiment,
+        )
         e_flows_df = timeseries.get_shortage(
             case_dict,
             oemof_results,
@@ -156,6 +167,7 @@ def run(experiment, case_dict):
             e_flows_df,
         )
         # TODO maybe separate critical and non critical here for results plotting
+        ## ADDED in line #135
         oemof_results.update(
             {
                 SUPPLY_RELIABILITY_KWH: oemof_results[TOTAL_DEMAND_SUPPLIED_ANNUAL_KWH]

src/G1_oemof_create_model.py

@@ -542,6 +542,7 @@ def build(experiment, case_dict):
         )
 
     # TODO maybe important for critical
+    # AD: We might leave this certain of shortage to assign to the non critical demand?
     """
     # ------------Allow shortage only for certain percentage of demand in a timestep------------#
     if case_dict['allow_shortage'] is True: