Merge pull request #1812 from LaviniaBaumstark/GDPaPOPaSSP2

shift unit from US$2005 to US$2017

CHANGELOG.md

@@ -8,6 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### input data/calibration
 - new input data rev6.84 [[#1757](https://github.com/remindmodel/remind/pull/1757)]
+- new input data rev6.95 in US$2017[[#1812]] (https://github.com/remindmodel/remind/pull/1812) 
 - CES parameter and gdx files calibrated with new default diffLin2Lin for NPi 
     [[#1747](https://github.com/remindmodel/remind/pull/1747)] and
     [[#1757](https://github.com/remindmodel/remind/pull/1757)]
@@ -17,6 +18,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   [[1828]][(https://github.com/remindmodel/remind/pull/1828)]
 
 ### changed
+- shift base unit from US$2005 to US$2017 [[#1812]] (https://github.com/remindmodel/remind/pull/1812)
 - plastic waste by default does not lag plastics production by ten years
     anymore; can be re-activated using `cm_wastelag`
 - moved to edgeTransport 2.0 version [[#1749](https://github.com/remindmodel/remind/pull/1749)]

DESCRIPTION

@@ -17,8 +17,8 @@ Imports:
     data.table,
     devtools,
     dplyr,
-    edgeTransport (>= 2.3.0),
-    reporttransport (>= 0.0.11),
+    edgeTransport (>= 2.7.0),
+    reporttransport (>= 0.5.0),
     flexdashboard,
     GDPuc,
     gdx (>= 1.53.0),
@@ -45,13 +45,16 @@ Imports:
     magpiesets,
     mip (>= 0.150.0),
     modelstats,
-    mrremind,
+    mrremind (>= 0.191.2),
+    mrcommons (>= 1.43.6),
+    mrdrivers (>= 3.0.0),
+    mrtransport (>= 0.7.1),
     mrvalidation,
     ncdf4,
     nleqslv,
     optparse,
     piamenv (>= 0.4.0),
-    piamInterfaces (>= 0.27.2),
+    piamInterfaces (>= 0.31.0),
     piamPlotComparison (>= 0.0.10),
     piamutils,
     plotly,
@@ -61,7 +64,7 @@ Imports:
     raster,
     readr,
     readxl,
-    remind2 (>= 1.147.2),
+    remind2 (>= 1.156.1),
     renv,
     reshape2,
     reticulate,

config/default.cfg

@@ -28,10 +28,10 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
 cfg$extramappings_historic <- ""
 
 #### Current input data revision (<mainrevision>.<subrevision>) ####
-cfg$inputRevision <- "6.92"
+cfg$inputRevision <- "6.95"
 
 #### Current CES parameter and GDX revision (commit hash) ####
-cfg$CESandGDXversion <- "d4c62a8f11e8a6827310519df09c98eb425a4070"
+cfg$CESandGDXversion <- "ffbff5da0c24de39586df082716e5af449f5f231"
 
 #### Force the model to download new input data ####
 cfg$force_download <- FALSE

core/declarations.gms

@@ -245,7 +245,7 @@ p_co2CCSReference(ttot,all_regi,all_enty,all_enty,all_te,rlf)     "Captured CO2
 p_prodAllReference(ttot,all_regi,all_te)                          "Sum of the above in the reference run. As each te has only one type of output, the differing units should not be a problem"
 
 
-* Energy carrier Prices
+*** Energy carrier Prices
 pm_FEPrice(ttot,all_regi,all_enty,sector,emiMkt)      "parameter to capture all FE prices across sectors and markets (tr$2005/TWa)"
 pm_FEPrice_iter(iteration,ttot,all_regi,all_enty,sector,emiMkt) "parameter to capture all FE prices across sectors and markets (tr$2005/TWa) across iterations"
 pm_SEPrice(ttot,all_regi,all_enty)                    "parameter to capture all SE prices (tr$2005/TWa)"
@@ -505,7 +505,7 @@ qm_co2eqCum(all_regi)                                "cumulate regional emission
 q_budgetCO2eqGlob                                    "global emission budget balance"
 
 q_emiTeDetailMkt(ttot,all_regi,all_enty,all_enty,all_te,all_enty,all_emiMkt) "detailed energy specific emissions per region and market"
-q_emiTeMkt(ttot,all_regi,all_enty,all_emiMkt)			             "total energy-emissions per region and market"
+q_emiTeMkt(ttot,all_regi,all_enty,all_emiMkt)        "total energy-emissions per region and market"
 q_emiEnFuelEx(ttot,all_regi,all_enty)                "energy emissions from fuel extraction"
 q_emiAllMkt(ttot,all_regi,all_enty,all_emiMkt)       "total regional emissions for each emission market"
 
@@ -561,21 +561,13 @@ $IFTHEN.sehe_upper not "%cm_sehe_upper%" == "off"
 q_heat_limit(ttot,all_regi)  "equation to limit maximum level of secondary energy district heating and heat pumps use"
 $ENDIF.sehe_upper
 
-***----------------------------------------------------------------------------------------
-***----------------------------------------------trade module------------------------------
-
 ;
 ***----------------------------------------------------------------------------------------
 ***                                   SCALARS
 ***----------------------------------------------------------------------------------------
 scalars
 o_modelstat                                           "critical solver status for solution"
 
-***----------------------------------------------------------------------------------------
-***------------------------------------------------MACRO module----------------------------
-
-***----------------------------------------------------------------------------------------
-***-----------------------------------------------ESM module-------------------------------
 pm_conv_TWa_EJ                                        "conversion from TWa to EJ"               /31.536/,
 sm_c_2_co2                                            "conversion from c to co2"                /3.666666666667/,
 *** conversion factors of time units
@@ -605,9 +597,12 @@ s_MtCO2_2_GtC                                         "conversion factor from Mt
 
 s_MtCH4_2_TWa                                        "Energy content of methane. MtCH4 --> TWa: 1 MtCH4 = 1.23 * 10^6 toe * 42 GJ/toe * 10^-9 EJ/GJ * 1 TWa/31.536 EJ = 0.001638 TWa (BP statistical review)"  /0.001638/
 
-sm_h2kg_2_h2kWh                                      "convert kilogramme of hydrogen to kwh energy value." /32.5/
+s_D2015_2_D2017                                         "Convert US$2015 to US$2017"      /1.0292/
+sm_D2005_2_D2017                                         "Convert US$2005 to US$2017"      /1.231/
+sm_D2020_2_D2017                                         "Convert US$2020 to US$2017"      /0.9469/
+sm_EURO2023_2_D2017                                      "Convert EURO 2023 to US$2017"  /0.8915/
 
-s_D2015_2_D2005                                      "Convert $2015 to $2005 by dividing by 1.2: 1/1.2 = 0.8333"      /0.8333/
+sm_h2kg_2_h2kWh                                      "convert kilogramme of hydrogen to kwh energy value." /32.5/
 sm_DptCO2_2_TDpGtC                                    "Conversion multiplier to go from $/tCO2 to T$/GtC: 44/12/1000"     /0.00366667/
 
 s_co2pipe_leakage                                     "Leakage rate of CO2 pipelines. [0..1]"
@@ -630,16 +625,13 @@ sm_globalBudget_dev                                   "actual level of global cu
 sm_eps                                                "small number: 1e-9 "  /1e-9/
 
 sm_CES_calibration_iteration                          "current calibration iteration number, loaded from environment variable cm_CES_calibration_iteration"  /0/
-
-***----------------------------------------------------------------------------------------
-***----------------------------------------------trade module------------------------------
 ;
 
+sm_dmac = sm_D2005_2_D2017 * sm_dmac;
 sm_tgn_2_pgc = (44/28) * s_gwpN2O * (12/44) * 0.001;
 sm_tgch4_2_pgc = s_gwpCH4 * (12/44) * 0.001;
 
-***----------------------------------------------------------------------------------------
-*----------------------------------------------carbon intensities of coal, oil, and gas
+*** carbon intensities of coal, oil, and gas
 pm_cintraw("pecoal") = 26.1 / s_zj_2_twa;
 pm_cintraw("peoil")  = 20.0 / s_zj_2_twa;
 pm_cintraw("pegas")  = 15.0 / s_zj_2_twa;

core/input/generisdata_tech.prn

@@ -1,6 +1,5 @@
 *** SOF ./core/input/generisdata_tech.prn
 $ontext
-IMPORTANT: all costs are now given in $2015! As long as the model runs in $2005, the values need to be converted in datainput.gms
 tech_stat   technology status: how close a technology is to market readiness. Scale: 0-3, with 0 'I can go out and build a GW plant today' to 3 'Still some research necessary'
 inco0       Initial investment costs given in $[2015] / kW[output] capacity; for dac/prc cc: $[2015] / (tC[captured]/a); for other indutry prc: $[2015]/(t[output]/a)
 constrTme   Construction time in years, needed to calculate turn-key cost premium compared to overnight costs

core/input/generisdata_tech_SSP1.prn

@@ -1,6 +1,5 @@
 *** SOF ./core/input/generisdata_tech_SSP1.prn
 $ontext
-IMPORTANT: all costs are now given in $2015! As long as the model runs in $2005, the values need to be converted in datainput.gms
 tech_stat   technology status: how close a technology is to market readiness. Scale: 0-3, with 0 'I can go out and build a GW plant today' to 3 'Still some research necessary'
 inco0       Initial investment costs given in $[2015] / kW[output] capacity; for dac: $[2015] / (tC[captured]/a)
 constrTme   Construction time in years, needed to calculate turn-key cost premium compared to overnight costs

core/input/generisdata_tech_SSP5.prn

@@ -1,6 +1,5 @@
 *** SOF ./core/input/generisdata_tech_SSP5.prn
 $ontext
-IMPORTANT: all costs are now given in $2015! As long as the model runs in $2005, the values need to be converted in datainput.gms
 tech_stat   technology status: how close a technology is to market readiness. Scale: 0-3, with 0 'I can go out and build a GW plant today' to 3 'Still some research necessary'
 inco0       Initial investment costs given in $[2015] / kW[output] capacity; for dac: $[2015] / (tC[captured]/a)
 constrTme   Construction time in years, needed to calculate turn-key cost premium compared to overnight costs

core/input/generisdata_trade.prn

@@ -1,6 +1,5 @@
 *** SOF ./core/input/generisdata_trade.prn
 $ontext
-IMPORTANT: all costs are now given in $2015! As long as the model runs in $2005, the values need to be converted in datainput.gms
 tech_stat   Technology status: how close a technology is to market readiness. Scale: 0-3, with 0 'I can go out and build a GW plant today' to 3 'Still some research necessary'.
 inco0       Initial investment costs given in $(2015)/kW(output) capacity. Independent of distance.
 inco0_d     Initial investment costs given in $(2015)/kW(output) capacity. Per 1000km.

core/postsolve.gms

@@ -825,13 +825,13 @@ p_FEPrice_by_SE_Sector_EmiMkt(t,regi,entySe,entyFe,sector,emiMkt)$(abs (qm_budge
 loop((t,regi,entySe,entyFe,sector,emiMkt)$(sefe(entySe,entyFe) AND sector2emiMkt(sector,emiMkt) AND entyFe2Sector(entyFe,sector)),
 
 *** initialize prices
-  p_FEPrice_by_Sector_EmiMkt(t,regi,entyFe,sector,emiMkt)=0;
-  pm_FEPrice_by_SE_Sector(t,regi,entySe,entyFe,sector)=0;
-  p_FEPrice_by_SE_EmiMkt(t,regi,entySe,entyFe,emiMkt)=0;
-  p_FEPrice_by_SE(t,regi,entySe,entyFe)=0;
-  p_FEPrice_by_Sector(t,regi,entyFe,sector)=0;
-  p_FEPrice_by_EmiMkt(t,regi,entyFe,emiMkt)=0;
-  p_FEPrice_by_FE(t,regi,entyFe)=0;
+  p_FEPrice_by_Sector_EmiMkt(t,regi,entyFe,sector,emiMkt) = 0;
+  pm_FEPrice_by_SE_Sector(t,regi,entySe,entyFe,sector)    = 0;
+  p_FEPrice_by_SE_EmiMkt(t,regi,entySe,entyFe,emiMkt)     = 0;
+  p_FEPrice_by_SE(t,regi,entySe,entyFe)                   = 0;
+  p_FEPrice_by_Sector(t,regi,entyFe,sector)               = 0;
+  p_FEPrice_by_EmiMkt(t,regi,entyFe,emiMkt)               = 0;
+  p_FEPrice_by_FE(t,regi,entyFe)                          = 0;
 
 *** lower level marginal price is equal to non-zero, non-eps minimal price at higher level 
   loop(entySe2, 

core/presolve.gms

@@ -350,8 +350,8 @@ p_macLevFree(ttot,regi,enty)$( ttot.val gt 2005 )
 
 $IFTHEN.scaleEmiHist %c_scaleEmiHistorical% == "on"
 
-**p_macLevFree(ttot,regi,emiMacMagpie(enty))=0;
-* Set minimum abatment levels based on historical emissions
+*** p_macLevFree(ttot,regi,emiMacMagpie(enty))=0;
+*** Set minimum abatment levels based on historical emissions
 p_macLevFree("2010",regi,enty)$(p_histEmiSector("2005",regi,"ch4","agriculture","process") AND (sameas(enty,"ch4rice") OR sameas(enty,"ch4animals") OR sameas(enty,"ch4anmlwst"))) = max( 0, 1 - (p_histEmiSector("2010",regi,"ch4","agriculture","process")+p_histEmiSector("2010",regi,"ch4","lulucf","process"))/(p_histEmiSector("2005",regi,"ch4","agriculture","process")+p_histEmiSector("2005",regi,"ch4","lulucf","process")));
 p_macLevFree(ttot,regi,enty)$((ttot.val ge 2015) AND p_histEmiSector("2005",regi,"ch4","agriculture","process") AND (sameas(enty,"ch4rice") OR sameas(enty,"ch4animals") OR sameas(enty,"ch4anmlwst"))) = max( 0, 1 - (p_histEmiSector("2015",regi,"ch4","agriculture","process")+p_histEmiSector("2015",regi,"ch4","lulucf","process"))/(p_histEmiSector("2005",regi,"ch4","agriculture","process")+p_histEmiSector("2005",regi,"ch4","lulucf","process")) );
 p_macLevFree("2010",regi,enty)$(p_histEmiSector("2005",regi,"ch4","agriculture","process") AND (sameas(enty,"n2ofertin") OR sameas(enty,"n2ofertcr") OR sameas(enty,"n2oanwstc") OR sameas(enty,"n2oanwstm") OR sameas(enty,"n2oanwstp"))) = max( 0, 1 - (p_histEmiSector("2010",regi,"n2o","agriculture","process")+p_histEmiSector("2010",regi,"n2o","lulucf","process"))/(p_histEmiSector("2005",regi,"n2o","agriculture","process")+p_histEmiSector("2005",regi,"n2o","lulucf","process")) );
@@ -377,7 +377,7 @@ pm_macAbatLev(ttot,regi,enty)$( ttot.val gt 2015 )
         pm_macAbat(ttot,regi,enty,steps)
       ),
       p_macLevFree(ttot,regi,enty)
-	);
+    );
 
 pm_macAbatLev("2015",regi,"co2luc") = 0;
 pm_macAbatLev("2020",regi,"co2luc") = 0;

core/sets.gms

@@ -77,7 +77,8 @@ gdp_SSP2EU_NAV_all "NAVIGATE demand scenarios: All measures (ele + act + tec)"
 gdp_SSP2EU_CAMP_weak   "CAMPAIGNers scenario with low ambition lifestyle change"
 gdp_SSP2EU_CAMP_strong "CAMPAIGNers scenario with high ambition lifestyle change"
 gdp_SSP2_demDiffer_IKEA "Demand reduction in Global North (CAZ,EUR,JPN,NEU,USA) and demand increase in Emerging regions (IND,LAM,OAS,SSA). Reduction follows the factor f of demRedStrong scenario, while increase uses factor 2-f."
-gdp_SSP2EU_demRedStrong "edget internal demScen, might be removed soon"
+gdp_SSP2_demRedStrong "edget internal demScen, might be removed soon"
+gdp_SSP2_demRedWeak
 /
 
 all_GDPpcScen    "all possible GDP per capita scenarios (GDP and Population from the same SSP-scenario"

main.gms

@@ -1214,7 +1214,7 @@ $setglobal cm_rcp_scen  none         !! def = "none"  !! regexp = none|rcp20|rcp
 *' *  (2023_cond):   all NDCs conditional to international financial support published until December 31, 2023
 *' *  (2023_uncond): all NDCs independent of international financial support published until December 31, 2023
 *' *  Other supported years are 2022, 2021 and 2018, always containing NDCs published until December 31 of that year
-$setglobal cm_NDC_version  2023_cond    !! def = "2023_cond"  !! regexp = 20(18|2[1-4])_(un)?cond
+$setglobal cm_NDC_version  2024_cond    !! def = "2024_cond"  !! regexp = 20(18|2[1-4])_(un)?cond
 *' cm_netZeroScen     "choose scenario of net zero targets of netZero realization of module 46_carbonpriceRegi"
 *'
 *'  (NGFS_v4):        settings used for NGFS v4, 2023

modules/02_welfare/ineqLognormal/datainput.gms

@@ -11,23 +11,23 @@ $if %cm_less_TS% == "on"  pm_welf("2060") = 0.9;
 
 *RP* 2012-03-06: Inconvenience costs on seprod
 $IFTHEN.INCONV %cm_INCONV_PENALTY% == "on"
-p02_inconvpen_lap(ttot,regi,"coaltr")$(ttot.val ge 2005)      = 0.5;   !! In dollar per GJ seprod at 1.000$/cap GDP, or 10$/GJ at 10.000$_GDP/cap
-p02_inconvpen_lap(ttot,regi,"biotr")$(ttot.val ge 2005)       = 1.0;   !! In dollar per GJ seprod
-p02_inconvpen_lap(ttot,regi,"biotrmod")$(ttot.val ge 2005)    = 0.25;    !! In dollar per GJ seprod. Biotrmod is a mix of wood stoves and automated wood pellets for heating, which has lower air pollution and other discomfort effects
+p02_inconvpen_lap(ttot,regi,"coaltr")$(ttot.val ge 2005)      = sm_D2005_2_D2017 * 0.5;   !! In dollar per GJ seprod at 1.000$/cap GDP, or 10$/GJ at 10.000$_GDP/cap
+p02_inconvpen_lap(ttot,regi,"biotr")$(ttot.val ge 2005)       = sm_D2005_2_D2017 * 1.0;   !! In dollar per GJ seprod
+p02_inconvpen_lap(ttot,regi,"biotrmod")$(ttot.val ge 2005)    = sm_D2005_2_D2017 * 0.25;    !! In dollar per GJ seprod. Biotrmod is a mix of wood stoves and automated wood pellets for heating, which has lower air pollution and other discomfort effects
 *' Transformation of coal to liquids/gases/H2 brings local pollution, which is less accepted at higher incomes -> use the inconvenience cost channel
-p02_inconvpen_lap(ttot,regi,"coalftrec")$(ttot.val ge 2005)   = 0.9;    !! In dollar per GJ seprod
-p02_inconvpen_lap(ttot,regi,"coalftcrec")$(ttot.val ge 2005)  = 0.9;    !!  equivalent to 4$/GJ at 40.000$_GDP/cap, or 10$/GJ at 100.000$_GDP/cap
-p02_inconvpen_lap(ttot,regi,"coalgas")$(ttot.val ge 2005)   = 0.9;    !!
-p02_inconvpen_lap(ttot,regi,"coalh2")$(ttot.val ge 2005)   = 0.9;    !!
-p02_inconvpen_lap(ttot,regi,"coalh2c")$(ttot.val ge 2005)  = 0.9;    !!
+p02_inconvpen_lap(ttot,regi,"coalftrec")$(ttot.val ge 2005)   = sm_D2005_2_D2017 * 0.9;    !! In dollar per GJ seprod
+p02_inconvpen_lap(ttot,regi,"coalftcrec")$(ttot.val ge 2005)  = sm_D2005_2_D2017 * 0.9;    !!  equivalent to 4$/GJ at 40.000$_GDP/cap, or 10$/GJ at 100.000$_GDP/cap
+p02_inconvpen_lap(ttot,regi,"coalgas")$(ttot.val ge 2005)     = sm_D2005_2_D2017 * 0.9;
+p02_inconvpen_lap(ttot,regi,"coalh2")$(ttot.val ge 2005)      = sm_D2005_2_D2017 * 0.9;
+p02_inconvpen_lap(ttot,regi,"coalh2c")$(ttot.val ge 2005)     = sm_D2005_2_D2017 * 0.9;
 p02_inconvpen_lap(ttot,regi,te)$(ttot.val ge 2005) = p02_inconvpen_lap(ttot,regi,te) * 4.3 * 1E-4;            !! this is now equivalent to 1$/GJ at 1000$/per Capita in the welfare logarithm
 p02_inconvpen_lap(ttot,regi,te)$(ttot.val ge 2005) = p02_inconvpen_lap(ttot,regi,te) * (1/sm_giga_2_non) / sm_GJ_2_TWa; !! conversion util/(GJ/cap) -> util/(TWa/Gcap)
 *RP* these values are all calculated on seprod level.
 display p02_inconvpen_lap;
 $ENDIF.INCONV
 
 *BS* 2020-03-12: additional inputs for inequality
-* To Do: rename file, then also in "files" and moinput::fullREMIND.R
+*** To Do: rename file, then also in "files" and mrremind::fullREMIND.R
 parameter f02_ineqTheil(tall,all_regi,all_GDPscen)        "Gini data"
 /
 $ondelim
@@ -39,37 +39,33 @@ p02_ineqTheil(ttot,regi)$(ttot.val ge 2005) = f02_ineqTheil(ttot,regi,"%cm_GDPsc
 display p02_ineqTheil;
 
 
-* for a policy run, we need to load values coming from the baseline for consumption, tax revenues and energy expenditures:
+*** for a policy run, we need to load values coming from the baseline for consumption, tax revenues and energy expenditures:
 if ((cm_emiscen ne 1),
     Execute_Loadpoint 'input_ref' p02_taxrev_redistr0_ref=v02_taxrev_Add.l;
     Execute_Loadpoint 'input_ref' p02_cons_ref=vm_cons.l;
     Execute_Loadpoint 'input_ref' p02_energyExp_ref=v02_energyExp.l;
     Execute_Loadpoint 'input_ref' p02_damageFactor_ref=vm_damageFactor.l;
-
-* if energy system costs are used:
-*    Execute_Loadpoint 'input_ref' p02_energyExp_ref=vm_costEnergySys.l;
-
 );
 
-* income elasticity of tax revenues redistribution.
+*** income elasticity of tax revenues redistribution.
 p02_distrBeta(ttot,regi)$(ttot.val ge 2005) = cm_distrBeta;
 
 
-* for a baseline we need the following variables to be 0:
+*** for a baseline we need the following variables to be 0:
 p02_energyExp_ref(ttot,regi)$(cm_emiscen eq 1)=0;
 p02_taxrev_redistr0_ref(ttot,regi)$(cm_emiscen eq 1)=0;
 v02_taxrev_Add.l(ttot,regi)$(cm_emiscen eq 1)=0;
 v02_energyExp_Add.l(ttot,regi)$(cm_emiscen eq 1)=0;
 v02_energyexpShare.l(ttot,regi)$(cm_emiscen eq 1)=0;
 v02_revShare.l(ttot,regi)$(cm_emiscen eq 1)=0;
 
-* For runs that are not baseline, we need to initialize:
-* taxrev_Add, because they are used in the condition sign:
+*** For runs that are not baseline, we need to initialize:
+*** taxrev_Add, because they are used in the condition sign:
 v02_taxrev_Add.l(ttot,regi)$(cm_emiscen ne 1)=0;
-* and v02_energyExp to the level in the baseline so the model can have a start value
+*** and v02_energyExp to the level in the baseline so the model can have a start value
 v02_energyExp.l(ttot,regi)$(cm_emiscen eq 1)=p02_energyExp_ref(ttot,regi)$(cm_emiscen eq 1);
 
-*parameters for translating output damage into consumption loss
+*** parameters for translating output damage into consumption loss
 parameter f02_damConsFactor(all_regi,dam_factors)    "for translating output to consumption losses from KW damage function"
 /
 $ondelim