diff --git a/modules/30_croparea/detail_apr24/presolve.gms b/modules/30_croparea/detail_apr24/presolve.gms index fb18d303f..c110499ec 100644 --- a/modules/30_croparea/detail_apr24/presolve.gms +++ b/modules/30_croparea/detail_apr24/presolve.gms @@ -34,11 +34,11 @@ else * create betr target and penalty scenario i30_betr_target(t,j) = (1-i30_betr_scenario_fader(t)) * - (s30_betr_start * sum(cell(i,j), p29_country_weight(i)) - + s30_betr_start_noselect * sum(cell(i,j), 1-p29_country_weight(i))) + (s30_betr_start * sum(cell(i,j), p30_country_weight(i)) + + s30_betr_start_noselect * sum(cell(i,j), 1-p30_country_weight(i))) + i30_betr_scenario_fader(t) * - (s30_betr_target * sum(cell(i,j), p29_country_weight(i)) - + s30_betr_target_noselect * sum(cell(i,j), 1-p29_country_weight(i))); + (s30_betr_target * sum(cell(i,j), p30_country_weight(i)) + + s30_betr_target_noselect * sum(cell(i,j), 1-p30_country_weight(i))); if (m_year(t) <= s30_betr_scenario_start, i30_betr_penalty(t) = 0; diff --git a/modules/30_croparea/simple_apr24/presolve.gms b/modules/30_croparea/simple_apr24/presolve.gms index 2f23d5fb7..adc5cba7e 100644 --- a/modules/30_croparea/simple_apr24/presolve.gms +++ b/modules/30_croparea/simple_apr24/presolve.gms @@ -25,11 +25,11 @@ crpmin30(crp30) = yes$(f30_rotation_min_shr(crp30) > 0); * create betr target and penalty scenario i30_betr_target(t,j) = (1-i30_betr_scenario_fader(t)) * - (s30_betr_start * sum(cell(i,j), p29_country_weight(i)) - + s30_betr_start_noselect * sum(cell(i,j), 1-p29_country_weight(i))) + (s30_betr_start * sum(cell(i,j), p30_country_weight(i)) + + s30_betr_start_noselect * sum(cell(i,j), 1-p30_country_weight(i))) + i30_betr_scenario_fader(t) * - (s30_betr_target * sum(cell(i,j), p29_country_weight(i)) - + s30_betr_target_noselect * sum(cell(i,j), 1-p29_country_weight(i))); + (s30_betr_target * sum(cell(i,j), p30_country_weight(i)) + + s30_betr_target_noselect * sum(cell(i,j), 1-p30_country_weight(i))); if (m_year(t) <= s30_betr_scenario_start, i30_betr_penalty(t) = 0;