From 844132d2ec12e37f289df413f1c3b0c7bde72dac Mon Sep 17 00:00:00 2001 From: Bjoern Soergel <16190669+bs538@users.noreply.github.com> Date: Tue, 10 Dec 2019 14:39:55 +0100 Subject: [PATCH] *bugfix* fixed p_GDPpcScen definition and added SDP as scenario. Corrects p_developmentState and the phase-in of MAgPIE CO2 price --- core/datainput.gms | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/core/datainput.gms b/core/datainput.gms index a0bdb5b..15266c8 100644 --- a/core/datainput.gms +++ b/core/datainput.gms @@ -113,11 +113,12 @@ $offdelim ; *** Set c_GDPpcScen according to c_GDPScen -$if %cm_GDPScen% == "gdpSSP1" c_GDPpcScen = "SSP1" -$if %cm_GDPScen% == "gdpSSP2" c_GDPpcScen = "SSP2" -$if %cm_GDPScen% == "gdpSSP3" c_GDPpcScen = "SSP3" -$if %cm_GDPScen% == "gdpSSP4" c_GDPpcScen = "SSP4" -$if %cm_GDPScen% == "gdpSSP5" c_GDPpcScen = "SSP5" +$if %cm_GDPscen% == "gdp_SDP" c_GDPpcScen = "SDP"; +$if %cm_GDPscen% == "gdp_SSP1" c_GDPpcScen = "SSP1"; +$if %cm_GDPscen% == "gdp_SSP2" c_GDPpcScen = "SSP2"; +$if %cm_GDPscen% == "gdp_SSP3" c_GDPpcScen = "SSP3"; +$if %cm_GDPscen% == "gdp_SSP4" c_GDPpcScen = "SSP4"; +$if %cm_GDPscen% == "gdp_SSP5" c_GDPpcScen = "SSP5"; p_developmentState(tall,all_regi) = f_developmentState(tall,all_regi,"%c_GDPpcScen%"); @@ -780,7 +781,7 @@ loop(ttot$(ttot.val ge 2005), *RP: for comparison of different technologies: *** pm_conv_cap_2_MioLDV <- 650 # The world has slightly below 800million cars in 2005 (IEA TECO2), so with a global vm_cap of 1.2, this gives ~650 *** ==> 1TW power plant ~ 650 million LDV - + p_adj_coeff(ttot,regi,te) = 0.2; p_adj_coeff(ttot,regi,"coaltr") = 0.1; p_adj_coeff(ttot,regi,"tnrs") = 1.0; @@ -804,7 +805,7 @@ loop(ttot$(ttot.val ge 2005), p_adj_coeff(ttot,regi,te) = 25 * p_adj_coeff(ttot,regi,te); !! Rescaling all adjustment cost coefficients -p_adj_coeff_Orig(ttot,regi,te) = p_adj_coeff(ttot,regi,te); +p_adj_coeff_Orig(ttot,regi,te) = p_adj_coeff(ttot,regi,te); p_adj_seed_te_Orig(ttot,regi,te) = p_adj_seed_te(ttot,regi,te); p_adj_coeff_glob(te) = 0.0; -- GitLab