Empty res target fix

Author: maartenbrinkerink

workflow/scripts/osemosys_global/geographic_filter.py

@@ -17,7 +17,8 @@
 remove_nodes = config.get('nodes_to_remove')
 
 res_targets = config.get('re_targets')
-res_targets = list(res_targets.keys())
+if res_targets is not None:
+    res_targets = list(res_targets.keys())
 
 output_data_dir = config_paths.output_data_dir
 scenario_dir = config_paths.scenario_dir
@@ -69,19 +70,23 @@
             if 'FUEL' in df.columns:
                 df = df.loc[df['FUEL'].str[3:6].isin(geographic_scope) | 
                             df['FUEL'].str[6:9].isin(geographic_scope) |
-                            df['FUEL'].isin(res_targets) |
                             df['FUEL'].isin(international_fuels)]
 
+                if res_targets is not None:
+                    df = df.loc[df['FUEL'].isin(res_targets)]
+                
                 if remove_nodes:    
                     df = df.loc[~(df['FUEL'].str[3:8].isin(remove_nodes) | 
                                 df['FUEL'].str[6:11].isin(remove_nodes))]
 
             if str(each_csv).split('/')[-1] == 'FUEL.csv':
                 df = df.loc[df['VALUE'].str[3:6].isin(geographic_scope) | 
                             df['VALUE'].str[6:9].isin(geographic_scope) |
-                            df['VALUE'].isin(res_targets) |
                             df['VALUE'].isin(international_fuels)]
 
+                if res_targets is not None:
+                    df = df.loc[df['VALUE'].isin(res_targets)]
+                
                 if remove_nodes:
                     df = df.loc[~(df['VALUE'].str[3:8].isin(remove_nodes) | 
                                 df['VALUE'].str[6:11].isin(remove_nodes))]