Small final fixes

config/config.yaml

@@ -20,9 +20,8 @@ timeshift: 0 # value between -11 and 12
 
 # Spatial Parameters 
 geographic_scope:
-  - "IND"
-  - "PAK"
   - "BTN"
+  - "IND"
 
 crossborderTrade: True
 

workflow/scripts/osemosys_global/powerplant/main.py

@@ -321,7 +321,7 @@ def main(
         start_year = 2021
         end_year = 2050
         region_name = 'GLOBAL'
-        geographic_scope = ['IND', 'PAK', 'BTN']
+        geographic_scope = ['BTN', 'IND']
         custom_nodes = [] 
         remove_nodes = []
         tech_capacity = {'PWRCOAINDWE01': [8, 2000, 2025, 5, 1100, 35],

workflow/scripts/osemosys_global/powerplant/renewable_targets.py

@@ -34,7 +34,7 @@ def apply_re_pct_targets(re_targets, geographic_scope, remove_nodes, oar_df,
             value_dict[target] = target_params[5]
 
         # Per entry check if they are relative targets ('PCT').
-        for target in re_targets.keys():
+        for target in re_targets:
             if type_dict[target] == 'PCT':
                 # Check for a technology subset for the target.
                 if not target_techs_dict[target]:
@@ -180,7 +180,7 @@ def apply_re_abs_targets(re_targets, remove_nodes, region_name):
             value_dict[target] = target_params[5]
 
         # Per entry check if they are absolute targets ('ABS').
-        for target in re_targets.keys():
+        for target in re_targets:
             if type_dict[target] == 'ABS':
                 target_years = get_years(first_year_dict[target], 
                                          final_year_dict[target])

workflow/scripts/osemosys_global/transmission/activity.py

@@ -127,8 +127,7 @@ def activity_transmission(df_iar_base, df_oar_base, df_eff,
 
     return df_iar_trn_final, df_oar_trn_final
 
-def activity_transmission_limit(cross_border_trade, df_oar_trn_final, 
-                                df_model_period_activity_upper_limit_base):
+def activity_transmission_limit(cross_border_trade, df_oar_trn_final):
 
     # Set cross-border trade to 0 if False
     if not cross_border_trade:

workflow/scripts/osemosys_global/transmission/main.py

@@ -75,8 +75,7 @@ def main(
     min_cap_invest_base: pd.DataFrame,
     res_cap_base: pd.DataFrame,
     tech_set_base: pd.DataFrame,
-    fuel_set_base: pd.DataFrame,
-    model_period_activity_upper_limit_base: pd.DataFrame,
+    fuel_set_base: pd.DataFrame
 ):
 
     # CALL FUNCTIONS
@@ -110,8 +109,7 @@ def main(
                                              end_year, region_name)
 
     # Adjust activity limits if cross border trade is not allowed following user config.
-    activity_limit_trn = activity_transmission_limit(cross_border_trade, oar_trn,
-                                                     model_period_activity_upper_limit_base)
+    activity_limit_trn = activity_transmission_limit(cross_border_trade, oar_trn)
 
     # Set operational life for transmission.
     op_life_trn = set_op_life_transmission(oar_trn, default_op_life, op_life_base, region_name)