Apply PR feedback

config/default.cfg

@@ -913,8 +913,8 @@ cfg$gms$c32_rot_calc_type <- "current_annual_increment"
 # * ("016lin2030") Disturbance applied to 1p6 percent per year linear phase-in over 20yrs from 0 in 2030
 cfg$gms$c32_shock_scenario = "none"     # def = "none"
 
-# Prohibit rapid afforestation early on. This is done on cluster-level to avoid a single region or cluster abusing low boundaries > 0
-# * 0.005 = globally 1Mha Aff allowed in 2025
+# Maximum allowed area (Mha) for new endogenous afforestation per cluster in 2025.
+# Can be used to avoid or limit unwanted early model behavior for specific carbon price curves.
 cfg$gms$s32_max_aff_cell_2025 <- Inf # def = inf
 
 # ***---------------------    34_urban   ---------------------------------------
@@ -1749,23 +1749,27 @@ cfg$gms$c60_biodem_level <- 1                     # def = 1
 # * Therefore, the minimum demand is of particular importance for the coupling with REMIND.
 cfg$gms$s60_2ndgen_bioenergy_dem_min <- 1       # def = 1
 
-# * Minimum demand can be set to 0 for price-driven runs past the SSP2_fix (1st2ndgen_priced_feb24 only)
+# * Minimum demand (mio. GJ per yr) can be set to 0 for price-driven runs past the SSP2_fix (1st2ndgen_priced_feb24 only)
 cfg$gms$s60_2ndgen_bioenergy_dem_min_post_fix <- 1 # def = 1
 
-# * first generation bioenergy subsidy (USD05MER per ton)
-# * for GJ-based prices post fix_SSP2 only the fix_SSP2 should be > 0 (1st2ndgen_priced_feb24 only)
-# * In 1stgen_priced_dec18, c60_bioenergy_subsidy is applied as constant value over the full time horizon
+# * t DM-based first generation bioenergy subsidy (USD05MER per ton)
+# * (1stgen_priced_dec18):    c60_bioenergy_subsidy is applied constant over historic and model horizon, c60_bioenergy_subsidy_fix_SSP2 has no effect
+# * (1st2ndgen_priced_feb24): c60_bioenergy_subsidy_fix_SSP2 is applied constant to historic time steps (up until sm_fix_SSP2). 
+# *                           c60_bioenergy_subsidy is applied constant to model horizon (after sm_fix_SSP2)
+# *                           If GJ-based prices are used (setting below), c60_bioenergy_subsidy should be set to 0 
 cfg$gms$c60_bioenergy_subsidy <- 300              # def = 300
-cfg$gms$c60_bioenergy_subsidy_fix_SSP2 <- 300     # def = 300
+cfg$gms$c60_bioenergy_subsidy_fix_SSP2
 
-# * For 1st2ndgen_priced_feb24, target prices (US05MER per GJ) for 1st and 2nd gen bioenergy
+# * GJ-based bioenergy subsidy (USD05MER per GJ), only used in 1st2ndgen_priced_feb24
+# * Target prices for 1st and 2nd gen bioenergy
 cfg$gms$s60_bioenergy_gj_price_1st <- 0 # def = 0
 cfg$gms$s60_bioenergy_price_2nd <- 0 # def = 0
 
-# * Shape of GJ-based price curve towards defined target price
-# * Options: const : constant price equal to target price
-# * exp : exponential implementation starting from 0.25 * target price in the first sm_fix_SSP2 year; steps <= sm_fix_SSP2 then fixed to 0
-# * lin : linear implementation starting from 0 in the sm_fix_SSP2 year 
+# * Shape of GJ-based price curve towards defined target price, reached in 2100
+# * Options: const, exp, lin
+# * (const): constant price equal to target price
+# * (exp):   exponential implementation starting from 0.25 * target price in the first sm_fix_SSP2 year; steps <= sm_fix_SSP2 then fixed to 0
+# * (lin):   linear implementation starting from 0 in the sm_fix_SSP2 year 
 cfg$gms$c60_price_implementation <- "lin" # def = "lin"
 
 

modules/60_bioenergy/1st2ndgen_priced_feb24/equations.gms

@@ -6,9 +6,6 @@
 *** |  Contact: [email protected]
 
 *' @equations
-
-
-*' @code
 *' Total demand for bioenergy comes from different origins
 *' 1st generation bioenergy demand is a fixed trajectory of minimum production
 *' requirements. Second generation bioenergy splits into a demand
@@ -71,7 +68,7 @@ q60_res_2ndgenBE(i2) ..
 *' mass- or energy-based.  For comparability, the former is in line with other realizations and constant over time. 
 *' The energy-based incentive can take different forms and is applied to both 1st and 2nd generation. 
 *' Combined with low or fade-out exogenous demands, this is useful to assess bioenergy production potentials, however
-*' the endogenous technological change in [13_tc] may react very strongly and create a positive feedback loop
+*' the endogenous technological change in [13_tc] may react very strongly and create a positive feedback loop.
 
 q60_bioenergy_incentive(i2).. vm_bioenergy_utility(i2)
   =e= sum((ct,k1st60), vm_dem_bioen(i2,k1st60) * (-i60_1stgen_bioenergy_subsidy_tdm(ct)))

modules/60_bioenergy/1stgen_priced_dec18/equations.gms

@@ -6,9 +6,6 @@
 *** |  Contact: [email protected]
 
 *' @equations
-
-
-*' @code
 *' Total demand for bioenergy comes from different origins
 *' 1st generation bioenergy demand is a fixed trajectory of minimum production
 *' requirements. Second generation bioenergy splits into a Demand