From 8e865afec7f521c3bc3ef816ea8032ae718843e6 Mon Sep 17 00:00:00 2001 From: florianh Date: Tue, 12 Nov 2024 21:30:23 +0100 Subject: [PATCH] update --- CHANGELOG.md | 5 ++-- config/default.cfg | 6 ++--- config/projects/scenario_config_el2.csv | 2 +- config/projects/scenario_config_fsec.csv | 6 ++--- config/scenario_config.csv | 2 +- modules/29_cropland/detail_apr24/preloop.gms | 7 ++++++ modules/30_croparea/detail_apr24/preloop.gms | 9 ++++++++ modules/30_croparea/simple_apr24/preloop.gms | 9 ++++++++ modules/31_past/endo_jun13/preloop.gms | 14 +++++++++++ modules/31_past/endo_jun13/realization.gms | 1 + modules/31_past/grasslands_apr22/preloop.gms | 9 ++++++++ modules/32_forestry/dynamic_may24/preloop.gms | 13 +++++++++++ modules/34_urban/exo_nov21/preloop.gms | 4 ++++ modules/34_urban/static/presolve.gms | 2 +- .../35_natveg/pot_forest_may24/preloop.gms | 12 ++++++++++ .../bii_target/declarations.gms | 18 ++++++++------- .../44_biodiversity/bii_target/equations.gms | 9 ++++---- modules/44_biodiversity/bii_target/input.gms | 6 ++--- .../44_biodiversity/bii_target/preloop.gms | 23 +++++++++++++++---- .../44_biodiversity/bii_target/presolve.gms | 2 +- .../bii_target_apr24/declarations.gms | 16 +++++++------ .../bii_target_apr24/equations.gms | 9 ++++---- .../bii_target_apr24/input.gms | 6 ++--- .../bii_target_apr24/preloop.gms | 23 +++++++++++++++---- .../bii_target_apr24/presolve.gms | 5 +++- scripts/start/extra/recalibrateH16.R | 6 ++--- scripts/start/projects/paper_peatlandTax.R | 10 ++++---- scripts/start/projects/project_ABCDR.R | 14 +++++------ scripts/start/projects/project_EAT2p0.R | 2 +- 29 files changed, 182 insertions(+), 68 deletions(-) create mode 100644 modules/31_past/endo_jun13/preloop.gms diff --git a/CHANGELOG.md b/CHANGELOG.md index 1704a4f640..fbc13a9cc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### added - **62_material** added switch to turn off future material demand for bioplastic - **config** added SSP1-POP-GDP SSP2-POP-GDP and SSP5-POP-GDP +- **modules[29-35]** added initial vales for ov_bv for better starting point ### removed - @@ -31,8 +32,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** script/output/extra/resubmit.R - **28_ageclass** bugfix input data unit and code clean-up. Renamed `feb21` realization to `oct24` - **70_livestock** bugfix scaling.gms file in wrong folder -- **10_land** bugfix land transition matrix for improved feasibility (variables and parameters have different accuracy) -- **44_biodiversity** avoid division by zero and improved consistency between realisations for fixing variables +- **10_land** Simplified land transition matrix for improved feasibility +- **44_biodiversity** bugfix biorealm_biome.cs3 in input data (shares did not add-up to 1) ## [4.8.2] - 2024-09-24 diff --git a/config/default.cfg b/config/default.cfg index fbc2cc2182..841a22f14b 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -22,9 +22,9 @@ cfg$model <- "main.gms" #def = "main.gms" #### input settings #### # which input data sets should be used? -cfg$input <- c(regional = "rev4.115_h12_magpie.tgz", - cellular = "rev4.115_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz", - validation = "rev4.115_h12_validation.tgz", +cfg$input <- c(regional = "rev4.116_h12_magpie.tgz", + cellular = "rev4.116_h12_2ca80312_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", + validation = "rev4.116_h12_validation.tgz", additional = "additional_data_rev4.57.tgz", calibration = "calibration_H12_27Sep24.tgz") diff --git a/config/projects/scenario_config_el2.csv b/config/projects/scenario_config_el2.csv index 4fb7c28973..e48b47aae1 100644 --- a/config/projects/scenario_config_el2.csv +++ b/config/projects/scenario_config_el2.csv @@ -19,5 +19,5 @@ 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.115EL2_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz;; +input['cellular'];rev4.116EL2_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_fsec.csv b/config/projects/scenario_config_fsec.csv index a007d17c34..dda4e130b0 100644 --- a/config/projects/scenario_config_fsec.csv +++ b/config/projects/scenario_config_fsec.csv @@ -76,9 +76,9 @@ 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.115_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.115_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.115_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.115_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.115_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.115_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.115_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;; -input['regional'];rev4.115_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -input['validation'];rev4.115_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['cellular'];rev4.116_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.116_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.116_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.116_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.116_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.116_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.116_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;; +input['regional'];rev4.116_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['validation'];rev4.116_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; input['additional'];additional_data_rev4.57.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; input['calibration'];calibration_FSEC_27Sep24.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; magicc_emis_scen;bjoernAR6_C_SSP2-NDC.mif;;;bjoernAR6_C_SSP2-PkBudg900.mif;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;bjoernAR6_C_SSP1-NDC.mif;;;;;;;;;;;;bjoernAR6_C_RemSDP-900-MagSSP1.mif;; diff --git a/config/scenario_config.csv b/config/scenario_config.csv index fe9e64437b..6f00b24aa8 100755 --- a/config/scenario_config.csv +++ b/config/scenario_config.csv @@ -74,4 +74,4 @@ gms$c60_biodem_level;;;;;;;;;;;;;;;;;;;;1;0;;;;;;;;;;;; gms$c60_res_2ndgenBE_dem;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;sdp;ssp2;sdp;sdp;;;;;;;;;;;;;;;;;;;; gms$c70_feed_scen;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;ssp1;ssp5;ssp1;ssp1;;;;;;;;;;;;;;;;;;;; gms$s73_timber_demand_switch;;;;;;;;;;;;;;;;;;;;;;;;;1;1;0;;;;;; -input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.115_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.115_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.115_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.115_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.115_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.115_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz +input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.116_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.116_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.116_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.116_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.116_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.116_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz diff --git a/modules/29_cropland/detail_apr24/preloop.gms b/modules/29_cropland/detail_apr24/preloop.gms index 34c0fe6eac..35e58c0244 100644 --- a/modules/29_cropland/detail_apr24/preloop.gms +++ b/modules/29_cropland/detail_apr24/preloop.gms @@ -66,3 +66,10 @@ p29_country_dummy(policy_countries29) = 1; * Countries are weighted by available cropland area. pm_avl_cropland_iso(iso) = f29_avl_cropland_iso(iso,"%c29_marginal_land%"); p29_country_weight(i) = sum(i_to_iso(i,iso), p29_country_dummy(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso)); + +* Initialize biodiversity value +vm_bv.l(j2,"crop_fallow",potnatveg) = 0; + +vm_bv.l(j2,"crop_tree",potnatveg) = + sum(bii_class_secd, sum(ac_to_bii_class_secd(ac,bii_class_secd), pc29_treecover(j2,ac)) * + p29_treecover_bii_coeff(bii_class_secd,potnatveg)) * fm_luh2_side_layers(j2,potnatveg); diff --git a/modules/30_croparea/detail_apr24/preloop.gms b/modules/30_croparea/detail_apr24/preloop.gms index cdef528e7f..54fe834d90 100644 --- a/modules/30_croparea/detail_apr24/preloop.gms +++ b/modules/30_croparea/detail_apr24/preloop.gms @@ -39,3 +39,12 @@ p30_country_dummy(policy_countries30) = 1; * share is calculated that translates the countries' influence to regional level. * Countries are weighted by available cropland area. p30_country_weight(i) = sum(i_to_iso(i,iso), p30_country_dummy(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso)); + +* Initialize biodiversity value +vm_bv.l(j,"crop_ann",potnatveg) = + sum((crop_ann30,w), fm_croparea("y1995",j,w,crop_ann30)) * fm_bii_coeff("crop_ann",potnatveg) + * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"crop_per",potnatveg) = + sum((crop_per30,w), fm_croparea("y1995",j,w,crop_per30)) * fm_bii_coeff("crop_per",potnatveg) + * fm_luh2_side_layers(j,potnatveg); diff --git a/modules/30_croparea/simple_apr24/preloop.gms b/modules/30_croparea/simple_apr24/preloop.gms index adffa58780..119943f4a2 100644 --- a/modules/30_croparea/simple_apr24/preloop.gms +++ b/modules/30_croparea/simple_apr24/preloop.gms @@ -23,3 +23,12 @@ p30_country_dummy(policy_countries30) = 1; * share is calculated that translates the countries' influence to regional level. * Countries are weighted by available cropland area. p30_country_weight(i) = sum(i_to_iso(i,iso), p30_country_dummy(iso) * pm_avl_cropland_iso(iso)) / sum(i_to_iso(i,iso), pm_avl_cropland_iso(iso)); + +* Initialize biodiversity value +vm_bv.l(j,"crop_ann",potnatveg) = + sum((crop_ann30,w), fm_croparea("y1995",j,w,crop_ann30)) * fm_bii_coeff("crop_ann",potnatveg) + * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"crop_per",potnatveg) = + sum((crop_per30,w), fm_croparea("y1995",j,w,crop_per30)) * fm_bii_coeff("crop_per",potnatveg) + * fm_luh2_side_layers(j,potnatveg); diff --git a/modules/31_past/endo_jun13/preloop.gms b/modules/31_past/endo_jun13/preloop.gms new file mode 100644 index 0000000000..0a411a741f --- /dev/null +++ b/modules/31_past/endo_jun13/preloop.gms @@ -0,0 +1,14 @@ +*** | (C) 2008-2024 Potsdam Institute for Climate Impact Research (PIK) +*** | authors, and contributors see CITATION.cff file. This file is part +*** | of MAgPIE and licensed under AGPL-3.0-or-later. Under Section 7 of +*** | AGPL-3.0, you are granted additional permissions described in the +*** | MAgPIE License Exception, version 1.0 (see LICENSE file). +*** | Contact: magpie@pik-potsdam.de + +* Initialize biodiversity value +vm_bv.l(j,"manpast",potnatveg) = + pcm_land(j,"past") * fm_luh2_side_layers(j,"manpast") * fm_bii_coeff("manpast",potnatveg) * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"rangeland",potnatveg) = + pcm_land(j,"past") * fm_luh2_side_layers(j,"rangeland") * fm_bii_coeff("rangeland",potnatveg) * fm_luh2_side_layers(j,potnatveg); + diff --git a/modules/31_past/endo_jun13/realization.gms b/modules/31_past/endo_jun13/realization.gms index f85b630f32..d06a7405f6 100644 --- a/modules/31_past/endo_jun13/realization.gms +++ b/modules/31_past/endo_jun13/realization.gms @@ -21,6 +21,7 @@ $Ifi "%phase%" == "declarations" $include "./modules/31_past/endo_jun13/declarations.gms" $Ifi "%phase%" == "input" $include "./modules/31_past/endo_jun13/input.gms" $Ifi "%phase%" == "equations" $include "./modules/31_past/endo_jun13/equations.gms" +$Ifi "%phase%" == "preloop" $include "./modules/31_past/endo_jun13/preloop.gms" $Ifi "%phase%" == "presolve" $include "./modules/31_past/endo_jun13/presolve.gms" $Ifi "%phase%" == "postsolve" $include "./modules/31_past/endo_jun13/postsolve.gms" *######################## R SECTION END (PHASES) ############################### diff --git a/modules/31_past/grasslands_apr22/preloop.gms b/modules/31_past/grasslands_apr22/preloop.gms index 4b32591636..0f54f10b19 100644 --- a/modules/31_past/grasslands_apr22/preloop.gms +++ b/modules/31_past/grasslands_apr22/preloop.gms @@ -93,3 +93,12 @@ i31_grass_yields(t,j,"pastr") = i31_grass_yields(t,j,"pastr") * i31_grass_calib( *' Note that the calculation is split into two parts for better readability. *' @stop + +* Initialize biodiversity value +vm_bv.l(j,"manpast",potnatveg) = + pcm_land(j,"past") * fm_luh2_side_layers(j,"manpast") * fm_bii_coeff("manpast",potnatveg) * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"rangeland",potnatveg) = + pcm_land(j,"past") * fm_luh2_side_layers(j,"rangeland") * fm_bii_coeff("rangeland",potnatveg) * fm_luh2_side_layers(j,potnatveg); + + diff --git a/modules/32_forestry/dynamic_may24/preloop.gms b/modules/32_forestry/dynamic_may24/preloop.gms index bcf1b96ed1..edccee7402 100644 --- a/modules/32_forestry/dynamic_may24/preloop.gms +++ b/modules/32_forestry/dynamic_may24/preloop.gms @@ -228,3 +228,16 @@ p32_land(t,j,type32,ac) = 0; * initialize forest disturbance losses p32_disturbance_loss_ftype32(t,j,"aff",ac) = 0; + +* Initialize biodiversity value +vm_bv.l(j,"aff_co2p",potnatveg) = + sum(bii_class_secd, sum(ac_to_bii_class_secd(ac,bii_class_secd), pc32_land(j,"aff",ac)) * + p32_bii_coeff("aff",bii_class_secd,potnatveg)) * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"aff_ndc",potnatveg) = + sum(bii_class_secd, sum(ac_to_bii_class_secd(ac,bii_class_secd), pc32_land(j,"ndc",ac)) * + p32_bii_coeff("ndc",bii_class_secd,potnatveg)) * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"plant",potnatveg) = + sum(bii_class_secd, sum(ac_to_bii_class_secd(ac,bii_class_secd), pc32_land(j,"plant",ac)) * + p32_bii_coeff("plant",bii_class_secd,potnatveg)) * fm_luh2_side_layers(j,potnatveg); diff --git a/modules/34_urban/exo_nov21/preloop.gms b/modules/34_urban/exo_nov21/preloop.gms index a313f1a29b..af2f0c4700 100644 --- a/modules/34_urban/exo_nov21/preloop.gms +++ b/modules/34_urban/exo_nov21/preloop.gms @@ -15,3 +15,7 @@ i34_urban_area(t_all, j) = f34_urbanland(t_all, j,"%c34_urban_scenario%"); ); pcm_land(j,"urban") = i34_urban_area("y1995",j); + +* Initialize biodiversity value +vm_bv.l(j2,"urban", potnatveg) = + pcm_land(j2,"urban") * fm_bii_coeff("urban",potnatveg) * fm_luh2_side_layers(j2,potnatveg); diff --git a/modules/34_urban/static/presolve.gms b/modules/34_urban/static/presolve.gms index 00ee7576bb..4a9eb9e4a5 100644 --- a/modules/34_urban/static/presolve.gms +++ b/modules/34_urban/static/presolve.gms @@ -8,7 +8,7 @@ vm_land.fx(j,"urban") = pcm_land(j,"urban"); vm_carbon_stock.fx(j,"urban",ag_pools,stockType) = 0; -*' Biodiveristy value (BV) +* Biodiveristy value (BV) vm_bv.fx(j,"urban", potnatveg) = pcm_land(j,"urban") * fm_bii_coeff("urban",potnatveg) * fm_luh2_side_layers(j,potnatveg); vm_cost_urban.fx(j) = 0; diff --git a/modules/35_natveg/pot_forest_may24/preloop.gms b/modules/35_natveg/pot_forest_may24/preloop.gms index bad3110864..178ff03bbd 100644 --- a/modules/35_natveg/pot_forest_may24/preloop.gms +++ b/modules/35_natveg/pot_forest_may24/preloop.gms @@ -85,3 +85,15 @@ m_sigmoid_time_interpol(p35_damage_fader,sm_fix_SSP2,s35_forest_damage_end,0,1); pc35_secdforest(j,ac) = i35_secdforest(j,ac); pc35_land_other(j,othertype35,ac) = i35_land_other(j,othertype35,ac); + +* Initialize biodiversity value +vm_bv.l(j,"primforest",potnatveg) = + pcm_land(j,"primforest") * fm_bii_coeff("primary",potnatveg) * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"secdforest",potnatveg) = + sum(bii_class_secd, sum(ac_to_bii_class_secd(ac,bii_class_secd), i35_secdforest(j,ac)) * + fm_bii_coeff(bii_class_secd,potnatveg)) * fm_luh2_side_layers(j,potnatveg); + +vm_bv.l(j,"other",potnatveg) = + sum(bii_class_secd, sum(ac_to_bii_class_secd(ac,bii_class_secd), sum(othertype35, i35_land_other(j,othertype35,ac))) * + fm_bii_coeff(bii_class_secd,potnatveg)) * fm_luh2_side_layers(j,potnatveg); diff --git a/modules/44_biodiversity/bii_target/declarations.gms b/modules/44_biodiversity/bii_target/declarations.gms index c73b4a6f04..7f4552e059 100644 --- a/modules/44_biodiversity/bii_target/declarations.gms +++ b/modules/44_biodiversity/bii_target/declarations.gms @@ -7,22 +7,24 @@ positive variables - vm_cost_bv_loss(j) Biodiversity cost (mio USD17MER) - vm_bv(j,landcover44,potnatveg) Biodiversity stock for all land cover classes (Mha) - v44_bii(i,biome44) Biodiversity Intactness Index BII (1) - v44_bii_missing(i,biome44) Missing BII increase for compliance with BII target (1) + vm_cost_bv_loss(j) Biodiversity cost (mio USD17MER) + vm_bv(j,landcover44,potnatveg) Biodiversity stock for all land cover classes (Mha) + v44_bii(i,biome44) Biodiversity Intactness Index BII (1) + v44_bii_missing(i,biome44) Missing BII increase for compliance with BII target (1) ; parameters - p44_bii_lower_bound(t,i,biome44) Interpolated lower bound for BII over time (1) + p44_bii_lower_bound(t,i,biome44) Interpolated lower bound for BII over time (1) p44_start_value(i,biome44) Start value for BII lower bound (1) p44_target_value(i,biome44) Target value for BII lower bound (1) + i44_biome_share(j,biome44) Share of biome type in each spatial unit (1) + i44_biome_area_reg(i,biome44) Area of range-rarity weighted biome type in each region (mio. ha) ; equations - q44_bii(i,biome44) Biodiversity Intactness Index BII (1) - q44_bii_target(i,biome44) Missing BII increase for compliance with BII target (1) - q44_cost(i) Biodiversity cost (mio USD17MER) + q44_bii(i,biome44) Biodiversity Intactness Index BII (1) + q44_bii_target(i,biome44) Missing BII increase for compliance with BII target (1) + q44_cost(i) Biodiversity cost (mio USD17MER) ; diff --git a/modules/44_biodiversity/bii_target/equations.gms b/modules/44_biodiversity/bii_target/equations.gms index eb730f0a96..25bd174d97 100644 --- a/modules/44_biodiversity/bii_target/equations.gms +++ b/modules/44_biodiversity/bii_target/equations.gms @@ -10,15 +10,16 @@ *' The Biodiversity Intactness Index (BII) is calculated at the level of 71 biomes. *' The regional layer is needed for compatibility with the high resolution parallel optimization output script (scripts/output/extra/highres.R) - q44_bii(i2,biome44)$(sum(cell(i2,j2), f44_biome(j2,biome44)) > 1e-10) .. - v44_bii(i2,biome44) * sum((cell(i2,j2),land), pcm_land(j2,land) * f44_biome(j2,biome44)) + q44_bii(i2,biome44)$(i44_biome_area_reg(i2,biome44) > 0) .. + v44_bii(i2,biome44) =e= - sum((cell(i2,j2),potnatveg,landcover44), vm_bv(j2,landcover44,potnatveg) * f44_biome(j2,biome44)); + sum((cell(i2,j2),potnatveg,landcover44), vm_bv(j2,landcover44,potnatveg) * f44_biome(j2,biome44)) + / i44_biome_area_reg(i2,biome44); *' For each of the 71 biomes, the BII has to meet a minium level based on `s44_bii_lower_bound`. *' `v44_bii_missing` is a technical variable to maintain feasibility in case `v44_bii` cannot be increased. - q44_bii_target(i2,biome44)$(sum(cell(i2,j2), f44_biome(j2,biome44)) > 1e-10) .. + q44_bii_target(i2,biome44)$(i44_biome_area_reg(i2,biome44) > 0) .. v44_bii(i2,biome44) + v44_bii_missing(i2,biome44) =g= sum(ct, p44_bii_lower_bound(ct,i2,biome44)); *' Costs accrue only for `v44_bii_missing`. In the best case costs should be zero or close to zero. diff --git a/modules/44_biodiversity/bii_target/input.gms b/modules/44_biodiversity/bii_target/input.gms index 624e4e8799..65f4f864ee 100644 --- a/modules/44_biodiversity/bii_target/input.gms +++ b/modules/44_biodiversity/bii_target/input.gms @@ -6,11 +6,11 @@ *** | Contact: magpie@pik-potsdam.de scalars - s44_bii_lower_bound Lower bound for BII (1) / 0 / + s44_bii_lower_bound Lower bound for BII (1) / 0 / c44_bii_decrease Implementation of lower bound for BII (binary) / 1 / s44_target_year Year in which the BII lower bound is reached (1) / 2100 / s44_start_year Start year for interpolation towards BII lower bound (1) / 2025 / - s44_cost_bii_missing Technical costs for missing BII increase (USD17MER per unit of BII) / 1e+06 / + s44_cost_bii_missing Technical costs for missing BII increase (USD17MER per unit of BII) / 1e+06 / ; @@ -20,7 +20,7 @@ $include "./modules/44_biodiversity/bii_target/input/f44_bii_coeff.cs3" $offdelim ; -table f44_biome(j,biome44) Share of biome type in each spatial unit (1) +table f44_biome_area(j,biome44) Area of biome type in each spatial unit (mio. ha) $ondelim $include "./modules/44_biodiversity/bii_target/input/biorealm_biome.cs3" $offdelim diff --git a/modules/44_biodiversity/bii_target/preloop.gms b/modules/44_biodiversity/bii_target/preloop.gms index e14172dca5..50cbbaff35 100644 --- a/modules/44_biodiversity/bii_target/preloop.gms +++ b/modules/44_biodiversity/bii_target/preloop.gms @@ -5,10 +5,23 @@ *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -v44_bii.l(i,biome44) = 0.75; +i44_biome_share(j,biome44) = 0; +i44_biome_share(j,biome44)$(sum(land, pcm_land(j,land)) > 0) = f44_biome_area(j,biome44) / sum(land, pcm_land(j,land)); -v44_bii.fx(i,biome44)$(sum(cell(i,j), f44_biome(j,biome44)) <= 1e-10) = 0; -v44_bii_missing.fx(i,biome44)$(sum(cell(i,j), f44_biome(j,biome44)) <= 1e-10) = 0; -p44_bii_lower_bound(t,i,biome44) = 0; +i44_biome_area_reg(i,biome44) = + sum((cell(i,j),land), pcm_land(j,land) * i44_biome_share(j,biome44)); + +loop(i, + loop(biome44, + if(i44_biome_area_reg(i,biome44) <= 0, + v44_bii.fx(i,biome44) = 0; + v44_bii_missing.fx(i,biome44) = 0; + else + v44_bii.l(i,biome44) = + sum((cell(i,j),potnatveg,landcover44), vm_bv.l(j,landcover44,potnatveg) * i44_biome_share(j,biome44)) + / i44_biome_area_reg(i,biome44); + ); + ); +); -vm_bv.l(j,landcover44,potnatveg) = 0; +p44_bii_lower_bound(t,i,biome44) = 0; diff --git a/modules/44_biodiversity/bii_target/presolve.gms b/modules/44_biodiversity/bii_target/presolve.gms index 88dc5aba91..ff874e5049 100644 --- a/modules/44_biodiversity/bii_target/presolve.gms +++ b/modules/44_biodiversity/bii_target/presolve.gms @@ -23,7 +23,7 @@ else ); p44_bii_lower_bound(t2,i,biome44)$(p44_bii_lower_bound(t2,i,biome44) >= 1) = 1; p44_bii_lower_bound(t2,i,biome44)$(m_year(t2) < s44_start_year) = 0; - p44_bii_lower_bound(t2,i,biome44)$(sum(cell(i,j), f44_biome(j,biome44)) <= 1e-10) = 0; + p44_bii_lower_bound(t2,i,biome44)$(i44_biome_area_reg(i,biome44) <= 0) = 0; * The lower bound of `v44_bii` is set to `p44_bii_lower_bound` to avoid a reduction of BII in combination with `v44_bii_missing`. v44_bii.lo(i,biome44) = p44_bii_lower_bound(t,i,biome44); display p44_bii_lower_bound; diff --git a/modules/44_biodiversity/bii_target_apr24/declarations.gms b/modules/44_biodiversity/bii_target_apr24/declarations.gms index 8beb0dabed..12eb55056c 100644 --- a/modules/44_biodiversity/bii_target_apr24/declarations.gms +++ b/modules/44_biodiversity/bii_target_apr24/declarations.gms @@ -7,22 +7,24 @@ positive variables - vm_cost_bv_loss(j) Biodiversity cost (mio USD17MER) - vm_bv(j,landcover44,potnatveg) Biodiversity stock for all land cover classes (Mha) - v44_bii(i,biome44) Biodiversity Intactness Index BII (1) + vm_cost_bv_loss(j) Biodiversity cost (mio USD17MER) + vm_bv(j,landcover44,potnatveg) Biodiversity stock for all land cover classes (Mha) + v44_bii(i,biome44) Biodiversity Intactness Index BII (1) v44_bii_missing(i,biome44) Missing BII increase for compliance with BII target (1) ; parameters - p44_bii_lower_bound(t,i,biome44) Interpolated lower bound for BII over time (1) + p44_bii_lower_bound(t,i,biome44) Interpolated lower bound for BII over time (1) p44_start_value(i,biome44) Start value for BII lower bound (1) p44_target_value(i,biome44) Target value for BII lower bound (1) + i44_biome_share(j,biome44) Share of biome type in each spatial unit (1) + i44_biome_area_reg(i,biome44) Area of range-rarity weighted biome type in each region (mio. ha) ; equations - q44_bii(i,biome44) Biodiversity Intactness Index BII (1) - q44_bii_target(i,biome44) Missing BII increase for compliance with BII target (1) - q44_cost(i) Biodiversity cost (mio USD17MER) + q44_bii(i,biome44) Biodiversity Intactness Index BII (1) + q44_bii_target(i,biome44) Missing BII increase for compliance with BII target (1) + q44_cost(i) Biodiversity cost (mio USD17MER) ; diff --git a/modules/44_biodiversity/bii_target_apr24/equations.gms b/modules/44_biodiversity/bii_target_apr24/equations.gms index e0584c0b98..19c78350ce 100644 --- a/modules/44_biodiversity/bii_target_apr24/equations.gms +++ b/modules/44_biodiversity/bii_target_apr24/equations.gms @@ -11,15 +11,16 @@ *' Biodiversity stock weighted by range-rarity restoration prioritization layer (`f44_rr_layer`) *' The regional layer is needed for compatibility with the high resolution parallel optimization output script (scripts/output/extra/highres.R) - q44_bii(i2,biome44)$(sum(cell(i2,j2), f44_biome(j2,biome44)*f44_rr_layer(j2)) > 1e-10) .. - v44_bii(i2,biome44) * sum((cell(i2,j2),land), pcm_land(j2,land) * f44_rr_layer(j2) * f44_biome(j2,biome44)) + q44_bii(i2,biome44)$(i44_biome_area_reg(i2,biome44) > 0) .. + v44_bii(i2,biome44) =e= - sum((cell(i2,j2),potnatveg,landcover44), vm_bv(j2,landcover44,potnatveg) * f44_rr_layer(j2) * f44_biome(j2,biome44)); + sum((cell(i2,j2),potnatveg,landcover44), vm_bv(j2,landcover44,potnatveg) * f44_rr_layer(j2) * i44_biome_share(j2,biome44)) + / i44_biome_area_reg(i2,biome44); *' For each of the 71 biomes, the BII has to meet a minium level based on `s44_bii_lower_bound`. *' `v44_bii_missing` is a technical variable to maintain feasibility in case `v44_bii` cannot be increased. - q44_bii_target(i2,biome44)$(sum(cell(i2,j2), f44_biome(j2,biome44)*f44_rr_layer(j2)) > 1e-10) .. + q44_bii_target(i2,biome44)$(i44_biome_area_reg(i2,biome44) > 0) .. v44_bii(i2,biome44) + v44_bii_missing(i2,biome44) =g= sum(ct, p44_bii_lower_bound(ct,i2,biome44)); *' Costs accrue only for `v44_bii_missing`. In the best case costs should be zero or close to zero. diff --git a/modules/44_biodiversity/bii_target_apr24/input.gms b/modules/44_biodiversity/bii_target_apr24/input.gms index b04e933504..042c3e03fb 100644 --- a/modules/44_biodiversity/bii_target_apr24/input.gms +++ b/modules/44_biodiversity/bii_target_apr24/input.gms @@ -6,11 +6,11 @@ *** | Contact: magpie@pik-potsdam.de scalars - s44_bii_lower_bound Lower bound for BII (1) / 0 / + s44_bii_lower_bound Lower bound for BII (1) / 0 / c44_bii_decrease Implementation of lower bound for BII (binary) / 1 / s44_target_year Year in which the BII lower bound is reached (1) / 2100 / s44_start_year Start year for interpolation towards BII lower bound (1) / 2025 / - s44_cost_bii_missing Technical costs for missing BII increase (USD17MER per unit of BII) / 1e+06 / + s44_cost_bii_missing Technical costs for missing BII increase (USD17MER per unit of BII) / 1e+06 / ; @@ -20,7 +20,7 @@ $include "./modules/44_biodiversity/bii_target_apr24/input/f44_bii_coeff.cs3" $offdelim ; -table f44_biome(j,biome44) Share of biome type in each spatial unit (1) +table f44_biome_area(j,biome44) Area of biome type in each spatial unit (mio. ha) $ondelim $include "./modules/44_biodiversity/bii_target_apr24/input/biorealm_biome.cs3" $offdelim diff --git a/modules/44_biodiversity/bii_target_apr24/preloop.gms b/modules/44_biodiversity/bii_target_apr24/preloop.gms index 717263d631..6460fa7b59 100644 --- a/modules/44_biodiversity/bii_target_apr24/preloop.gms +++ b/modules/44_biodiversity/bii_target_apr24/preloop.gms @@ -5,10 +5,23 @@ *** | MAgPIE License Exception, version 1.0 (see LICENSE file). *** | Contact: magpie@pik-potsdam.de -v44_bii.l(i,biome44) = 0.75; +i44_biome_share(j,biome44) = 0; +i44_biome_share(j,biome44)$(sum(land, pcm_land(j,land)) > 0) = f44_biome_area(j,biome44) / sum(land, pcm_land(j,land)); -v44_bii.fx(i,biome44)$(sum(cell(i,j), f44_biome(j,biome44)*f44_rr_layer(j)) <= 1e-10) = 0; -v44_bii_missing.fx(i,biome44)$(sum(cell(i,j), f44_biome(j,biome44)*f44_rr_layer(j)) <= 1e-10) = 0; -p44_bii_lower_bound(t,i,biome44) = 0; +i44_biome_area_reg(i,biome44) = + sum((cell(i,j),land), pcm_land(j,land) * f44_rr_layer(j) * i44_biome_share(j,biome44)); + +loop(i, + loop(biome44, + if(i44_biome_area_reg(i,biome44) <= 0, + v44_bii.fx(i,biome44) = 0; + v44_bii_missing.fx(i,biome44) = 0; + else + v44_bii.l(i,biome44) = + sum((cell(i,j),potnatveg,landcover44), vm_bv.l(j,landcover44,potnatveg) * f44_rr_layer(j) * i44_biome_share(j,biome44)) + / i44_biome_area_reg(i,biome44); + ); + ); +); -vm_bv.l(j,landcover44,potnatveg) = 0; +p44_bii_lower_bound(t,i,biome44) = 0; diff --git a/modules/44_biodiversity/bii_target_apr24/presolve.gms b/modules/44_biodiversity/bii_target_apr24/presolve.gms index 5a3ee7f43f..7b1b704cfb 100644 --- a/modules/44_biodiversity/bii_target_apr24/presolve.gms +++ b/modules/44_biodiversity/bii_target_apr24/presolve.gms @@ -23,8 +23,11 @@ else ); p44_bii_lower_bound(t2,i,biome44)$(p44_bii_lower_bound(t2,i,biome44) >= 1) = 1; p44_bii_lower_bound(t2,i,biome44)$(m_year(t2) < s44_start_year) = 0; - p44_bii_lower_bound(t2,i,biome44)$(sum(cell(i,j), f44_biome(j,biome44)*f44_rr_layer(j)) <= 1e-10) = 0; + p44_bii_lower_bound(t2,i,biome44)$(i44_biome_area_reg(i,biome44) <= 0) = 0; * The lower bound of `v44_bii` is set to `p44_bii_lower_bound` to avoid a reduction of BII in combination with `v44_bii_missing`. v44_bii.lo(i,biome44) = p44_bii_lower_bound(t,i,biome44); display p44_bii_lower_bound; ); + +i44_biome_area_reg(i,biome44) = + sum((cell(i,j),land), pcm_land(j,land) * f44_rr_layer(j) * i44_biome_share(j,biome44)); diff --git a/scripts/start/extra/recalibrateH16.R b/scripts/start/extra/recalibrateH16.R index f2d3fa5cd9..79c532c9f2 100644 --- a/scripts/start/extra/recalibrateH16.R +++ b/scripts/start/extra/recalibrateH16.R @@ -17,10 +17,10 @@ source("scripts/start_functions.R") #start MAgPIE run source("config/default.cfg") -cfg$input['regional'] <- "rev4.115_36f73207_magpie.tgz" -cfg$input['validation'] <- "rev4.115_36f73207_validation.tgz" +cfg$input['regional'] <- "rev4.116_36f73207_magpie.tgz" +cfg$input['validation'] <- "rev4.116_36f73207_validation.tgz" cfg$input['calibration'] <- "calibration_H16_27Sep24.tgz" -cfg$input['cellular'] <- "rev4.115_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" +cfg$input['cellular'] <- "rev4.116_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" cfg$results_folder <- "output/:title:" cfg$recalibrate <- FALSE diff --git a/scripts/start/projects/paper_peatlandTax.R b/scripts/start/projects/paper_peatlandTax.R index 43dccf6672..010b09b2cb 100644 --- a/scripts/start/projects/paper_peatlandTax.R +++ b/scripts/start/projects/paper_peatlandTax.R @@ -44,10 +44,10 @@ cfg$repositories <- append( getOption("magpie_repos") ) -cfg$input['regional'] <- "rev4.115_36f73207_magpie.tgz" -cfg$input['validation'] <- "rev4.115_36f73207_validation.tgz" +cfg$input['regional'] <- "rev4.116_36f73207_magpie.tgz" +cfg$input['validation'] <- "rev4.116_36f73207_validation.tgz" cfg$input['calibration'] <- "calibration_H16_27Sep24.tgz" -cfg$input['cellular'] <- "rev4.115_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" +cfg$input['cellular'] <- "rev4.116_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" download_and_update(cfg) ## Create patch file for GHG prices @@ -154,9 +154,9 @@ cfg$gms$s56_c_price_induced_aff <- 0 ## Start scenarios for (res in c("c400")) { if (res == "c400") - cfg$input['cellular'] <- "rev4.115_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" + cfg$input['cellular'] <- "rev4.116_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" else if (res == "c1000") { - cfg$input['cellular'] <- "rev4.115_36f73207_10f98ac1_cellularmagpie_c1000_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" + cfg$input['cellular'] <- "rev4.116_36f73207_10f98ac1_cellularmagpie_c1000_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" } ## Ref scenario cfg$title <- .title(cfg, paste(res, ssp, "Ref", sep = "-")) diff --git a/scripts/start/projects/project_ABCDR.R b/scripts/start/projects/project_ABCDR.R index a36e9c200a..1fb29b8b4a 100644 --- a/scripts/start/projects/project_ABCDR.R +++ b/scripts/start/projects/project_ABCDR.R @@ -19,7 +19,7 @@ source("config/default.cfg") #download_and_update(cfg) # create additional information to describe the runs -cfg$info$flag <- "ABCDR18" +cfg$info$flag <- "ABCDR19" cfg$results_folder <- "output/:title:" cfg$force_replace <- TRUE @@ -31,10 +31,10 @@ cfg$qos <- "standby_highMem_dayMax" .title <- function(cfg, ...) return(paste(cfg$info$flag, sep="_",...)) -cfg$input['regional'] <- "rev4.115_36f73207_magpie.tgz" -cfg$input['validation'] <- "rev4.115_36f73207_validation.tgz" +cfg$input['regional'] <- "rev4.116_36f73207_magpie.tgz" +cfg$input['validation'] <- "rev4.116_36f73207_validation.tgz" cfg$input['calibration'] <- "calibration_H16_27Sep24.tgz" -cfg$input['cellular'] <- "rev4.115_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" +cfg$input['cellular'] <- "rev4.116_36f73207_44a213b6_cellularmagpie_c400_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" ssp <- "SSP2" @@ -54,19 +54,19 @@ for (pol in c("NDC","1p5deg","1p5deg-Diet")) { cfg$title <- .title(cfg, paste(ssp,pol,ifelse(growth==0,"natveg","plant"),paste0("AFS_tree_",sub("\\.","p",as.character(shr*100))),sep="-")) if (pol == "NDC") { cfg <- setScenario(cfg,c(ssp,"NDC","rcp4p5")) - cfg$input['cellular'] <- "rev4.115_36f73207_30c9dc61_cellularmagpie_c400_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" + cfg$input['cellular'] <- "rev4.116_36f73207_30c9dc61_cellularmagpie_c400_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" cfg$gms$c56_mute_ghgprices_until <- "y2150" cfg$gms$c56_pollutant_prices <- paste0("R32M46-", if (ssp=="SSP2") "SSP2EU" else ssp,"-NDC") cfg$gms$c60_2ndgen_biodem <- paste0("R32M46-", if (ssp=="SSP2") "SSP2EU" else ssp,"-NDC") } else if (pol == "1p5deg") { cfg <- setScenario(cfg,c(ssp,"NDC","rcp1p9")) - cfg$input['cellular'] <- "rev4.115_36f73207_bc624950_cellularmagpie_c400_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" + cfg$input['cellular'] <- "rev4.116_36f73207_bc624950_cellularmagpie_c400_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" cfg$gms$c56_mute_ghgprices_until <- "y2030" cfg$gms$c56_pollutant_prices <- paste0("R32M46-", if (ssp=="SSP2") "SSP2EU" else ssp,"-PkBudg650") cfg$gms$c60_2ndgen_biodem <- paste0("R32M46-", if (ssp=="SSP2") "SSP2EU" else ssp,"-PkBudg650") } else if (pol == "1p5deg-Diet") { cfg <- setScenario(cfg,c(ssp,"NDC","rcp1p9","eat_lancet_diet_v1")) - cfg$input['cellular'] <- "rev4.115_36f73207_bc624950_cellularmagpie_c400_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" + cfg$input['cellular'] <- "rev4.116_36f73207_bc624950_cellularmagpie_c400_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1_clusterweight-ba4466a8.tgz" cfg$gms$c56_mute_ghgprices_until <- "y2030" cfg$gms$c56_pollutant_prices <- paste0("R32M46-", if (ssp=="SSP2") "SSP2EU" else ssp,"-PkBudg650") cfg$gms$c60_2ndgen_biodem <- paste0("R32M46-", if (ssp=="SSP2") "SSP2EU" else ssp,"-PkBudg650") diff --git a/scripts/start/projects/project_EAT2p0.R b/scripts/start/projects/project_EAT2p0.R index fdc7042f28..40763095df 100644 --- a/scripts/start/projects/project_EAT2p0.R +++ b/scripts/start/projects/project_EAT2p0.R @@ -90,7 +90,7 @@ bau <- function(cfg) { cfg$gms$c60_2ndgen_biodem <- "R21M42-SSP2-NPi" # default # Climate Change - cfg$input["cellular"] <- "rev4.115EL2_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz" + cfg$input["cellular"] <- "rev4.116EL2_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz" return(cfg) }