Fix to include new sector names in GCAM 7.1 elec consumption

ec-jrc · Nov 22, 2024 · dc60ca7 · dc60ca7
1 parent f7ab62d
commit dc60ca7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/lisfloodutilities/water-demand-historic/step3a_industrial_demand.py b/src/lisfloodutilities/water-demand-historic/step3a_industrial_demand.py
@@ -527,11 +527,11 @@ def main():
         building = np.sum(gcam_output.iloc[np.where(sel)[0],4:-1].values,axis=0)
         sel = ["Reference" in s for s in gcam_output['scenario']] & (gcam_output['region']==region_name) & (gcam_output['input'].isin(['elect_td_ind', 'elect_td_trn']))
         trans_ind = np.sum(gcam_output.iloc[np.where(sel)[0],4:-1].values,axis=0)
-        sel = ["Reference" in s for s in gcam_output['scenario']] & (gcam_output['region']==region_name) & (gcam_output['sector']=='resid heating')
+        sel = ["Reference" in s for s in gcam_output['scenario']] & (gcam_output['region']==region_name) & (gcam_output['sector'][:13]=='resid heating')
         heating = np.sum(gcam_output.iloc[np.where(sel)[0],4:-1].values,axis=0)
-        sel = ["Reference" in s for s in gcam_output['scenario']] & (gcam_output['region']==region_name) & (gcam_output['sector']=='resid cooling')
+        sel = ["Reference" in s for s in gcam_output['scenario']] & (gcam_output['region']==region_name) & (gcam_output['sector'][:13]=='resid cooling')
         cooling = np.sum(gcam_output.iloc[np.where(sel)[0],4:-1].values,axis=0)
-        sel = ["Reference" in s for s in gcam_output['scenario']] & (gcam_output['region']==region_name) & (gcam_output['sector']=='resid others')
+        sel = ["Reference" in s for s in gcam_output['scenario']] & (gcam_output['region']==region_name) & (gcam_output['sector'][:12]=='resid others')
         other = np.sum(gcam_output.iloc[np.where(sel)[0],4:-1].values,axis=0)
         gcam_years = np.array([int(x) for x in gcam_output.columns[4:-1].values])