diff --git a/config/default.cfg b/config/default.cfg index 1e348197c7..4d53ae77fe 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -28,7 +28,7 @@ cfg$regionmapping <- "config/regionmappingH12.csv" cfg$extramappings_historic <- "" #### Current input data revision (.) #### -cfg$inputRevision <- "7.76" +cfg$inputRevision <- "7.77" #### Current CES parameter and GDX revision (commit hash) #### cfg$CESandGDXversion <- "7785b70685819178a967c9e33f0fb76d4325d542" diff --git a/modules/40_techpol/NPi2025/bounds.gms b/modules/40_techpol/NPi2025/bounds.gms index 66caa99b14..a0ae8b4042 100644 --- a/modules/40_techpol/NPi2025/bounds.gms +++ b/modules/40_techpol/NPi2025/bounds.gms @@ -15,8 +15,6 @@ *------------------------------------------------------------------------------------ -*** Léa to do: technologies still missing are h2 to electricity and "coal to electricity" - *** Keep historical data until 2020 *** AM the lowbound of solar and pv for 2030 to be taken from the NDCs (in GW), therefore multiplying by 0.001 for TW* *** NPi bounds are only applied after 2020, as NPi scenarios should always have cm_startyear higher than 2020. @@ -28,11 +26,8 @@ vm_cap.lo(t,regi,"hydro","1")$(t.val gt 2025) = p40_TechBound(t,regi,"hydro")*0. vm_cap.lo(t,regi,"windon","1")$(t.val gt 2025) = p40_TechBound(t,regi,"windon")*0.001; vm_cap.lo(t,regi,"windoff","1")$(t.val gt 2025) = p40_TechBound(t,regi,"windoff")*0.001; vm_cap.lo(t,regi,"wind","1")$(t.val gt 2025) = p40_TechBound(t,regi,"wind")*0.001; -*vm_cap.lo(t,regi,"elh2","1")$(t.val gt 2025) = p40_TechBound(t,regi,"elh2")*0.001; -*vm_cap.lo(t,regi,"geohdr","1")$(t.val gt 2025) = p40_TechBound(t,regi,"geohdr")*0.001; quick fix needs adjustments in the mrremind Inputdata generation including new IRENA vm_cap.lo(t,regi,"geohdr","1")$( (t.val gt 2025) AND sameas(regi, "OAS")) = p40_TechBound(t,regi,"geohdr")*0.001; -*vm_cap.up(t,regi,"coalchp","1")$(t.val gt 2025) = p40_TechBound(t,regi,"coalchp")*0.001; !!max bound for Canada use the netzero calculator, check coal phase out module -*vm_cap.lo(t,regi,"bioigcc","1")$(t.val gt 2025) = p40_TechBound(t,regi,"bioigcc")*0.001; !!regular bioenergy bound + display vm_cap.lo; diff --git a/modules/40_techpol/NPi2025/declarations.gms b/modules/40_techpol/NPi2025/declarations.gms index fad9a0ac90..999cb98f48 100644 --- a/modules/40_techpol/NPi2025/declarations.gms +++ b/modules/40_techpol/NPi2025/declarations.gms @@ -15,13 +15,14 @@ Parameter p40_TechBound(ttot,all_regi,all_te) "NPI capacity targets for solar (pv, csp), wind (total, onshore, offshore), nuclear, hydro, biomass, nuclear (GW)" p40_ElecBioBound(ttot,all_regi) "level for lower bound on biomass tech. absolute capacities, in GW" - p40_CoalBound(ttot,iso_regi) "level for upper bound on absolute capacities, in GW for all technologies except electromobility" +* p40_CoalCapBound(ttot,iso_regi) "level for upper bound on absolute capacities, in GW for all technologies except electromobility" ; Equation q40_ElecBioBound "equation low-carbon push technology policy for bio power" q40_windBound "lower bound on combined wind onshore and offshore" +* q40_coalCapBound "upper bound on coal power technologies" ; *------------------------------------------------------------------------------------ diff --git a/modules/40_techpol/NPi2025/equations.gms b/modules/40_techpol/NPi2025/equations.gms index c979f20b7b..1c65f3adf7 100644 --- a/modules/40_techpol/NPi2025/equations.gms +++ b/modules/40_techpol/NPi2025/equations.gms @@ -18,7 +18,7 @@ q40_ElecBioBound(t,regi)$(t.val gt 2025).. sum(te2rlf(te,rlf)$(sameas(te,"biochp") OR sameas(te,"bioigcc") OR sameas(te,"bioigccc")), vm_cap(t,regi,te,rlf)) =g= p40_ElecBioBound(t,regi) * 0.001 -; +; *** windoffshore-todo: as long as there is a "wind" target, it is for the sum windon+windoff q40_windBound(t,regi)$(t.val gt 2025 AND p40_TechBound(t,regi,"wind") gt 0).. @@ -26,6 +26,15 @@ q40_windBound(t,regi)$(t.val gt 2025 AND p40_TechBound(t,regi,"wind") gt 0).. =g= p40_TechBound(t,regi,"wind") * 0.001 ; +*** coal bound: all technologies transforming PE coal into SE electricity. Cannot apply to current input data, as lower bound on historical data affect strongly dynamics in OAS and CHA. +*q40_coalCapBound(t,regi)$(t.val gt 2025 +* AND p40_TechBound(t,regi,"coalchp") gt 0).. +* sum(pe2se("pecoal","seel",te), +* sum(te2rlf(te,rlf), +* vm_cap(t,regi,te,rlf))) +* =l= p40_TechBound(t,regi,"coalchp") * 0.001 +*; + *------------------------------------------------------------------------------------ *------------------------------------------------------------------------------------ *** Renewable Share Targets