Merge pull request magpiemodel#19 from emolinab/f_update_config

Calibration files and comments

config/default.cfg

@@ -22,11 +22,17 @@ cfg$model <- "main.gms"   #def = "main.gms"
 #### input settings ####
 
 # which input data sets should be used?
+# Options for calibration tgz files for different factor costs realizations, with default settings and rev4.63:
+# * (fixed_per_ton_mar18):       "calibration_H12_fixed_per_ton_mar18__01Sep21.tgz"
+# * (mixed_feb17):               "calibration_H12_mixed_feb17__01Sep21.tgz"
+# * (sticky_feb18)(free)         "calibration_H12_sticky_feb18_free_31Aug21.tgz"
+# * (sticky_feb18)(dynamic)      "calibration_H12_sticky_feb18_dynamic_01Sep21.tgz"
 
 cfg$input <- c(cellular    = "rev4.63_h12_a3fb0fc7_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-066f36d1.tgz",
                regional    = "rev4.63_h12_magpie.tgz",
                validation  = "rev4.63_h12_validation.tgz",
-               additional  = "additional_data_rev4.04.tgz")
+               additional  = "additional_data_rev4.04.tgz",
+               calibration = "calibration_H12_sticky_feb18_free_31Aug21.tgz")
 
 #a list of repositories (please pay attention to the list format!) in which the
 #files should be searched for. Files will be searched in all repositories until
@@ -688,6 +694,8 @@ cfg$gms$c35_forest_damage_end <- "by2050"       # def = "by2050"
 cfg$gms$s35_hvarea = 0 # def = 0
 
 # ***---------------------    38_factor_costs    -------------------------------
+# * Make sure you use the corresponding calibration file to the selected realization
+# * Please, check details in input settings.
 # * (fixed_per_ton_mar18): factor costs fixed per ton
 # * (mixed_feb17):         reimplementation of MAgPIE 3.0 default
 # * (sticky_feb18)         factor costs including investments in capital