diff --git a/core/datainput.gms b/core/datainput.gms index 4c66a7ea4..f9e82e081 100644 --- a/core/datainput.gms +++ b/core/datainput.gms @@ -762,7 +762,7 @@ pm_regiEarlyRetiRate(t,regi,"biohp") = 0.5 * pm_regiEarlyRetiRate(t,regi,"bioh $ifthen.tech_earlyreti not "%c_tech_earlyreti_rate%" == "off" loop((ext_regi,te)$p_techEarlyRetiRate(ext_regi,te), - pm_regiEarlyRetiRate(t,regi,te)$(regi_group(ext_regi,regi) and (t.val lt 2065 or sameas(ext_regi,"GLO"))) = p_techEarlyRetiRate(ext_regi,te); + pm_regiEarlyRetiRate(t,regi,te)$(regi_group(ext_regi,regi) and (t.val lt c_earlyRetiValidYr or sameas(ext_regi,"GLO"))) = p_techEarlyRetiRate(ext_regi,te); ); $endif.tech_earlyreti diff --git a/main.gms b/main.gms index 536aa917e..38d8052dd 100755 --- a/main.gms +++ b/main.gms @@ -999,6 +999,11 @@ parameter ; c_teNoLearngConvEndYr = 2070; !! def = 2070 *' +parameter + c_earlyRetiValidYr "Year before which the early retirement rate designated by c_tech_earlyreti_rate holds" +; + c_earlyRetiValidYr = 2035; !! def = 2035 +*' parameter cm_TaxConvCheck "switch for enabling tax convergence check in nash mode" ;