diff --git a/config/default.cfg b/config/default.cfg index 9ae49173b3..2fe439c2b0 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -1367,7 +1367,7 @@ cfg$gms$s56_cprice_red_factor <- 1 # def = 1 # * PkBudg1050: Peak Budget with 1050 GtCO2 until net-zero CO2 emissions; well-below 2.0°C in 2100 # * R32M46-SDP_MC-NPi, R32M46-SDP_MC-NDC, R32M46-SDP_MC-PkBudg650, # * R32M46-SSP1-NPi, R32M46-SSP1-NDC, R32M46-SSP1-PkBudg1050, R32M46-SSP1-PkBudg650, -# * R32M46-SSP2-NPi, R32M46-SSP2-NDC, R32M46-SSP2-PkBudg1050, R32M46-SSP2-PkBudg650, +# * R32M46-SSP2EU-NPi, R32M46-SSP2EU-NDC, R32M46-SSP2EU-PkBudg1050, R32M46-SSP2EU-PkBudg650, # * R32M46-SSP5-NPi, R32M46-SSP5-NDC, R32M46-SSP5-PkBudg1050, R32M46-SSP5-PkBudg650, # * R21M42: Coupled REMIND-MAgPIE runs with REMIND 2.1 and MAgPIE 4.2 # * NPi: Current policies; above 3.0°C in 2100 @@ -1619,14 +1619,14 @@ cfg$gms$c60_1stgen_biodem <- "const2020" # def = const2020 # * coupled REMIND-MAgPIE runs. Currently, this is R32M46. # * Available options: # * none: no 2nd generation bioenergy demand -# * R32M46: Coupled REMIND-MAgPIE runs with REMIND 3.2 and MAgPIE 4.6 -# * NPi: Current policies; above 3.0°C in 2100 -# * NDC: ? +# * R32M46: Coupled REMIND-MAgPIE runs with REMIND 3.2.1.dev412 and MAgPIE 4.6.11 +# * NPi: Current policies; limit peak warming to 3.0°C +# * NDC: Nationally determined contributions; limit peak warming to 2.5°C # * PkBudg650: Peak Budget with 650 GtCO2 until net-zero CO2 emissions; well-below 1.5°C in 2100 # * PkBudg1050: Peak Budget with 1050 GtCO2 until net-zero CO2 emissions; well-below 2.0°C in 2100 # * R32M46-SDP_MC-NPi, R32M46-SDP_MC-NDC, R32M46-SDP_MC-PkBudg650, # * R32M46-SSP1-NPi, R32M46-SSP1-NDC, R32M46-SSP1-PkBudg1050, R32M46-SSP1-PkBudg650, -# * R32M46-SSP2-NPi, R32M46-SSP2-NDC, R32M46-SSP2-PkBudg1050, R32M46-SSP2-PkBudg650, +# * R32M46-SSP2EU-NPi, R32M46-SSP2EU-NDC, R32M46-SSP2EU-PkBudg1050, R32M46-SSP2EU-PkBudg650, # * R32M46-SSP5-NPi, R32M46-SSP5-NDC, R32M46-SSP5-PkBudg1050, R32M46-SSP5-PkBudg650, # * R21M42: Coupled REMIND-MAgPIE runs with REMIND 2.1 and MAgPIE 4.2 # * NPi: Current policies; above 3.0°C in 2100 diff --git a/scripts/start/test_runs.R b/scripts/start/test_runs.R index 7815102f9a..780e3563dc 100644 --- a/scripts/start/test_runs.R +++ b/scripts/start/test_runs.R @@ -47,23 +47,23 @@ for(ssp in c("SSP1","SSP2","SSP5")) { cfg$title <- .title(cfg, paste(ssp,"Ref",sep="-")) cfg <- setScenario(cfg,c(ssp,"NPI","rcp7p0")) cfg$gms$c56_mute_ghgprices_until <- "y2150" - cfg$gms$c56_pollutant_prices <- paste0("R21M42-",ssp,"-NPi") - cfg$gms$c60_2ndgen_biodem <- paste0("R21M42-",ssp,"-NPi") + cfg$gms$c56_pollutant_prices <- paste0("R32M46-",ssp,"-NPi") + cfg$gms$c60_2ndgen_biodem <- paste0("R32M46-",ssp,"-NPi") start_run(cfg, codeCheck = FALSE) cfg$title <- .title(cfg, paste(ssp,"NDC",sep="-")) cfg <- setScenario(cfg,c(ssp,"NDC","rcp4p5")) cfg$gms$c56_mute_ghgprices_until <- "y2150" -# Input for NDC from R21M42 is not available, therefore NPi is used. - cfg$gms$c56_pollutant_prices <- paste0("R21M42-",ssp,"-NPi") - cfg$gms$c60_2ndgen_biodem <- paste0("R21M42-",ssp,"-NPi") +# Input for NDC from R32M46 is not available, therefore NPi is used. + cfg$gms$c56_pollutant_prices <- paste0("R32M46-",ssp,"-NDC") + cfg$gms$c60_2ndgen_biodem <- paste0("R32M46-",ssp,"-NDC") start_run(cfg, codeCheck = FALSE) - cfg$title <- .title(cfg, paste(ssp,"PkBudg900",sep="-")) + cfg$title <- .title(cfg, paste(ssp,"PkBudg650",sep="-")) cfg <- setScenario(cfg,c(ssp,"NDC","rcp1p9")) cfg$gms$c56_mute_ghgprices_until <- "y2030" - cfg$gms$c56_pollutant_prices <- paste0("R21M42-",ssp,"-PkBudg900") - cfg$gms$c60_2ndgen_biodem <- paste0("R21M42-",ssp,"-PkBudg900") + cfg$gms$c56_pollutant_prices <- paste0("R32M46-",ssp,"-PkBudg650") + cfg$gms$c60_2ndgen_biodem <- paste0("R32M46-",ssp,"-PkBudg650") start_run(cfg, codeCheck = FALSE) }