diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bbad81ed1..fdf140693e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,10 +15,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **default.cfg** Default for cfg$gms$c56_cprice_aff changed from `forestry_vegc` to `secdforest_vegc` - **scenario_config.csv** settings for cfg$gms$s35_secdf_distribution in `ForestryEndo` and `ForestryExo` changed from `2` to `0` - **scenario_config.csv** removed erroneous setting `cc` from column `input` +- **default.cfg** update default `cfg$gms$c56_pollutant_prices` and `cfg$gms$c60_2ndgen_biodem` to `R32M46-SSP2EU-NPi` +- **default.cfg** update input data to rev 4.96 ### added - **32_forestry** new interfaces `vm_land_forestry`, `pcm_land_forestry` `vm_landexpansion_forestry` and `vm_landreduction_forestry` - **scripts** added peatland to output/extra/disaggregation.R +- **56_ghg_policy_** added new trajectories for R32M46 +- **60_bioenergy** added new trajectories for R32M46 ### removed - **default.cfg** Removed description of cfg$gms$c31_past_suit_scen since no longer needed due to changes in 31_past described below. Its function is now done by cfg$gms$c31_grassl_yld_scenario. @@ -26,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### fixed - **scripts** Fixed disaggregation.R and disaggregation_LUH2.R to be used with 67k +- **scripts** bugfix highres.R for bioenergy demand and GHG prices in coupled runs ## [4.7.0] - 2023-12-11 diff --git a/config/default.cfg b/config/default.cfg index 9fcc13fae4..2fe439c2b0 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -22,10 +22,10 @@ cfg$model <- "main.gms" #def = "main.gms" #### input settings #### # which input data sets should be used? -cfg$input <- c(regional = "rev4.95_h12_magpie.tgz", - cellular = "rev4.95_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", - validation = "rev4.95_h12_validation.tgz", - additional = "additional_data_rev4.46.tgz", +cfg$input <- c(regional = "rev4.96_h12_magpie.tgz", + cellular = "rev4.96_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", + validation = "rev4.96_h12_validation.tgz", + additional = "additional_data_rev4.47.tgz", calibration = "calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz") # NOTE: It is recommended to recalibrate the model when changing cellular input data @@ -1357,18 +1357,27 @@ cfg$gms$s56_cprice_red_factor <- 1 # def = 1 # * GHG emission price scenario # * Note: For best consistency it is recommended to use trajectories from the most recent -# * coupled REMIND-MAgPIE runs. Currently, this is R21M42. -# * Note on available scenarios from coupled REMIND-MAgPIE runs -# * NPi: Current policies; above 3.0°C in 2100 +# * 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.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-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 # * PkBudg900: Budget with 900 GtCO2; well-below 1.5°C in 2100 (PkBudg1000 for SDP) # * PkBudg1300: Budget with 1300 GtCO2; well-below 2.0°C in 2100 -# * -# * Available scenarios: -# * Coupled REMIND-MAgPIE runs # * R21M42-SDP-NPi, R21M42-SDP-PkBudg1000, R21M42-SDP-PkBudg1100, R21M42-SDP-PkBudg900, # * R21M42-SSP1-NPi, R21M42-SSP1-PkBudg1100, R21M42-SSP1-PkBudg1300, R21M42-SSP1-PkBudg900, # * R21M42-SSP2-NPi, R21M42-SSP2-PkBudg1100, R21M42-SSP2-PkBudg1300, R21M42-SSP2-PkBudg900, # * R21M42-SSP5-NPi, R21M42-SSP5-PkBudg1100, R21M42-SSP5-PkBudg1300, R21M42-SSP5-PkBudg900, +# * R2M41: Coupled REMIND-MAgPIE runs with REMIND 2.0 and MAgPIE 4.1 # * R2M41-SSP2-NPi, R2M41-SSP2-NDC, R2M41-SSP2-Budg1300, R2M41-SSP2-Budg600, R2M41-SSP2-Budg950 # * Standalone REMIND runs from Strefler et al 2021; well-below 2.0°C in 2100 # * https://www.nature.com/articles/s41467-021-22211-2 @@ -1405,8 +1414,8 @@ cfg$gms$s56_cprice_red_factor <- 1 # def = 1 # * c56_pollutant_prices_noselect applies to all other countries. # * Available scenarios for c56_pollutant_prices_noselect are identical to c56_pollutant_prices # * (see above) except for emulator and coupling (which can only be chosen for c56_pollutant_prices) -cfg$gms$c56_pollutant_prices <- "R21M42-SSP2-NPi" # def = R21M42-SSP2-NPi -cfg$gms$c56_pollutant_prices_noselect <- "R21M42-SSP2-NPi" # def = R21M42-SSP2-NPi +cfg$gms$c56_pollutant_prices <- "R32M46-SSP2EU-NPi" # def = R32M46-SSP2EU-NPi +cfg$gms$c56_pollutant_prices_noselect <- "R32M46-SSP2EU-NPi" # def = R32M46-SSP2EU-NPi # * The following two settings can be used to provide exogenous ghg prices # * via a file that is not part of the input data. This is currently used @@ -1607,18 +1616,27 @@ cfg$gms$c60_1stgen_biodem <- "const2020" # def = const2020 # * 2nd generation bioenergy demand scenario # * Note: For best consistency it is recommended to use trajectories from the most recent -# * coupled REMIND-MAgPIE runs. Currently, this is R21M42. -# * Note on available scenarios from coupled REMIND-MAgPIE runs -# * NPi: Current policies; above 3.0°C in 2100 +# * 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.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-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 # * PkBudg900: Budget with 900 GtCO2; well-below 1.5°C in 2100 (PkBudg1000 for SDP) # * PkBudg1300: Budget with 1300 GtCO2; well-below 2.0°C in 2100 -# * -# * Available scenarios: -# * Coupled REMIND-MAgPIE runs # * R21M42-SDP-NPi, R21M42-SDP-PkBudg1000, R21M42-SDP-PkBudg1100, R21M42-SDP-PkBudg900, # * R21M42-SSP1-NPi, R21M42-SSP1-PkBudg1100, R21M42-SSP1-PkBudg1300, R21M42-SSP1-PkBudg900, # * R21M42-SSP2-NPi, R21M42-SSP2-PkBudg1100, R21M42-SSP2-PkBudg1300, R21M42-SSP2-PkBudg900, # * R21M42-SSP5-NPi, R21M42-SSP5-PkBudg1100, R21M42-SSP5-PkBudg1300, R21M42-SSP5-PkBudg900, +# * R2M41: Coupled REMIND-MAgPIE runs with REMIND 2.0 and MAgPIE 4.1 # * R2M41-SSP2-NPi, R2M41-SSP2-NDC, R2M41-SSP2-Budg1300, R2M41-SSP2-Budg600, R2M41-SSP2-Budg950 # * Standalone REMIND runs from Strefler et al 2021; well-below 2.0°C in 2100 # * https://www.nature.com/articles/s41467-021-22211-2 @@ -1653,8 +1671,8 @@ cfg$gms$c60_1stgen_biodem <- "const2020" # def = const2020 # * coupling # * Note: c60_2ndgen_biodem applies to countries selected in scen_countries60 # * c60_2ndgen_biodem_noselect applies to all other countries. -cfg$gms$c60_2ndgen_biodem <- "R21M42-SSP2-NPi" # def = R21M42-SSP2-NPi -cfg$gms$c60_2ndgen_biodem_noselect <- "R21M42-SSP2-NPi" # def = R21M42-SSP2-NPi +cfg$gms$c60_2ndgen_biodem <- "R32M46-SSP2EU-NPi" # def = R32M46-SSP2EU-NPi +cfg$gms$c60_2ndgen_biodem_noselect <- "R32M46-SSP2EU-NPi" # def = R32M46-SSP2EU-NPi # * The following setting can be used to provide exogenous bioenergy demand # * via a .mif file that is not part of the input data. This is currently used diff --git a/config/scenario_config.csv b/config/scenario_config.csv index af88f78ea4..14373e5f00 100644 --- a/config/scenario_config.csv +++ b/config/scenario_config.csv @@ -78,7 +78,7 @@ gms$s73_timber_demand_switch;;;;;;;;;;;;;;;;;;;;;;1;1;1;1;1;;;;;1;1;0;;;;;;;;;;; gms$s35_forest_damage;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4;4;4;4;4;;;;;;; gms$c32_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;; gms$c35_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;; -input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.95_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.95_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.95_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.95_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.95_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.95_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz; +input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.96_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.96_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.96_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.96_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.96_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.96_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz; gms$c52_land_carbon_sink_rcp;;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;RCP19;RCP26;RCP45;RCP60;RCPBU;RCPBU; gms$c57_macc_version;;;;;;;;;;;;;;;;;;;;;;;;;;;PBL_2022;PBL_2022;PBL_2022;PBL_2022;;;;;;;;;;;;;;; gms$c57_macc_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;Default;Optimistic;Default;Optimistic;;;;;;;;;;;;;;; diff --git a/config/scenario_fsec.csv b/config/scenario_fsec.csv index 5ea2924d7b..384a29f5aa 100644 --- a/config/scenario_fsec.csv +++ b/config/scenario_fsec.csv @@ -51,7 +51,7 @@ gms$c50_scen_neff_noselect;;;baseeff_add3_add10_add20_max75;;;;;;;;;;;;;;;;;;;;; gms$c52_land_carbon_sink_rcp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;RCP19;RCP26;RCP34;RCP45;RCP60;RCPBU;RCPBU; gms$c55_scen_conf;;;;;;;;;;;;;;;;;GoodPractice;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$c56_emis_policy;none;;;;;;;;;;;;;;;;;;sdp_cropeff;;;;;;sdp_redd;sdp_redd;;;;;sdp_peatland;sdp_soil;;;sdp_redd_soil_peat;sdp_all;;;;;;;;;;;;; -gms$c56_pollutant_prices;R21M42-SSP2-PkBudg1300;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +gms$c56_pollutant_prices;R32M46-SSP2EU-PkBudg1050;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$s56_c_price_induced_aff;0;;;;;;;;;;;;;;;;;;;;;;;;1;;;;;;;;;;;;;;;;;;;;;;;; gms$s57_maxmac_n_soil;-1;;;;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$s57_maxmac_ch4_rice;-1;;;;;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -59,15 +59,15 @@ gms$s57_maxmac_ch4_entferm;-1;;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$s57_maxmac_ch4_awms;-1;;;;;;;;;;;;;;;;201;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$s58_rewetting_switch;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;Inf;;;;;;;;;;;;;;;;;; gms$som;cellpool_aug16;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -gms$c60_2ndgen_biodem;;;;R21M42-SSP2-PkBudg900;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;R21M42-SSP1-PkBudg900 +gms$c60_2ndgen_biodem;;;;R32M46-SSP2EU-PkBudg650;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;R32M46-SSP1-PkBudg650 gms$c60_res_2ndgenBE_dem;;;;sdp;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$s62_max_dem_bioplastic;0;;;;400;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$c70_fac_req_regr;reg;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$c70_feed_scen;;;;;;;;;;;;;;;;;;ssp1;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; gms$c73_build_demand;;;;;;;;;;;;;;;;;;;;;;;;50pc;;;;;;;;;;;;;;;;;;;;;;;;; -input['cellular'];rev4.94_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.94_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.94_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.94_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.94_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.94_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.94_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz; -input['regional'];rev4.94_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -input['validation'];rev4.94_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -input['additional'];additional_data_rev4.46.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['cellular'];rev4.96_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.96_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.96_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.96_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz; +input['regional'];rev4.96_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['validation'];rev4.96_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['additional'];additional_data_rev4.47.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; input['calibration'];calibration_FSEC_24Mar23.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;;;;;;;;;;bjoernAR6_C_SSP1-PkBudg900.mif diff --git a/main.gms b/main.gms index dd73db9181..68a82959c5 100644 --- a/main.gms +++ b/main.gms @@ -148,21 +148,21 @@ $title magpie *##################### R SECTION START (VERSION INFO) ########################## * -* Used data set: rev4.94_h12_magpie.tgz -* md5sum: 25623b5ad3e8b72bd3008da9b69adfe0 -* Repository: /p/projects/rd3mod/inputdata/output +* Used data set: rev4.96_h12_magpie.tgz +* md5sum: NA +* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output * -* Used data set: rev4.94_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz -* md5sum: d7800a0ffe271483116a8f00a939a89a -* Repository: /p/projects/rd3mod/inputdata/output +* Used data set: rev4.96_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz +* md5sum: NA +* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output * -* Used data set: rev4.94_h12_validation.tgz -* md5sum: 4b4128910822cf45603cab46f45ccf78 -* Repository: /p/projects/rd3mod/inputdata/output +* Used data set: rev4.96_h12_validation.tgz +* md5sum: NA +* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output * -* Used data set: additional_data_rev4.46.tgz +* Used data set: additional_data_rev4.47.tgz * md5sum: NA -* Repository: https://rse.pik-potsdam.de/data/magpie/public +* Repository: scp://cluster.pik-potsdam.de/p/projects/landuse/data/input/archive * * Used data set: calibration_H12_per_ton_fao_may22_glo_08Aug23.tgz * md5sum: NA @@ -179,11 +179,11 @@ $title magpie * * Regionscode: 62eff8f7 * -* Regions data revision: 4.94 +* Regions data revision: 4.96 * * lpj2magpie settings: * * LPJmL data: MRI-ESM2-0:ssp370 -* * Revision: 4.94 +* * Revision: 4.96 * * aggregation settings: * * Input resolution: 0.5 @@ -195,7 +195,7 @@ $title magpie * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler, error = errorHandler) * * -* Last modification (input data): Fri Nov 17 19:42:06 2023 +* Last modification (input data): Fri Dec 22 16:58:47 2023 * *###################### R SECTION END (VERSION INFO) ########################### diff --git a/modules/56_ghg_policy/price_aug22/input.gms b/modules/56_ghg_policy/price_aug22/input.gms index fdb5290128..92697d0b8a 100644 --- a/modules/56_ghg_policy/price_aug22/input.gms +++ b/modules/56_ghg_policy/price_aug22/input.gms @@ -48,8 +48,8 @@ scalars s56_offset helper for C price interpolation (1) / 0 / ; -$setglobal c56_pollutant_prices R21M42-SSP2-NPi -$setglobal c56_pollutant_prices_noselect R21M42-SSP2-NPi +$setglobal c56_pollutant_prices R32M46-SSP2EU-NPi +$setglobal c56_pollutant_prices_noselect R32M46-SSP2EU-NPi $setglobal c56_emis_policy redd+natveg_nosoil $setglobal c56_cprice_aff forestry_vegc $setglobal c56_mute_ghgprices_until y2030 diff --git a/modules/56_ghg_policy/price_aug22/preloop.gms b/modules/56_ghg_policy/price_aug22/preloop.gms index ec4d512a9a..9ec7f69d82 100644 --- a/modules/56_ghg_policy/price_aug22/preloop.gms +++ b/modules/56_ghg_policy/price_aug22/preloop.gms @@ -26,6 +26,8 @@ $ifthen "%c56_pollutant_prices%" == "coupling" im_pollutant_prices(t_all,i,pollutants,emis_source) = f56_pollutant_prices_coupling(t_all,i,pollutants); $elseif "%c56_pollutant_prices%" == "emulator" im_pollutant_prices(t_all,i,pollutants,emis_source) = f56_pollutant_prices_emulator(t_all,i,pollutants); +$elseif "%c56_pollutant_prices%" == "none" + im_pollutant_prices(t_all,i,pollutants,emis_source) = 0; $else im_pollutant_prices(t_all,i,pollutants,emis_source) = f56_pollutant_prices(t_all,i,pollutants,"%c56_pollutant_prices%") * p56_region_price_shr(t_all,i) + f56_pollutant_prices(t_all,i,pollutants,"%c56_pollutant_prices_noselect%") * (1-p56_region_price_shr(t_all,i)); diff --git a/modules/56_ghg_policy/price_aug22/sets.gms b/modules/56_ghg_policy/price_aug22/sets.gms index f64637e8cb..051ad91295 100644 --- a/modules/56_ghg_policy/price_aug22/sets.gms +++ b/modules/56_ghg_policy/price_aug22/sets.gms @@ -41,6 +41,21 @@ sets R2M41-SSP2-Budg950, R2M41-SSP2-NDC, R2M41-SSP2-NPi, + R32M46-SDP_MC-NDC, + R32M46-SDP_MC-NPi, + R32M46-SDP_MC-PkBudg650, + R32M46-SSP1-NDC, + R32M46-SSP1-NPi, + R32M46-SSP1-PkBudg1050, + R32M46-SSP1-PkBudg650, + R32M46-SSP2EU-NDC, + R32M46-SSP2EU-NPi, + R32M46-SSP2EU-PkBudg1050, + R32M46-SSP2EU-PkBudg650, + R32M46-SSP5-NDC, + R32M46-SSP5-NPi, + R32M46-SSP5-PkBudg1050, + R32M46-SSP5-PkBudg650, SSPDB-SSP1-19-IMAGE, SSPDB-SSP1-19-REMIND-MAGPIE, SSPDB-SSP1-26-IMAGE, @@ -115,7 +130,10 @@ sets ecoSysProtOff, ecoSysProtAll_agMgmtExclN2O, ecoSysProtAll_agMgmtExclCH4, - ecoSysProtAll_agMgmtOff / + ecoSysProtAll_agMgmtOff, + co2_reddnatveg_nosoil, + co2_peatland, + co2_reddnatveg_nosoil_peatland / ; *######################### R SECTION END (SETS) ################################ diff --git a/modules/60_bioenergy/1stgen_priced_dec18/input.gms b/modules/60_bioenergy/1stgen_priced_dec18/input.gms index a27aa6b4ca..c71e5d7046 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/input.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/input.gms @@ -39,8 +39,8 @@ scalars s60_2ndgen_bioenergy_dem_min Minimum dedicated 2nd generation bioenergy demand assumed in each region (mio. GJ per yr) / 1 / ; -$setglobal c60_2ndgen_biodem R21M42-SSP2-NPi -$setglobal c60_2ndgen_biodem_noselect R21M42-SSP2-NPi +$setglobal c60_2ndgen_biodem R32M46-SSP2EU-NPi +$setglobal c60_2ndgen_biodem_noselect R32M46-SSP2EU-NPi $if "%c60_2ndgen_biodem%" == "coupling" table f60_bioenergy_dem_coupling(t_all,i) Bioenergy demand (regional) (mio. GJ per yr) diff --git a/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms b/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms index edd93ec225..6294749431 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/preloop.gms @@ -20,11 +20,13 @@ $ifthen "%c60_2ndgen_biodem%" == "coupling" i60_bioenergy_dem(t,i) = f60_bioenergy_dem_coupling(t,i); $elseif "%c60_2ndgen_biodem%" == "emulator" i60_bioenergy_dem(t,i) = f60_bioenergy_dem_emulator(t)/card(i); +$elseif "%c60_2ndgen_biodem%" == "none" + i60_bioenergy_dem(t,i) = 0; $else i60_bioenergy_dem(t,i) = f60_bioenergy_dem(t,i,"%c60_2ndgen_biodem%") * p60_region_BE_shr(t,i) + f60_bioenergy_dem(t,i,"%c60_2ndgen_biodem_noselect%") * (1-p60_region_BE_shr(t,i)); ** Harmonize till 2020 if not coupled or emulator loop(t$(m_year(t) <= sm_fix_SSP2), - i60_bioenergy_dem(t,i) = f60_bioenergy_dem(t,i,"R21M42-SSP2-NPi"); + i60_bioenergy_dem(t,i) = f60_bioenergy_dem(t,i,"R32M46-SSP2EU-NPi"); ); $endif diff --git a/modules/60_bioenergy/1stgen_priced_dec18/sets.gms b/modules/60_bioenergy/1stgen_priced_dec18/sets.gms index e314b1648a..f392a212a4 100644 --- a/modules/60_bioenergy/1stgen_priced_dec18/sets.gms +++ b/modules/60_bioenergy/1stgen_priced_dec18/sets.gms @@ -41,6 +41,21 @@ sets R2M41-SSP2-Budg950, R2M41-SSP2-NDC, R2M41-SSP2-NPi, + R32M46-SDP_MC-NDC, + R32M46-SDP_MC-NPi, + R32M46-SDP_MC-PkBudg650, + R32M46-SSP1-NDC, + R32M46-SSP1-NPi, + R32M46-SSP1-PkBudg1050, + R32M46-SSP1-PkBudg650, + R32M46-SSP2EU-NDC, + R32M46-SSP2EU-NPi, + R32M46-SSP2EU-PkBudg1050, + R32M46-SSP2EU-PkBudg650, + R32M46-SSP5-NDC, + R32M46-SSP5-NPi, + R32M46-SSP5-PkBudg1050, + R32M46-SSP5-PkBudg650, SSPDB-SSP1-19-IMAGE, SSPDB-SSP1-19-REMIND-MAGPIE, SSPDB-SSP1-26-IMAGE, diff --git a/scripts/output/extra/highres.R b/scripts/output/extra/highres.R index 60083fafff..a048be56b2 100644 --- a/scripts/output/extra/highres.R +++ b/scripts/output/extra/highres.R @@ -39,7 +39,7 @@ source("scripts/start_functions.R") highres <- function(cfg) { #lock the model folder - lockId <- gms::model_lock(timeout1 = 1) + lockId <- gms::model_lock(timeout1 = 24) withr::defer(gms::model_unlock(lockId)) if(any(!(modelstat(gdx) %in% c(2,7)))) stop("Modelstat different from 2 or 7 detected") @@ -145,6 +145,12 @@ highres <- function(cfg) { cfg$gms$optimization <- "nlp_par" cfg$gms$s15_elastic_demand <- 0 + #get exogenous bioenergy demand and GHG prices from c200 run because these files may have been overwritten + write.magpie(readGDX(gdx,"f56_pollutant_prices_coupling"),"modules/56_ghg_policy/input/f56_pollutant_prices_coupling.cs3") + write.magpie(readGDX(gdx,"f56_pollutant_prices_emulator"),"modules/56_ghg_policy/input/f56_pollutant_prices_emulator.cs3") + write.magpie(readGDX(gdx,"f60_bioenergy_dem_coupling"),"modules/60_bioenergy/input/reg.2ndgen_bioenergy_demand.csv") + write.magpie(readGDX(gdx,"f60_bioenergy_dem_emulator"),"modules/60_bioenergy/input/glo.2ndgen_bioenergy_demand.csv") + #get regional afforestation patterns from low resolution run with c200 aff <- dimSums(landForestry(gdx)[,,c("aff","ndc")],dim=3) #Take away initial NDC area for consistency with global afforestation limit diff --git a/scripts/start/test_runs.R b/scripts/start/test_runs.R index 7815102f9a..2dff4f7ac9 100644 --- a/scripts/start/test_runs.R +++ b/scripts/start/test_runs.R @@ -42,28 +42,28 @@ cfg$gms$c_timesteps <- timeSteps # Reference and Policy run for SSP1, SSP2 and SSP5 -for(ssp in c("SSP1","SSP2","SSP5")) { +for(ssp in c("SSP1","SSP2EU","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) }