Merge branch 'develop' of https://github.com/magpiemodel/magpie into …

…f_peatland2 # Conflicts: # CHANGELOG.md
magpiemodel · Sep 5, 2024 · aeb5c01 · aeb5c01
2 parents 0286b8b + 555623c
commit aeb5c01
Show file tree

Hide file tree

Showing 20 changed files with 349 additions and 192 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### changed
 - **21_trade** refactor equations for enhanced readablility and improve documentation
-- **script** rewrite of merge_report.R based on rds files and rbind, which allows for more flexibility when merging reports. Avoid inconsistent use of "GLO" instead of "World" in report.rds files.
+- **scripts** rewrite of merge_report.R based on rds files and rbind, which allows for more flexibility when merging reports. Avoid inconsistent use of "GLO" instead of "World" in report.rds files.
 - **15_food** revision of MP/SCP implementation for milk and meat alternatives. Added demand for fat and sugar as ingredients for MP-based milk alternatives. Added optional demand for fat as ingredient for MP-based meat alternatives.
 - **script** scripts/start_functions.R decide individually for demand and price whether they are read from a REMIND report.
 - **80_optimization** abort GAMS in case of execution errors, added threads = 1 as default to avoid infeasibilites and Flg_NoDefc = TRUE as option
@@ -17,10 +17,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **32_forestry** Interfaces `vm_landexpansion_forestry` and `vm_landreduction_forestry` have been corrected by harvested and replanted timber plantation area
 - **script** updated EATLancet project start scripts
 - **script** replaced gdx package with gdx2 package calls
+- **config** split scenario_config into project-specific configs
 
 ### added
 - **scripts** added output report `EU_report.R` that uses `EU_report.Rmd`
-- **script** added out of bounds check as output script
+- **scripts** added out of bounds check as output script
 - **70_livestock** added realization `fbask_jan16_sticky`
 - **script** check of variables needed in piamInterfaces in report_rds.R
 - **42_water_demand** added water abstraction type dimension for non-ag uses

diff --git a/config/default.cfg b/config/default.cfg
@@ -1001,7 +1001,7 @@ cfg$gms$s32_est_cost_natveg <- 2000    # def = 2000
 # *     such that the total plantation area remains constant.
 # * 2 = "Endogenous" scenario. Harvest from plantations including age-class shifting
 # *      All plantations are harvested at rotation age. Plantation establishment is endogenous.
-cfg$gms$s32_hvarea = 2 # def = 2
+cfg$gms$s32_hvarea <- 2 # def = 2
 
 # Type of rotation length selection criteria
 # * ("mean_annual_increment")      = Harvesting when the average annual increment is maximum
@@ -1016,7 +1016,7 @@ cfg$gms$c32_rot_calc_type <- "current_annual_increment"
 # * ("004lin2030") Disturbance applied to 0p4 percent per year linear phase-in over 20yrs from 0 in 2030
 # * ("008lin2030") Disturbance applied to 0p8 percent per year linear phase-in over 20yrs from 0 in 2030
 # * ("016lin2030") Disturbance applied to 1p6 percent per year linear phase-in over 20yrs from 0 in 2030
-cfg$gms$c32_shock_scenario = "none"     # def = "none"
+cfg$gms$c32_shock_scenario <- "none"     # def = "none"
 
 # ***---------------------    34_urban   ---------------------------------------
 # * 34_urban includes urban land

diff --git a/config/projects/scenario_config_el2.csv b/config/projects/scenario_config_el2.csv
@@ -0,0 +1,23 @@
+;EL2_PHD;EL2_Demand;EL2_default
+gms$c09_pal_scenario;SDP;SDP;SSP2
+gms$s12_interest_lic;0.06;0.1;0.1
+gms$s12_interest_hic;0.04;0.04;0.04
+gms$s15_exo_waste;1;1;0
+gms$s15_waste_scen;1.2;1.2;1.2
+gms$s15_exo_diet;3;3;0
+gms$s15_exo_monogastric;1;1;1
+gms$s15_exo_ruminant;1;1;1
+gms$s15_exo_fish;1;1;1
+gms$s15_exo_fruitvegnut;1;1;1
+gms$s15_exo_roots;1;1;1
+gms$s15_exo_pulses;1;1;1
+gms$s15_exo_sugar;1;1;1
+gms$s15_exo_oils;1;1;1
+gms$s15_exo_brans;0;0;0
+gms$s15_exo_scp;1;1;1
+gms$s15_exo_alcohol;1;1;1
+gms$s15_alc_scen;0;0;0
+gms$factor_costs;sticky_labor;sticky_labor;sticky_labor
+gms$c70_feed_scen;ssp1;ssp2;ssp2
+input['cellular'];rev4.111EL2_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz;;
+magicc_emis_scen;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax_DeepDive_noNDC-rem-12.mif;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax_DeepDive_noNDC-rem-12.mif;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax_DeepDive_noNDC-rem-12.mif
diff --git a/config/projects/scenario_config_frst_shock.csv b/config/projects/scenario_config_frst_shock.csv
@@ -0,0 +1,4 @@
+;frst_shock_none;frst_shock_002lin2030;frst_shock_004lin2030;frst_shock_008lin2030;frst_shock_016lin2030
+gms$c32_shock_scenario;none;002lin2030;004lin2030;008lin2030;016lin2030
+gms$s35_forest_damage;4;4;4;4;4
+gms$c35_shock_scenario;none;002lin2030;004lin2030;008lin2030;016lin2030
diff --git a/config/scenario_fsec.csv → config/projects/scenario_config_fsec.csv b/config/scenario_fsec.csv → config/projects/scenario_config_fsec.csv
diff --git a/config/projects/scenario_config_gcs.csv b/config/projects/scenario_config_gcs.csv
@@ -0,0 +1,38 @@
+;GCSF;LNDlbs;LNDres;LNDfood;Tland
+gms$food;anthro_iso_jun22;;;;
+gms$s15_exo_foodscen_start;;;;2020;2020
+gms$s15_exo_foodscen_target;;;;2050;2050
+gms$s15_exo_waste;;;;1;1
+gms$s15_waste_scen;;;;1.2;1.2
+gms$s15_exo_diet;;;;1;1
+gms$c15_kcal_scen;;;;healthy_BMI;healthy_BMI
+gms$c15_EAT_scen;;;;FLX;FLX
+gms$s15_exo_monogastric;;;;1;1
+gms$s15_exo_ruminant;;;;1;1
+gms$s15_exo_fish;;;;1;1
+gms$s15_exo_fruitvegnut;;;;1;1
+gms$s15_exo_pulses;;;;1;1
+gms$s15_exo_sugar;;;;1;1
+gms$s15_exo_oils;;;;1;1
+gms$s15_exo_brans;;;;1;1
+gms$s15_exo_scp;;;;1;1
+gms$s15_exo_alcohol;;;;1;1
+gms$c22_protect_scenario;;BH_IFL;;;BH_IFL
+gms$s29_snv_shr;;0.2;;;0.2
+gms$s29_snv_scenario_target;;2030;;;2030
+gms$c30_bioen_water;;;rainfed;;rainfed
+gms$s32_aff_plantation;;0;;;0
+gms$s32_aff_bii_coeff;;0;;;0
+gms$s32_max_aff_area;;500;;;500
+gms$c32_aff_mask;;onlytropical;;;onlytropical
+gms$s35_forest_damage_end;;2030;;;2030
+gms$s42_irrig_eff_scenario;;;3;;3
+gms$c42_env_flow_policy;;;on;;on
+gms$s42_efp_targetyear;;;2040;;2040
+gms$c50_scen_neff;;;baseeff_add3_add15_add25_max75;;baseeff_add3_add15_add25_max75
+gms$c55_scen_conf;;;ssp1;;ssp1
+gms$s56_buffer_aff;;0.2;;;0.2
+gms$c56_emis_policy;;gcs_lbs;gcs_res;;redd+natveg_nosoil
+gms$c60_1stgen_biodem;;;phaseout2020;;phaseout2020
+gms$c60_res_2ndgenBE_dem;;;;sdp;sdp
+gms$c70_feed_scen;;;ssp1;;ssp1
diff --git a/config/projects/scenario_config_genie.csv b/config/projects/scenario_config_genie.csv
@@ -0,0 +1,28 @@
+;GENIE_SCP
+gms$c_timesteps;coup2110
+gms$sm_fix_SSP2;2020
+gms$sm_fix_cc;2020
+gms$c13_tccost;high
+gms$c14_yields_scenario;nocc
+gms$food;anthropometrics_jan18
+gms$kfo_rd;livst_rum,livst_milk
+gms$s15_food_subst_functional_form;2
+gms$c20_scp_type;hydrogen
+gms$s21_trade_tariff_startyear;2020
+gms$s22_conservation_start;2020
+gms$s22_conservation_target;2030
+gms$s30_annual_max_growth;0.02
+gms$s32_hvarea;0
+gms$s35_hvarea;0
+gms$factor_costs;sticky_feb18
+gms$s38_startyear_labor_substitution;2020
+gms$s42_efp_startyear;2020
+gms$s44_cost_bii_missing;10000000
+gms$c56_pollutant_prices;R32M46-SSP2EU-NPi
+gms$c56_pollutant_prices_noselect;R32M46-SSP2EU-NPi
+gms$c56_mute_ghgprices_until;y2020
+gms$bioenergy;1st2ndgen_priced_feb24
+gms$c60_1stgen_biodem;phaseout2020
+gms$c60_2ndgen_biodem;R32M46-SSP2EU-NPi
+gms$c60_2ndgen_biodem_noselect;R32M46-SSP2EU-NPi
+gms$s73_timber_demand_switch;0
diff --git a/config/projects/scenario_config_lama.csv b/config/projects/scenario_config_lama.csv
@@ -0,0 +1,39 @@
+;LAMA_Inequal;LAMA_Inequal-SustDemand;LAMA_Inequal-EnvirProt;LAMA_Inequal-GHGPrice;LAMA_Sustainability
+gms$c_timesteps;5year;5year;5year;5year;5year
+gms$c09_pop_scenario;SSP4;SSP1;SSP4;SSP4;SSP1
+gms$c09_gdp_scenario;SSP4;SSP1;SSP4;SSP4;SSP1
+gms$c09_pal_scenario;SSP4;SSP1;SSP4;SSP4;SSP1
+gms$c15_food_scenario;SSP4;SSP1;SSP4;SSP4;SSP1
+gms$c15_food_scenario_noselect;SSP4;SSP1;SSP4;SSP4;SSP1
+gms$s15_exo_foodscen_start;;2020;;;2020
+gms$s15_exo_foodscen_target;;2050;;;2050
+gms$s15_exo_waste;0;1;0;0;1
+gms$s15_waste_scen;1.2;1.2;1.2;1.2;1.2
+gms$s15_exo_diet;0;1;0;0;1
+gms$s15_exo_brans;1;1;1;1;1
+gms$c21_trade_liberalization;l908080r807070;l908080r807070;l908080r807070;l908080r807070;l908080r807070
+gms$c22_protect_scenario;BH_IFL;BH_IFL;BH_IFL;BH_IFL;BH_IFL
+gms$c22_protect_scenario_noselect;none;none;BH_IFL;none;BH_IFL
+gms$s29_snv_shr;0.2;0.2;0.2;0.2;0.2
+gms$s29_snv_shr_noselect;0;0;0.2;0;0.2
+gms$s29_snv_scenario_target;2030;2030;2030;2030;2030
+gms$s32_max_aff_area;Inf;Inf;Inf;500;500
+gms$c34_urban_scenario;SSP4;SSP1;SSP4;SSP4;SSP1
+gms$c32_aff_policy;ndc;ndc;ndc;ndc;ndc
+gms$c35_ad_policy;ndc;ndc;ndc;ndc;ndc
+gms$c35_aolc_policy;ndc;ndc;ndc;ndc;ndc
+gms$s35_forest_damage_end;2030;2030;2030;2030;2030
+gms$s42_watdem_nonagr_scenario;2;1;2;2;1
+gms$s42_irrig_eff_scenario;3;3;3;3;3
+gms$c42_env_flow_policy;on;on;on;on;on
+gms$c50_scen_neff;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75
+gms$c50_scen_neff_noselect;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75
+gms$c55_scen_conf;ssp1;ssp1;ssp1;ssp1;ssp1
+gms$c55_scen_conf_noselect;ssp4;ssp4;ssp1;ssp4;ssp1
+gms$c56_pollutant_prices;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000
+gms$c56_pollutant_prices_noselect;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000
+gms$c60_1stgen_biodem;phaseout2020;phaseout2020;phaseout2020;phaseout2020;phaseout2020
+gms$c60_2ndgen_biodem;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000
+gms$c60_2ndgen_biodem_noselect;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000
+gms$c60_res_2ndgenBE_dem;ssp4;sdp;ssp4;ssp4;sdp
+gms$c70_feed_scen;ssp4;ssp1;ssp4;ssp4;ssp1
diff --git a/config/projects/scenario_config_navigate.csv b/config/projects/scenario_config_navigate.csv
@@ -0,0 +1,6 @@
+;NAVIGATE_AllOff;NAVIGATE_LandSup;NAVIGATE_LandDem;NAVIGATE_AllOn
+gms$s15_exo_waste;0;0;1;1
+gms$s15_exo_diet;0;0;1;1
+gms$c57_macc_version;PBL_2022;PBL_2022;PBL_2022;PBL_2022
+gms$c57_macc_scenario;Default;Optimistic;Default;Optimistic
+gms$s58_rewetting_switch;0;1;0;1
diff --git a/config/projects/scenario_config_ngfs.csv b/config/projects/scenario_config_ngfs.csv
@@ -0,0 +1,11 @@
+;NGFS_o_lowdem
+gms$c15_food_scenario;SSP2
+gms$c15_food_scenario_noselect;SSP2
+gms$s15_exo_foodscen_convergence;1
+gms$s15_exo_foodscen_functional_form;1
+gms$s15_exo_foodscen_start;2020
+gms$s15_exo_foodscen_target;2050
+gms$s15_exo_waste;1
+gms$s15_waste_scen;1.2
+gms$s15_exo_diet;1
+gms$c15_kcal_scen;healthy_BMI