Storage levels in dispatch plot filtered by s units instead of s + th, possible to plot th only as well

Author: MPavicevic

dispaset/common.py

@@ -20,7 +20,9 @@
 # DispaSET fuels:
 commons['Fuels'] = ['BIO', 'GAS', 'HRD', 'LIG', 'NUC', 'OIL', 'PEA', 'SUN', 'WAT', 'WIN', 'WST', 'OTH', 'GEO']
 # Ordered list of fuels for plotting (the first ones are negative):
-commons['MeritOrder'] = ['Storage','FlowOut','GEO','NUC', 'LIG', 'HRD', 'BIO', 'GAS', 'OIL', 'PEA', 'WST', 'OTH', 'SUN', 'WIN', 'FlowIn', 'WAT']
+# commons['MeritOrder'] = ['Storage','FlowOut','GEO','NUC', 'LIG', 'HRD', 'BIO', 'GAS', 'OIL', 'PEA', 'WST', 'OTH', 'SUN', 'WIN', 'FlowIn', 'WAT']
+commons['MeritOrder'] = ['THMS','BATS','BEVS','HDAM','HPHS','FlowOut','GEO','NUC', 'LIG', 'HRD', 'BIO', 'GAS', 'OIL', 'PEA', 'WST', 'OTH', 'SUN', 'WIN', 'FlowIn', 'WAT']
+
 # Colors associated with each fuel:
 commons['colors'] = {'LIG': '#af4b9180', 'PEA': '#af4b9199', 'HRD': '#af4b91b2', 'OIL': '#af4b91ff',
                      'GAS': '#d7642dff',
@@ -30,7 +32,12 @@
                      'WAT': '#00a0e1ff',
                      'BIO': '#7daf4bff', 'GEO': '#7daf4bbf',
                      'Storage': '#b93c46ff', 'FlowIn': '#b93c46b2', 'FlowOut': '#b93c4666',
-                     'OTH': '#b9c33799', 'WST': '#b9c337ff'}
+                     'OTH': '#b9c33799', 'WST': '#b9c337ff',
+                     'HDAM': '#78C7C7',
+                     'HPHS': '#3090C7ff',
+                     'THMS': '#C04000ff',
+                     'BATS': '#41A317ff',
+                     'BEVS': '#4863A0ff'}
 commons['colors']['curtailment'] = 'red'
 # Hatches associated with each fuel:
 commons['hatches'] = {'LIG': '', 'PEA': '', 'HRD': '', 'OIL': '',
@@ -41,7 +48,8 @@
                       'WAT': '',
                       'BIO': '', 'GEO': '',
                       'Storage': '', 'FlowIn': '/', 'FlowOut': '\\',
-                      'WST': '', 'OTH': ''
+                      'WST': '', 'OTH': '',
+                      'HDAM': '','HPHS': '','THMS': '','BATS': '','BEVS': ''
                       }
 
 commons['logfile'] = str(datetime.datetime.now()).replace(':','-').replace(' ','_') + '.dispa.log'

dispaset/postprocessing/plot.py

@@ -8,7 +8,7 @@
 from ..misc.str_handler import clean_strings
 from ..common import commons
 
-from .postprocessing import get_imports, get_plot_data, filter_by_zone
+from .postprocessing import get_imports, get_plot_data, filter_by_zone, filter_by_tech, filter_by_storage
 
 
 def plot_dispatch(demand, plotdata, level=None, curtailment=None, shedload=None, rng=None,
@@ -140,16 +140,16 @@ def plot_dispatch(demand, plotdata, level=None, curtailment=None, shedload=None,
     # plt.legend(handles=[line_demand] + patches[::-1], loc=4)
 
     if shedload is None and level is None:
-        plt.legend(handles=[line_demand] + patches[::-1], loc=4, bbox_to_anchor=(1.2, 1.3))
+        plt.legend(handles=[line_demand] + patches[::-1], loc=4, bbox_to_anchor=(1.2, 0.5))
     if shedload is None:
-        plt.legend(handles=[line_demand] + [line_SOC] + patches[::-1], loc=4, bbox_to_anchor=(1.2, 1.3))
+        plt.legend(handles=[line_demand] + [line_SOC] + patches[::-1], loc=4, bbox_to_anchor=(1.2, 0.5))
     elif level is None:
-        plt.legend(handles=[line_demand] + [line_shedload] + patches[::-1], loc=4, bbox_to_anchor=(1.2, 1.3))
+        plt.legend(handles=[line_demand] + [line_shedload] + patches[::-1], loc=4, bbox_to_anchor=(1.2, 0.5))
         axes[0].fill_between(demand.index, demand, reduced_demand, facecolor="none", hatch="X", edgecolor="k",
                          linestyle='dashed')
     else:
         plt.legend(title='Dispatch for ' + demand.name[1], handles=[line_demand] + [line_shedload] + [line_SOC] +
-                                                                   patches[::-1], loc=4, bbox_to_anchor=(1.2, 1.3))
+                                                                   patches[::-1], loc=4, bbox_to_anchor=(1.2, 0.5))
         axes[0].fill_between(demand.index, demand, reduced_demand, facecolor="none", hatch="X", edgecolor="k",
                              linestyle='dashed')
 
@@ -327,7 +327,8 @@ def plot_zone(inputs, results, z='', rng=None, rug_plot=True):
     plotdata = get_plot_data(inputs, results, z) / 1000  # GW
 
     if 'OutputStorageLevel' in results:
-        level = filter_by_zone(results['OutputStorageLevel'], inputs, z) / 1E6  # TWh
+        levels = filter_by_zone(results['OutputStorageLevel'], inputs, z) / 1E6  # TWh
+        level = filter_by_storage(levels, inputs, StorageSubset='s')
         level = level.sum(axis=1)
     else:
         level = pd.Series(0, index=results['OutputPower'].index)

dispaset/postprocessing/postprocessing.py

@@ -97,6 +97,34 @@ def filter_by_zone(PowerOutput, inputs, z):
     return Power
 
 
+def filter_by_tech(PowerOutput, inputs, t):
+    """
+    This function filters the dispaset power output dataframe by technology
+
+    :param PowerOutput:   Dataframe of power generation with units as columns and time as index
+    :param inputs:        Dispaset inputs version 2.1.1
+    :param t:             Selected tech (e.g. 'HDAM')
+    :returns Power:
+    """
+    loc = inputs['units']['Technology']
+    Power = PowerOutput.loc[:, [u for u in PowerOutput.columns if loc[u] == t]]
+    return Power
+
+
+def filter_by_storage(PowerOutput, Inputs, StorageSubset=None):
+    """
+    This function filters the power generation curves of the different storage units by storage type
+
+    :param PowerOutput:     Dataframe of power generationwith units as columns and time as index
+    :param Inputs:          Dispaset inputs version 2.1.1
+    :param SpecifySubset:   If not all EES storages should be considered, list containing the relevant ones
+    :returns PowerByFuel:   Dataframe with power generation by fuel
+    """
+    storages = Inputs['sets'][StorageSubset]
+    Power = PowerOutput.loc[:, PowerOutput.columns.isin(storages)]
+    return Power
+
+
 def get_plot_data(inputs, results, z):
     """
     Function that reads the results dataframe of a DispaSET simulation and extract the dispatch data spedific to one zone
@@ -112,7 +140,15 @@ def get_plot_data(inputs, results, z):
         #onnly take the columns that correspond to storage units (StorageInput is also used for CHP plants):
         cols = [col for col in results['OutputStorageInput'] if inputs['units'].loc[col,'Technology'] in commons['tech_storage']]
         tmp = filter_by_zone(results['OutputStorageInput'][cols], inputs, z)
-        plotdata['Storage'] = -tmp.sum(axis=1)
+        bb = pd.DataFrame()
+        for tech in commons['tech_storage']:
+            aa = filter_by_tech(tmp, inputs, tech)
+            aa = aa.sum(axis=1)
+            aa = pd.DataFrame(aa,columns=[tech])
+            bb = pd.concat([bb,aa],axis=1)
+        bb = -bb
+        plotdata = pd.concat([plotdata,bb], axis=1)
+        # plotdata['Storage'] = -tmp.sum(axis=1)
     else:
         plotdata['Storage'] = 0
     plotdata.fillna(value=0, inplace=True)