diff --git a/CHANGELOG.md b/CHANGELOG.md index 80b90cc14..8a2948f3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### fixed - **21_trade** included trade costs into exo realization +- **default.cfg** input data upgraded to rev4.120 to use corrected clusters using aligned population data ## [4.11.0] - 2025-07-11 diff --git a/config/default.cfg b/config/default.cfg index 9c57fa92a..36593ef28 100644 --- a/config/default.cfg +++ b/config/default.cfg @@ -22,11 +22,11 @@ cfg$model <- "main.gms" #def = "main.gms" #### input settings #### # which input data sets should be used? -cfg$input <- c(regional = "rev4.119_h12_magpie.tgz", - cellular = "rev4.119_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz", - validation = "rev4.119_h12_validation.tgz", +cfg$input <- c(regional = "rev4.120_h12_magpie.tgz", + cellular = "rev4.120_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz", + validation = "rev4.120_h12_validation.tgz", additional = "additional_data_rev4.63.tgz", - calibration = "calibration_H12_FAO_13Mar25.tgz") + calibration = "calibration_H12_FAO_13Aug25.tgz") # NOTE: It is recommended to recalibrate the model when changing cellular input data # as well as for any other setting that would affect initial values in the model, diff --git a/config/projects/scenario_config_el2.csv b/config/projects/scenario_config_el2.csv index 41898f4b1..e7bfd874e 100644 --- a/config/projects/scenario_config_el2.csv +++ b/config/projects/scenario_config_el2.csv @@ -20,5 +20,5 @@ gms$s15_alc_scen;0;0;0 gms$c30_bioen_water;all;all;all gms$factor_costs;sticky_labor;sticky_labor;sticky_labor gms$c70_feed_scen;ssp1;ssp2;ssp2 -input['cellular'];rev4.119EL2_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz;; +input['cellular'];rev4.120EL2_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 cb9de3193..7efcf03a9 100644 --- a/config/projects/scenario_config_fsec.csv +++ b/config/projects/scenario_config_fsec.csv @@ -76,8 +76,8 @@ 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.119_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.119_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.119_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.119_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.119_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.119_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.119_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;; -input['regional'];rev4.119_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -input['validation'];rev4.119_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -input['calibration'];calibration_FSEC_FAO_03Feb25.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['cellular'];rev4.120_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.120_FSEC_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.120_FSEC_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;;rev4.120_FSEC_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.120_FSEC_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.120_FSEC_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.120_FSEC_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;; +input['regional'];rev4.120_FSEC_magpie.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['validation'];rev4.120_FSEC_validation.tgz;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +input['calibration'];calibration_FSEC_FAO_14Aug25.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 8701c8c1b..9d6280437 100755 --- a/config/scenario_config.csv +++ b/config/scenario_config.csv @@ -77,4 +77,4 @@ gms$c60_biodem_level;;;;;;;;;;;;;;;;;;;;;;;;1;0;;;;;;;;;;;; gms$c60_res_2ndgenBE_dem;;;;ssp1;ssp2;ssp3;ssp4;ssp5;sdp;ssp2;sdp;sdp;sdp;;;;;;;;;;;;;;;;;;;;;;;; gms$c70_feed_scen;;;;ssp1;ssp2;ssp3;ssp4;ssp5;ssp1;ssp5;ssp1;ssp1;ssp2;;;;;;;;;;;;;;;;;;;;;;;; gms$s73_timber_demand_switch;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1;1;0;;;;;; -input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.119_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.119_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.119_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.119_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.119_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.119_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz +input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.120_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.120_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.120_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.120_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.120_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.120_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz diff --git a/core/sets.gms b/core/sets.gms index ad763baf8..eca90f739 100644 --- a/core/sets.gms +++ b/core/sets.gms @@ -55,32 +55,32 @@ sets VEN, VGB, VIR, VNM, VUT, WLF, WSM, YEM, ZAF, ZMB, ZWE / j number of LPJ cells - / CAZ_1*CAZ_15, - CHA_16*CHA_37, - EUR_38*EUR_47, - IND_48*IND_54, - JPN_55*JPN_58, - LAM_59*LAM_85, - MEA_86*MEA_105, - NEU_106*NEU_114, - OAS_115*OAS_130, - REF_131*REF_152, - SSA_153*SSA_184, - USA_185*USA_200 / + / CAZ_1*CAZ_5, + CHA_6*CHA_24, + EUR_25*EUR_36, + IND_37*IND_48, + JPN_49*JPN_55, + LAM_56*LAM_88, + MEA_89*MEA_113, + NEU_114*NEU_121, + OAS_122*OAS_137, + REF_138*REF_149, + SSA_150*SSA_182, + USA_183*USA_200 / cell(i,j) number of LPJ cells per region i - / CAZ . (CAZ_1*CAZ_15) - CHA . (CHA_16*CHA_37) - EUR . (EUR_38*EUR_47) - IND . (IND_48*IND_54) - JPN . (JPN_55*JPN_58) - LAM . (LAM_59*LAM_85) - MEA . (MEA_86*MEA_105) - NEU . (NEU_106*NEU_114) - OAS . (OAS_115*OAS_130) - REF . (REF_131*REF_152) - SSA . (SSA_153*SSA_184) - USA . (USA_185*USA_200) / + / CAZ . (CAZ_1*CAZ_5) + CHA . (CHA_6*CHA_24) + EUR . (EUR_25*EUR_36) + IND . (IND_37*IND_48) + JPN . (JPN_49*JPN_55) + LAM . (LAM_56*LAM_88) + MEA . (MEA_89*MEA_113) + NEU . (NEU_114*NEU_121) + OAS . (OAS_122*OAS_137) + REF . (REF_138*REF_149) + SSA . (SSA_150*SSA_182) + USA . (USA_183*USA_200) / i_to_iso(i,iso) mapping regions to iso countries / CAZ . (AUS, CAN, HMD, NZL, SPM) diff --git a/main.gms b/main.gms index a61d2c8df..06f532a49 100644 --- a/main.gms +++ b/main.gms @@ -154,7 +154,7 @@ $title magpie * * Number of cells per region: * CAZ CHA EUR IND JPN LAM MEA NEU OAS REF SSA USA -* 15 22 10 7 4 27 20 9 16 22 32 16 +* 5 19 12 12 7 33 25 8 16 12 33 18 * * Regionscode: 62eff8f7 *###################### R SECTION END (VERSION INFO) ###########################