Changed 'calibration' to 'min_generation_factors' parameter

OSeMOSYS · Nov 21, 2024 · 68346d0 · 68346d0
1 parent af29a95
commit 68346d0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/config/config.yaml b/config/config.yaml
@@ -178,18 +178,19 @@ emission_limit:
  - ["CO2", "IND", "LINEAR", 2028, 400]
  - ["CO2", "IND", "POINT", 2030, 300]
 
-calibration:
+min_generation_factors:
 # TECHNOLOGY: [VALUE, COUNTRY, YEAR]
-# where VALUE is percentage (%) availability of a given technology. This can be used
-# to constrain power plant output (generation).
+# where VALUE is percentage (%) minimum utilization of a given technology. This can be 
+# used to constrain power plant output (generation), for example, to calibrate historical
+# generation values.
   OCG1: [50, "IND", 2021]
 
 max_availability_factors:
 # [COUNTRY/NODE, TECHNOLOGY, START_YEAR, END_YEAR, VALUE]
 # where VALUE is percentage (%) MAX availability of a given technology. This overwrites
 # the default values from availability_factors.csv in resources/data. This parameter can
-# be used to constrain the output of technologies to, for example, to mimic max generation
-# policy targets.
+# be used to constrain the maximum output of technologies to, for example, to mimic 
+# max generation policy targets.
  - ["INDWE", 'COA', 2023, 2050, 50]
  - ["IND", 'COA', 2023, 2050, 25]
 

diff --git a/workflow/rules/preprocess.smk b/workflow/rules/preprocess.smk
@@ -195,7 +195,7 @@ rule powerplant:
         no_investment_techs = config['no_invest_technologies'],
         availability_factors = config['max_availability_factors'],
         res_targets = config['re_targets'],
-        calibration = config['calibration'],
+        calibration = config['min_generation_factors'],
         output_data_dir = 'results/data',
         input_data_dir = 'resources/data',
         powerplant_data_dir = 'results/data/powerplant',

diff --git a/workflow/scripts/osemosys_global/powerplant/main.py b/workflow/scripts/osemosys_global/powerplant/main.py
@@ -220,7 +220,7 @@ def main(
                                                                                 specified_demand,
                                                                                 region_name)
 
-    # Set OAR, FUEL and AccumulatedAnnualDemand after calibration.
+    # Set OAR, FUEL and AccumulatedAnnualDemand after calibration (minium generation).
     fuel_set, df_oar_final, df_accumulated_annual_demand = apply_calibration(calibration, 
                                                                              df_oar_final, 
                                                                              df_accumulated_annual_demand, 
@@ -342,7 +342,7 @@ def main(
                        'T03': ["INDSO", ['WOF','WON'], "PCT", 2025, 2045, 15],
                        'T04': ["INDSO", ['WOF'], "ABS", 2040, 2050, 200] 
                       }
-        calibration = {}
+        min_generation_factors = {'OCG1': [50, "IND", 2021]}
         output_data_dir = 'results/data'
         input_data_dir = 'resources/data'
         powerplant_data_dir = 'results/data/powerplant'