From 875028e36a0cd89ddf81b80453ac0c419bd4a09b Mon Sep 17 00:00:00 2001 From: Singh Date: Fri, 6 Sep 2024 17:00:42 +0530 Subject: [PATCH 1/8] Changed water equation and add start script --- main.gms | 12 ++++----- modules/11_costs/default/equations.gms | 2 +- scripts/start/waterTestDefault.R | 34 ++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 scripts/start/waterTestDefault.R diff --git a/main.gms b/main.gms index b3dc7e93f..6817d2533 100644 --- a/main.gms +++ b/main.gms @@ -150,20 +150,19 @@ $title magpie * * Used data set: rev4.109_h12_magpie.tgz * md5sum: NA -* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output +* Repository: https://rse.pik-potsdam.de/data/magpie/public * * Used data set: rev4.109_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz * md5sum: NA -* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output +* Repository: https://rse.pik-potsdam.de/data/magpie/public * * Used data set: rev4.109_h12_validation.tgz * md5sum: NA -* Repository: scp://cluster.pik-potsdam.de/p/projects/rd3mod/inputdata/output +* Repository: https://rse.pik-potsdam.de/data/magpie/public * -* Used data set: additional_data_rev4.50.tgz +* Used data set: additional_data_rev4.51.tgz * md5sum: NA * Repository: https://rse.pik-potsdam.de/data/magpie/public - * * Used data set: calibration_H12_26Mar24.tgz * md5sum: NA @@ -196,8 +195,7 @@ $title magpie * * Call: withCallingHandlers(expr, message = messageHandler, warning = warningHandler, error = errorHandler) * * -* Last modification (input data): Tue Jun 18 09:52:31 2024 - +* Last modification (input data): Fri Sep 6 16:05:34 2024 * *###################### R SECTION END (VERSION INFO) ########################### diff --git a/modules/11_costs/default/equations.gms b/modules/11_costs/default/equations.gms index c3d758a20..f032c9171 100644 --- a/modules/11_costs/default/equations.gms +++ b/modules/11_costs/default/equations.gms @@ -40,7 +40,7 @@ + sum(cell(i2,j2), vm_cost_cropland(j2)) + sum(cell(i2,j2),vm_cost_bv_loss(j2)) + sum(cell(i2,j2),vm_cost_urban(j2)) - + sum(cell(i2,j2),vm_water_cost(i2)) + + vm_water_cost(i2) ; *' The total regional production cost calculation is based on the sum of different diff --git a/scripts/start/waterTestDefault.R b/scripts/start/waterTestDefault.R new file mode 100644 index 000000000..a0f1d479e --- /dev/null +++ b/scripts/start/waterTestDefault.R @@ -0,0 +1,34 @@ +#description: Pumping cost implementation for India (11_cost>default>equations.gms updated manually) + +# Load start_run(cfg) function which is needed to start MAgPIE runs +library(gms) +library(magclass) +library(gdx2) +library(luscale) +library(magpie4) +source("scripts/start_functions.R") +source("config/default.cfg") + +codeCheck <- FALSE + +## Basic settings: + +basic_settings <- function(title) { + + source("config/default.cfg") + + cfg$force_download <- FALSE + cfg$info$flag <- "060924" + cfg$title <- paste(cfg$info$flag,title,sep="_") + cfg$results_folder <- "output/:title:" + cfg$recalibrate <- FALSE + return(cfg) +} + + +cfg <- basic_settings(title = "WaterTestBug") + +# * Switch to activate pumping costs (only available for India currently), Set to 1 if want to use for India +cfg$gms$s42_pumping <- 1 # def = 0 + +start_run(cfg, codeCheck=FALSE) From d669334fa70f491ca8d031929771af6289e20a08 Mon Sep 17 00:00:00 2001 From: Singh Date: Mon, 9 Sep 2024 15:55:22 +0530 Subject: [PATCH 2/8] Need to change multiplier value also to 1 for pumping cost to work --- scripts/start/waterTestDefault.R | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/start/waterTestDefault.R b/scripts/start/waterTestDefault.R index a0f1d479e..572f867cb 100644 --- a/scripts/start/waterTestDefault.R +++ b/scripts/start/waterTestDefault.R @@ -30,5 +30,6 @@ cfg <- basic_settings(title = "WaterTestBug") # * Switch to activate pumping costs (only available for India currently), Set to 1 if want to use for India cfg$gms$s42_pumping <- 1 # def = 0 +cfg$gms$s42_multiplier <- 1 # def = 0 start_run(cfg, codeCheck=FALSE) From dad292d859eb8552b9d58fff964728da0a62ca61 Mon Sep 17 00:00:00 2001 From: Singh Date: Mon, 9 Sep 2024 16:04:32 +0530 Subject: [PATCH 3/8] Updated with develop --- scripts/start/waterTestDefault.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/start/waterTestDefault.R b/scripts/start/waterTestDefault.R index 572f867cb..2b493c0d0 100644 --- a/scripts/start/waterTestDefault.R +++ b/scripts/start/waterTestDefault.R @@ -17,7 +17,7 @@ basic_settings <- function(title) { source("config/default.cfg") - cfg$force_download <- FALSE + cfg$force_download <- TRUE cfg$info$flag <- "060924" cfg$title <- paste(cfg$info$flag,title,sep="_") cfg$results_folder <- "output/:title:" From 9b25c761a21b91a9fa86e54d3d78e4426e728600 Mon Sep 17 00:00:00 2001 From: VartikaSingh Date: Wed, 11 Sep 2024 06:15:12 +0200 Subject: [PATCH 4/8] Updated test start script --- scripts/start/waterTestDefault.R | 35 -------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 scripts/start/waterTestDefault.R diff --git a/scripts/start/waterTestDefault.R b/scripts/start/waterTestDefault.R deleted file mode 100644 index 2b493c0d0..000000000 --- a/scripts/start/waterTestDefault.R +++ /dev/null @@ -1,35 +0,0 @@ -#description: Pumping cost implementation for India (11_cost>default>equations.gms updated manually) - -# Load start_run(cfg) function which is needed to start MAgPIE runs -library(gms) -library(magclass) -library(gdx2) -library(luscale) -library(magpie4) -source("scripts/start_functions.R") -source("config/default.cfg") - -codeCheck <- FALSE - -## Basic settings: - -basic_settings <- function(title) { - - source("config/default.cfg") - - cfg$force_download <- TRUE - cfg$info$flag <- "060924" - cfg$title <- paste(cfg$info$flag,title,sep="_") - cfg$results_folder <- "output/:title:" - cfg$recalibrate <- FALSE - return(cfg) -} - - -cfg <- basic_settings(title = "WaterTestBug") - -# * Switch to activate pumping costs (only available for India currently), Set to 1 if want to use for India -cfg$gms$s42_pumping <- 1 # def = 0 -cfg$gms$s42_multiplier <- 1 # def = 0 - -start_run(cfg, codeCheck=FALSE) From 84546b8b803f27bf8028da7dc75fb9b0f7eab599 Mon Sep 17 00:00:00 2001 From: Singh Date: Mon, 23 Sep 2024 15:45:55 +0530 Subject: [PATCH 5/8] Removed start test script for water bug --- scripts/start/waterTestDefault.R | 35 -------------------------------- 1 file changed, 35 deletions(-) delete mode 100644 scripts/start/waterTestDefault.R diff --git a/scripts/start/waterTestDefault.R b/scripts/start/waterTestDefault.R deleted file mode 100644 index 2b493c0d0..000000000 --- a/scripts/start/waterTestDefault.R +++ /dev/null @@ -1,35 +0,0 @@ -#description: Pumping cost implementation for India (11_cost>default>equations.gms updated manually) - -# Load start_run(cfg) function which is needed to start MAgPIE runs -library(gms) -library(magclass) -library(gdx2) -library(luscale) -library(magpie4) -source("scripts/start_functions.R") -source("config/default.cfg") - -codeCheck <- FALSE - -## Basic settings: - -basic_settings <- function(title) { - - source("config/default.cfg") - - cfg$force_download <- TRUE - cfg$info$flag <- "060924" - cfg$title <- paste(cfg$info$flag,title,sep="_") - cfg$results_folder <- "output/:title:" - cfg$recalibrate <- FALSE - return(cfg) -} - - -cfg <- basic_settings(title = "WaterTestBug") - -# * Switch to activate pumping costs (only available for India currently), Set to 1 if want to use for India -cfg$gms$s42_pumping <- 1 # def = 0 -cfg$gms$s42_multiplier <- 1 # def = 0 - -start_run(cfg, codeCheck=FALSE) From 8dc7d4642fc70f08938a3d9809833b45066e989b Mon Sep 17 00:00:00 2001 From: Singh Date: Tue, 24 Sep 2024 17:05:15 +0530 Subject: [PATCH 6/8] Updated change log --- CHANGELOG.md | 328 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 194 insertions(+), 134 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ecf219d9..e36ae321d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,10 +3,10 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - -## [Unreleased] +## [Unreleased][Unreleased] ### changed + - **config** The default realization for the 38_factor_costs module was switched to `sticky_feb18`. In this realization, capital stocks and their depreciation are tracked, giving some inertia to random relocation of production, improving high resolution outputs. - **21_trade** refactor equations for enhanced readablility and improve documentation - **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. @@ -26,9 +26,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** `.nc` files are no longer created by default after disaggregation - **config** `cfg$gms$land_snv`changed from "secdforest, forestry, past, other" to "secdforest, other" - **config** Submissions with high memory requirements now get 16 CPUs and 80GB of memory to account for the new specifications of PIK's new HPC 'Foote'. `maxMem` was renamed to `highMem`, because 80GB of memory does not correspond to the maximum available memory of a compute node. - +- **11_costs** changed equation to fix bug in total water cost calculation ### added + - **scripts** added output script converting all grid-level .mz files to .nc (netCDF) - **scripts** added output report `EU_report.R` that uses `EU_report.Rmd` - **scripts** added out of bounds check as output script @@ -45,17 +46,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### removed - ### fixed + - **scripts** fixing an error in start.R and output.R which occurred if more than one slurm job was submitted at the same time. - **15_food** fixing parameter declaration of i15_processed_kcal_structure_iso - **80_optimization** bugfix for variables levels not obeying the bounds in nlp_par, `conopt` changed to `conopt3` - **35_natveg** bugfix secdforest and other land restoration to avoid double-counting of restoration in equation `q29_land_snv` - -## [4.8.1] - 2024-06-19 +## [4.8.1][4.8.1] - 2024-06-19 ### changed + - **29_ageclass** module 29_ageclass has been renamed to 28_ageclass to make space for `29_cropland` just before `30_croparea` - **30_crop** module `30_crop` renamed to `30_croparea`, which now only accounts for crop area. - **30_crop** Semi-Natural Vegetation (SNV) implementation has been moved from `30_crop` to `29_cropland` @@ -66,25 +67,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** updated EL2p0 start scripts ### added + - **10_land** added interface `pm_land_hist` with historic land use patterns - **29_cropland** new module `29_cropland` accounting for crop area, fallow cropland and tree cover on cropland with two realizations: `detail_apr24` and `simple_apr24` (default). - **42_water_demand** added non-agricultural water demand for entire year ### removed + - **32_forestry** removed technical balance term `v32_land_missing_ndc` ### fixed + - **22_land_conservation** avoid infeasibilities due to very small numbers, account for cropland tree cover and lower bound of cropland - **32_forestry** avoid infeasibilities due to very small numbers - **35_natveg** avoid infeasibilities due to very small numbers - **44_biodiversity** Fixing to SSP2 parameters until 2025 was not working - **config** update to input data rev4.109. In the previous rev4.108, MER GDP was wrong and was identical to PPP GDP - - -## [4.8.0] - 2024-06-10 +## [4.8.0][4.8.0] - 2024-06-10 ### changed + - **14_yields** revised timber yield calculations - **15_food, default.cfg and scenario_config.csv** changed fader setup and introduced new switches for specifying food substitution scenarios and exogeneous food intake scenarios - **22_land_conservation and default.cfg** Added options for baseline protection @@ -104,6 +107,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** start/test_runs.R added 2 more test runs from FSEC ### added + - **15_food** added additional sigmoid food substition scenarios `sigmoid_75pc_25_50`, `sigmoid_50pc_25_50` and `sigmoid_25pc_25_50` - **21_trade** Minimum trade margin for forestry products `s21_min_trade_margin_forestry` - **30_crop** added regional cropland equation `q30_crop_reg` and presolve growth constraint @@ -120,9 +124,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added "checkSummation" output script for consistency checking a report.mif - **scripts** added automatic set writer for new bioenergy realization to `start_functions` - **scripts** added start scripts for the GENIE project -`s60_bioenergy_price_2nd`, `c60_price_implementation` + `s60_bioenergy_price_2nd`, `c60_price_implementation` ### removed + - **14_yields** removed interface `pm_timber_yield_initial` - **21_trade** removed interface `pm_selfsuff_ext`, removed `v21_manna_from_heaven` - **32_forestry** removed interface `pm_representative_rotation` @@ -133,6 +138,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/output/extra** removed scripts disaggregation_cropsplit and disaggregation_transitions ### fixed + - **14_yields** fix division by zero in preloop of managementcalib_aug19 - **44_biodiversity** avoid division by zero - **58_peatland** Added balance variable to avoid random infeasibilites @@ -143,10 +149,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/start/test_runs.R** include all default output script, in particular disaggregation.R, which is needed for BII - **start/projects/fsec.R** scenario settings - -## [4.7.3] - 2024-04-12 +## [4.7.3][4.7.3] - 2024-04-12 ### changed + - **21_trade** Revision of trade module. Replaced `cfg$gms$s21_trade_bal_damper` in favour of `cfg$gms$k_import21`, which allows for additional imports to maintain feasibility - **21_trade** v21_import_for_feasibility now available for all countries, not just for importers - **70_livestock** if `c70_fac_req_regr` is set to `reg`: use of USDA/FAO values for historic factor requirements for livestock instead of using regression values and change of calibration year from 2005 to 2010 for regional factor requirements regression @@ -157,6 +163,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/calibration/landconversion_cost.R** Revised calibration approach for conversion costs for cropland. Information from all calibration time steps in combination with a lowpass filter is now used for deriving the calibration factors, which avoids the previous zickzack pattern. The previous option `cfg$damping_factor_landconversion_cost` has been removed in favor of `cfg$lowpass_filter_landconversion_cost`. ### added + - **14_yields** added minimum threshold for wood yields. Below this threshold, wood yields are set to zero. - **config** added switch for minimum timber yields - **56_ghg_policy** added NDC scenarios @@ -164,16 +171,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** start script for EAT2p0 Deep Dive project ### fixed + - **15_food** Small number rather 0 in condition checking calorie balancing - **34_urban** `static` realization was not working because `vm_carbon_stock` was referenced without the set `stockType` - **52_carbon** removing jump of carbon content into fully grown forest when a forest changes from second-last age class to last age-class. - **58_peatland** Equation `q58_scalingFactorExp` revised to avoid division by zero. - **80_optimization** duplicated solve statement in all instances to avoid non-matchting left- and right-hand sides of equations - -## [4.7.2] - 2024-04-02 +## [4.7.2][4.7.2] - 2024-04-02 ### changed + - **21_trade** Revision of trade module. Replaced `cfg$gms$s21_trade_bal_damper` in favour of `cfg$gms$k_import21`, which allows for additional imports to maintain feasibility - **58_peatland** Threshold in equations changed from 1e-10 to 1e-8 to avoid rare divisions by zero - **70_livestock** if `c70_fac_req_regr` is set to `reg`: use of USDA/FAO values for historic factor requirements for livestock instead of using regression values and change of calibration year from 2005 to 2010 for regional factor requirements regression @@ -181,22 +189,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** modified output reporting for SEALS to account for forestry plantations ### added + - **30_crop** Improved representation of cropland requiring relocation in response to introducing semi-natural habitat at the 1 km level based on high-resolution satellite imagery. - **config** added `.codeCheck` with additonal configuration when running `gms::codeCheck` - **scripts** add additional BII reporting variables in FSDP_collect.R - **scripts** added a new validation_cell.R output script that generates a pdf with the comparison of magpie land use and crop type outputs with LUH and MAPSPAM historical data at cellular resolution. ### removed + - **core** removed no longer needed set `si` Suitability classes ### fixed + - **52_carbon** i52_land_carbon_sink was not identical before 2020 for different RCPs. Fixed by setting to RCPBU until the year defined in sm_fix_cc. - **inputdata** currency fixed in historic value of production for crops and livestock which affects e.g. total labor costs and in turn hourly labor costs, bugfix in aggregation weight of capital cost share out of factor costs - -## [4.7.1] - 2024-02-28 +## [4.7.1][4.7.1] - 2024-02-28 ### changed + - **15_food** Added improved EAT Lancet diet implementation (EAT 2p0) - **21_trade** s21_trade_bal_damper for roundwood changed from 0.75 to 0.65 - **31_past** in grasslands_apr22 realization: changed structure of f31_pastr_suitability to align with ssp-rcp specific input data formulation. Changed input filename from cs3 to cs2. Added `cc`, `nocc` and `nocc_hist` options for `i31_manpast_suit` and changed input gams code from table to parameter. Climate scenario assignment moved from preloop.gms to input.gms. Removed pastSuit set in sets.gms as not needed anymore. Adjusted not_used.txt in both grasslands_apr22 and static realizations. @@ -212,16 +223,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **start_functions** Check if cfg$recalibrate is consistent with cfg$gms$s14_use_yield_calib ### added + - **32_forestry** new interfaces `vm_land_forestry`, `pcm_land_forestry` `vm_landexpansion_forestry` and `vm_landreduction_forestry` - **56_ghg_policy_** added new trajectories for R32M46 - **60_bioenergy** added new trajectories for R32M46 - **scripts** added peatland to output/extra/disaggregation.R ### removed + - **58_peatland** removed realization "on" - **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. ### fixed + - **21_trade** introduced s21_manna_from_heaven for fixing v21_manna_from_heaven to zero. Without fixing to zero, v21_manna_from_heaven was used unnecessarily in runs started with highres.R - **32_forestry** bugfix unit p32_observed_gs_reg - **32_forestry** keep c-density for timber plantations constant after rotation length to avoid unrealistic carbon sequestration in unharvested timber plantation @@ -234,10 +248,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** fixed memory spike leading to crashes in disaggregation.R - **scripts** fixed writing of NetCDF files in output/reportMAgPIE2SEALS.R - -## [4.7.0] - 2023-12-11 +## [4.7.0][4.7.0] - 2023-12-11 ### changed + - **14_yields_and_config** The new default is to not use yield calibration factors from a calibration run. The switch s14_use_yield_calib can optionally reenable the use of yield calibration factors. - **36_employment** regression between hourly labor regression and GDP pc changed from linear to log-log - **inputdata** Now using inputdata rev4.94 which is based on 67420 cells (67k, previously 59k) @@ -245,56 +259,61 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** LUH2_disaggregation output script was modified. Specifically, flooded area was made compatible with the LUH definition, cropland and grazing land were added to the states.nc file, and specific naming/details (datatype, zname, xname, and yname) were added when creating the .nc files. ### added + - **14_yields/config** Added option for considering impacts of land degradation on yields. If `s14_degradation` is switched to 1, MAgPIE will include cluster-specific information on the state of nature's contributions to people relevant for yields `./modules/14_yields/input/f14_yld_ncp_report.cs3`. - **18_residues** Included cluster-level residue realization, for cluster-level production of residues (but balancing of recycling and burning budgets remains at region-level, for computational lightness) - **32_forestry** new interface `vm_land_forestry` - **58_peatland** added realization "v2" with updated peatland map and GHG emission factors ### fixed + - **inputdata** There was a major bug (related to proj/terra) in the rev4.91 inputdata that was fixed with rev4.92 - **inputdata** There was another bug (terra default na.rm changed) in the inputdata that was fixed with rev4.93 - **scripts** Fixed a bug in NPI/NDC calculations leading to missing AD policies when run with 67k - -## [4.6.11] - 2023-09-05 +## [4.6.11][4.6.11] - 2023-09-05 ### changed + - **scripts** All time steps between 2015 and 2050 are now reported to SEALS ### fixed -- **70_livestock** fixed division by zero that could occur depending on the scenario set-up +- **70_livestock** fixed division by zero that could occur depending on the scenario set-up -## [4.6.10] - 2023-08-16 +## [4.6.10][4.6.10] - 2023-08-16 ### changed + - **config** update preprocessing to newest input data v4.88 with new transport costs - **GitHub action** the github action is now faster, because it installs binary packages from Posit Package Manager - **scenario_config.csv** update preprocessing to newest input data v4.88 - **scripts** output.R is now faster, because it no longer searches runfolder renvs for full.gms files ### fixed + - **scripts** check_config does not warn about c_input_gdx_path anymore while running empty model - **scripts** fixed erronoeous if clause in output.R - **scripts** fixed output/extra/disaggregation_LUH2.R. The script was not working any more because magpie4::protectedArea was changed to return protected area for all land types. Moreover, the script now also works for runs without dynamic forestry (default run) but with a warning message. - -## [4.6.9] - 2023-07-27 +## [4.6.9][4.6.9] - 2023-07-27 ### fixed + - **70_livestock** consideration of milk demand in the calculation of the pasture management factor - **scripts** Fixed inaccuracies and inconsistent application of SNV policies during disaggregation in luscale::interpolateAvlCroplandWeighted(), which is called in extra/disaggregation.R - -## [4.6.8] - 2023-07-17 +## [4.6.8][4.6.8] - 2023-07-17 ### changed + - **41_area_equipped_for_irrigation** new AEI data (Mehta2022) replacing old Siebert data - **80_optimization** printing of solprint when solver status is 7 re-activated - **scripts** start_functions.R can now handle clusters per region flexibly - **scripts** the REMIND-MAgPIE coupling now uses renv ### added + - **31_past** added `cc`, `nocc` and `nocc_hist` options for `c31_past_suit_scen` and `c31_grassl_yld_scenario` - **32_carbon** added `nocc` and `nocc_hist` option for `c52_land_carbon_sink_rcp` - **71_disagg_lvst** added new realisation `foragebased_jul23` which solves GAMS issues at higher spatial resolutions @@ -304,20 +323,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** New output script for reporting disaggregated land use patterns to the SEALS (Spatial Economic Allocation Landscape Simulator) downscaling model ### removed + - **config** `s80_num_nonopt_allowed` - **scripts** removed .snapshot.Rprofile and the Rprofile.R script, renv now fully supersedes snapshots ### fixed + - **30_crop** corrected q30_cropland in module realization rotation_apr22, where fallow land was on the wrong side of the equation - **71_disagg_lvst** reworked `foragebased_aug18` (including removal of linear version and correction of balance flow calculation) - **80_optimization** resolve was not working in nlp_par realization due to `s80_num_nonopt_allowed` - **config** corrected wrong names of parameters for peatland costs - **config** updated scenario configs to newest preprocessing (4.87) - -## [4.6.7] - 2023-05-10 +## [4.6.7][4.6.7] - 2023-05-10 ### changed + - **09_drivers** Harmonization of sets for population, gdp, pal and demography - **56_ghg_policy** added emission policies without GHG emissions from peatlands - **config** added scenario `SSP2EU` in scenario_config.csv @@ -328,20 +349,21 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** NDC/NPI calculations can now handle 59k and 67k cell inputs ### added -- **15_food** added an option in `s15_exo_diet` to allow for exogenous diet scenario for India +- **15_food** added an option in `s15_exo_diet` to allow for exogenous diet scenario for India -## [4.6.6] - 2023-05-10 +## [4.6.6][4.6.6] - 2023-05-10 ### changed + - **config** updated scenario_fsec.csv to reflect new GST validation - **scripts** included new output indicator for water - **scripts** updated global surface temperature maps to new RCPs per scenario - -## [4.6.5] - 2023-03-29 +## [4.6.5][4.6.5] - 2023-03-29 ### changed + - **22_land_conservation** Replaced old options for land conservation by new conservation priority areas. These include among others a new 30by30 template (based on Key Biodiversity Areas, unprotected habitat in Biodiversity Hotspots, Ecoregions with a high beta-diversity from the Global Safety Net (Dinerstein et al. 2020) and critical connectivity areas (Brennan et al. 2022), a new Half Earth template based on the Global Safety Net (Dinerstein et al. 2020) and land conservation of irrecoverable carbon (Noon et al. 2022). - **56_ghg_policy** renamed `cfg$mute_ghgprices_until` to `cfg$gms$c56_mute_ghgprices_until` and changed the default to `y2030`, i.e. no GHG emission pricing in the AFOLU sector before (and including) 2030. This setting will be also used in coupled REMIND-MAgPIE runs. - **config** input data revision to rev4.82 to include new conservation priority areas @@ -351,23 +373,26 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** Disaggregation of land use to 0.5° now takes land conservation into account - i.e. cropland expansion is not mapped to areas that are subject to land conservation ### added + - **56_ghg_policy** added switch `s56_minimum_cprice` - **config** minimum CO2 price (`s56_minimum_cprice`) of 5 USD per tCO2 (18 USD per tC) for all future time steps in case of NDC policy to guide land-use decisions - **scripts** added output script which writes landuse data on cluster resolution to a shapefile ### removed + - **56_ghg_policy** removed `s56_ghgprice_phase_in` and `s56_ghgprice_start` - **scripts** removed argument `mute_ghgprices_until`, now handeld in GAMS code ### fixed + - **31_past** fixed pasture suitability to SSP2 before and including 2020 (only relevant for grassland implementation) - **56_ghg_policy** the renamed switch `c56_mute_ghgprices_until` is now always used for coupled as well as standalone runs. - **scripts** Fixed occasional memory failure in the disaggregation script - -## [4.6.4] - 2023-02-22 +## [4.6.4][4.6.4] - 2023-02-22 ### changed + - **15_food** Interpret EAT-Lancet guidelines not as target but as lower/upper limits - **config** changed order of output scripts. Some functions in rds_report require gridded outputs. - **config** input data revision to rev4.81 for trade margin bugfix @@ -382,6 +407,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **sticky_labor** renamed equation `q38_labor_capital_ratio` to `q38_labor_share_target` ### added + - **15_food** half_overweight scenario added - **21_trade** New Bilateral trade realization selfsuff_reduced_bilat22 for bilateral trade within selffsuff constraints - **32_forestry** added switch `s32_aff_prot` for protection of afforested areas (0=until end of planning horizon 1=forever) @@ -394,9 +420,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **sticky_labor** `nl_fix`, `nl_relax` and `nl_release` added ### removed + - **42_water_demand** removed fm_multicropping factor because of fallow inconsistency ### fixed + - **14_yields** nl_fix updated to current equation - **32_forestry** pm_land_conservation(t,j,"secdforest","restore") now accounts for the rotation length in timber plantations to avoid infeasibilities - **44_biodiversity** added regional layer `i` in `bii_target` realisation to make it compatible with the high-resolution parallel optimization output script @@ -404,10 +432,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** fixed a bug where renvs for high resolution runs were missing some packages - **scripts** fixed in the calc_calib.R script the saving of calib_factors used in each iteration to ensure that they correspond to the divergence reported. Changed divergence from zero to NA for those iterations where calib_factors are above the limit. The best_calib selection criterion was changed from selecting the factors of the iteration with the lowest standard deviation to the selection, for each region, of the factor of the iteration with the lowest divergence. Also, factors from the first iteration are now not considered, and if two different factors had the same divergence for a region, the one of the latest iteration is picked. - -## [4.6.3] - 2023-01-19 +## [4.6.3][4.6.3] - 2023-01-19 ### changed + - **15_food** changed `anthro_iso_jun22` realisation such that results in case of `exo_diet = 1/0` and `exo_waste = 1/0` are identical until 2020 - **30_crop** identical assumptions for bioenergy until 2020 - **38_factor_costs** changed name of set `req` to `factors` (also used in 11_costs, 57_maccs, 70_livestock) @@ -418,17 +446,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **config** update input data to rev4.79 ### added + - **31_past** added additional limitation (single climate scenario input) for **grasslands_apr22** - **59_som** added new **cellpool_jan23** realization with updated 2019 IPCC guidelines values - **scripts** added start script which starts an empty model just regenerating a previous run ### fixed -- **scripts** make sure that `c_title` in the GAMS code is not containing dots which otherwise could lead to compilation errors +- **scripts** make sure that `c_title` in the GAMS code is not containing dots which otherwise could lead to compilation errors -## [4.6.2] - 2023-01-12 +## [4.6.2][4.6.2] - 2023-01-12 ### changed + - **36_employment** include labor costs from MACCs in employment - **38_factor_cots** renamed `p36_cost_shares` to `pm_cost_share_crops` - **57_maccs** split costs into labor and capital @@ -437,15 +467,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** FSDP_collect FSDP_process fsec.R updates ### added + - **renv** MAgPIE now runs in an isolated, stable, reproducible R package environment - **scripts** added output script that generates a short mif containing only variables relevant for the REMIND coupling - **scripts** added output script that generates subnational validation outputs for fable_India projects - **setup** required R packages are automatically installed - -## [4.6.1] - 2022-12-13 +## [4.6.1][4.6.1] - 2022-12-13 ### changed + - **42_water_demand** replaced `f42_env_flow_policy` with macro - **30_crop** replaced `f30_scenario_fader` with macro - **30_crop/config** changed switch `c30_rotation_scenario_speed` to `s30_rotation_scenario_target` @@ -453,6 +484,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **config** changed default value for `c30_marginal_land` from `'all_marginal'` to `'q33_marginal'` for better spatial cropland patterns ### added + - **10_land** added `vm_lu_transitions` as interface - **10_land** added interface `fm_land_iso` for consistency - **30_crop/config** added switch `s30_rotation_scenario_start` @@ -461,6 +493,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **39_landconversion** scalar `s39_reward_crop_reduction` provides a cropland reduction reward ### removed + - **10_land** removed `feb15` realization - **10_land** removed the interfaces `vm_croplandexpansion` and `vm_croplandreduction` - **30_crop** removed `f30_scenario_fader.csv`input @@ -469,14 +502,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** removed remind2::deletePlus in coupling interface of start_function ### fixed + - **59_som** fixed land use change tracking for non-cropland pools in the `cellpool_aug16` realization - **config** changed default value for s56_limit_ch4_n2o_price from 1000 to 4000 for consistency with c57_macc_version = "PBL_2022" - **scripts** rewrite of land conversion cost calibration script `landconversion_cost.R` - -## [4.6.0] - 2022-11-09 +## [4.6.0][4.6.0] - 2022-11-09 ### changed + - **18_residues** bugfix in `q18_cost_prod_res` - **36_employment** included calculations for minimum wage scenario - **38_factor_costs** included labor cost scaling in case of wage scenario @@ -513,6 +547,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/start** cleanup of old start scripts ### added + - **14_yields** added input file containing AQUASTAT yield calibration factors and switch `s14_calib_ir2rf` in default.cfg to activate this yield calibration - **15_food** added new realization with country level exogenous diets, product-specific intake estimates, new scenarios for exogenous BMI and decomposition switches for EAT Lancet diets. Simplified code and improved iteration procedure. - **50_nr_soil_budget** new module realization for more consistent MACCs implementation. change of interface from vm_btm_reg to vm_emissions_reg @@ -534,6 +569,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added water output script for FSEC model runs ### removed + - **15_food** removed read-in of non-needed input file "f15_calib_factor_FAOfsupply_iso" - **38_factor_costs** removed `mixed_reg_feb17` realization - **50_nr_soil_budget** old inconsistent module realizations @@ -542,15 +578,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **57_maccs** old inconsistent module realizations ### fixed + - **38_factor_costs** fixed calibration of share parameter in `sticky_labor` realization - **43_water_availability** added missing years after 2100 in "f43_wat_avail" to avoid infeasibilities in coupled runs with less_ts timesteps - **59_som** corrected the som pool due to the carbon transfer from other and primary forest to secondary forest before optimization (presolve) - **scripts** fixed some bugs related to background execution of start/output scripts - -## [4.5.0] - 2022-07-07 +## [4.5.0][4.5.0] - 2022-07-07 ### changed + - **09_drivers** separation of GDP and population scenarios - **09_drivers** changed `i09_gdp_pc_mer_iso` to `im_gdp_pc_mer_iso` - **11_costs** Split of production costs per sector, addded new separated costs to the costs function. @@ -558,10 +595,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **13_tc** Replace endo_jan18 realization by endo_jan22. The new realization adds a new dimension to vm_tau separating crop from managed pastures tau. - **15_food** added more options to define convergence towards exogenous food intake and waste scenarios accounting for different transition periods - **18_residues** The variable that include production costs vm_cost_prod for residues changed to a new independent variable called vm_cost_prod_kres -(specific to residues). + (specific to residues). - **30_crop** renamed switch `s30_set_aside_shr`, `s30_set_aside_shr_noselect` and `c30_set_aside_target` to `s30_snv_shr`, `s30_snv_shr_noselect` and `c30_snv_target`. - **31_past** The variable that include production costs vm_cost_prod for pasture changed to a new independent variable called vm_cost_prod_past -(specific to past). + (specific to past). - **31_past** added new realization implementing the separation of rangelands and managed pastures for the production of grass biomass. - **32_forestry** simplification and bugfix of afforestation limit. `c32_max_aff_area_glo` renamed to `s32_max_aff_area_glo` in default.cfg. - **34_urban** added set urban_scen34 and the switch c34_urban_scenario @@ -595,6 +632,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** scripts/output/extra/emulator.R Remove dependency on deprecated R package "magpie" ### added + - **core** macros for linear and sigmoidal time interpolation - **22_land_conservation** added new module and realisation for land conservation. The realisation also includes a new WDPA initialisation data set (from 1995 to 2020) for protected areas under legal protection, meeting IUCN and CBD protected area definitions. The module also adds the interface `pm_land_conservation`. - **30_crop** new module realizations including crop rotation scenarios by strict constraints (`rotation_apr22`) and by penalties (`penalty_apr22`) @@ -607,11 +645,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **config** added option for CO2 emission pricing `cfg$gms$c56_carbon_stock_pricing` - **config** added cfg$gms$s70_past_mngmnt_factor_fix with default 2005 (previous default was 2010). The previous setting caused a strong spike in CO2 emissions from pasture expansion in SSA. With 2005, this can be avoided. - **inputs** New input files added: - f13_pastr_tau_hist.csv -> historical tau for managed pastures. - f31_pastr_suitability.cs3 -> Managed pasture suitability - f31_LUH2v2.cs3 -> LUH2v2 land classes separating rangelands from managed pastures - f31_grassl_yld.cs3 -> Rangelands and managed pastures grass yields - f31_grass_bio_hist.cs3 -> Historical grass biomass demand + f13_pastr_tau_hist.csv -> historical tau for managed pastures. + f31_pastr_suitability.cs3 -> Managed pasture suitability + f31_LUH2v2.cs3 -> LUH2v2 land classes separating rangelands from managed pastures + f31_grassl_yld.cs3 -> Rangelands and managed pastures grass yields + f31_grass_bio_hist.cs3 -> Historical grass biomass demand - **modules** New dimension in `vm_carbon_stock` for different carbon stock types (actual, previousLandPattern, previousCarbonDensity) - **scripts** output/projects/FSEC_StevenLord.R to create output for Steven Lord in the FSEC context - **scripts** output/projects/FSEC_costs.R to create costs ouput for the FSEC project @@ -621,9 +659,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** `start/projects/test_rotations.R` testscript for different rotation scenario settings ### removed + - **38_factor_costs** mixed_feb17 and fixed_per_ton_mar18 realizations removed because they are not being used at the moment. ### fixed + - **09_drivers** bugfix concerning the use of the switch c09_gdp_scenario for defining population assumptions - **09_drivers** introduced new sets for PAL and demography scenarios to account for only partial coverage of available socio-economic gdp and population scenarios - **18_residues** off realization; missing variable declarations @@ -642,10 +682,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** fixed configuration error in FSEC output scripts, FSEC_dietaryIndicators.R and FSEC_environmentalPollutants.R - **scripts** scripts/start/extra/emulator.R Throw an error if no file can be found to take the GHG prices from - -## [4.4.0] - 2021-12-13 +## [4.4.0][4.4.0] - 2021-12-13 ### changed + - **additional_data** NDCs for Chinas afforestation now start earlier (1995) in line with observed afforestation. - **config** comments added for correct use of nitrogen switches - **inputs** new default LPJmL version with growing season adaptation (gsadapt) on @@ -685,6 +725,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** start/test_runs.R added SSP1, SSP2 and SSP5 as default test runs ### added + - **34_urban** New exo_nov21 exogenous realization of urban land expansion - **21_trade** Missing interface parameter for failing exo realization runs - **59_som** exogenous pathway for vm_nr_som via f59_som_exogenous @@ -707,6 +748,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **output.R** added SLURM standby maxMem and SLURM priority maxMem; needed for some output scripts (e.g. disaggregation_LUH2.R) ### removed + - **32_foresty** Removed static realization - **35_natveg** Removed static realization - **scripts** lpjml_addon script is removed and all calls within dependend starting scripts @@ -719,6 +761,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **39_landconversion_cost** removed realizations "global_static_aug18" and "devstate" ### fixed + - **80_optimization** Improved solve logic in "nlp_apr17" and "nlp_par" realization, multiple bugfixes and switch to solvelink=3 in "nlp_par" - **58_peatland** fixed rare infeasibility in "on" realization - **10_land** fixed rare infeasibility in "landmatrix_dec18" realization @@ -733,10 +776,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **73_timber** plausible cost for balance variable in case of s73_timber_demand_switch = 0 to avoid cost distortion - **56_ghg_policy** choose the correct scenario for fixing the GHG prices until sm_fix_SSP2 - -## [4.3.5] - 2021-09-02 +## [4.3.5][4.3.5] - 2021-09-02 ### changed + - **13_tc** added switch to ignore historic tau patterns in historic time steps (new default) - **16_demand** Moved most of cropping related set definitions (k, kve, kcr) from **16_demand** to **14_yield** - **32_foresty** Added option to choose a rotation length calculation criteria @@ -752,8 +795,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **inputs** Changed file format from cs2 to cs2b for cellular input files with a single data column - **scenario_config** added RCPs as columns for use with setSceanrio function. This required the addition of "gms$" in the 1st column. - ### added + - **73_timber** Added construction wood demand scenarios based on Churkina et al. 2020 - **script(s)** Added scripts to replicate runs for Mishra et al. 2021 (in review : https://doi.org/10.5194/gmd-2021-76) - **13_tc** Added new interfaces for tau factor of the previous time step (`pcm_tau`) @@ -774,10 +817,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **sets** added superregional layer `h` as additional spatial layer and moved constraints in **13_tc** and **21_trade** partly to the superregional level. ### removed + - **13_tc** Removed disfuctional setting c13_tccost = "mixed" - **core** removed sets ac_young and ac_mature (no longer needed due to changes in 44_biodiversity) ### fixed + - **32_foresty** BII coefficients for CO2 price driven afforestation - **32_foresty** growth curve CO2 price driven afforestation - **32_foresty** NPI/NDC afforestation infeasibility @@ -785,27 +830,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **35_natveg** option to fade out damage from shifting agriculture by 2030 - **44_biodiversity** ac0 included in pricing of biodiversity loss - -## [4.3.4] - 2021-04-30 +## [4.3.4][4.3.4] - 2021-04-30 ### changed + - **51_nitrogen** New calculations for emissions from agricultural residues (vm_res_ag_burn) - **53_methane** New calculations for emissions from agricultural residues (vm_res_ag_burn) - **citation file** added new contributors ### added + - **config** The set "kfo_rd" (livst_rum, livst_milk), which is used in the food substitution scenarios c15_rumdairy_scp_scen and c15_rumdairyscen, has been added to the default.cfg file. This allows for sensitivity scenarios (e.g. only livst_milk or only livst_rum). - A new scenario (nocc_hist) was added to the cc/nocc switch. In this scenario, parameters affected by the cc/nocc switch in **14_yields**,**42_water_demand**,**43_water_availability**,**52_carbon**,**59_som** keep their historical/variable values up to the year defined by sm_fix_cc. Afterwards, sm_fix_cc values are kept constant for the overall run horizon. ### fixed + - **09_drivers** migration of sm_fix_SSP2 and sm_fix_cc declaration from the core declarations to the drivers module. This will allow to set the scalars properly . - - **15_food** single-cell protein substitution scenarios included in intersolve.gms. - **20_processing** The "mixed" scenario for single-cell protein production (c20_scp_type) was not working as expected. The corresponding code in 20_processing has been updated. - -## [4.3.3] - 2021-03-30 +## [4.3.3][4.3.3] - 2021-03-30 ### added + - **15_food*** added 3 sigmoid food substitution scenarios - **44_biodiversity** New biodiversity module. The realization bv_btc_mar21 now allows to calculate an area-based biodiversity value across all land types. Switch `c44_price_bv_loss` to implement cost for biodiversity loss. - **56_ghg_policy** Automatic sets for scenarios @@ -816,12 +863,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** Added pre-commit hook ### fixed -- **60_bioenergy** Minimal bioenergy demand +- **60_bioenergy** Minimal bioenergy demand -## [4.3.2] - 2021-03-17 +## [4.3.2][4.3.2] - 2021-03-17 ### changed + - **12_interest_rate** Interest fader changed to csv - **15_food** better documentation of parameters over model iterations - **15_food** added scenario switch for ruminant and dairy replacement by Single-Cell Protein @@ -834,6 +882,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **tests** Replaced TravisCI with GithubActions ### added + - **15_food** Added the option to fade out livestock demand towards a target level in kcal/cap/day. - **21_trade** Added scalar `s21_trade_bal_damper` and new set `k_trade_excl_timber` - **29_ageclass** New age-class module @@ -854,29 +903,32 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added output script for disaggregation of land transitions ### removed + - **32_forestry** Removed previous default realization - **35_natveg** Removed previous default realization - **73_timber** Removed previous default realization ### fixed + - **32_forestry** Bugfixes for "ac_est" and carbon treshold afforestation; removed plantations from "vm_cdr_aff". - **core** bugfix m_fillmissingyears macro; was running over t before; now running over t_all_ - -## [4.3.1] - 2020-11-03 +## [4.3.1][4.3.1] - 2020-11-03 ### added + - **main** Added Dockerfile for running MAgPIE in a container ### fixed + - **35_natveg** Bugfix "v35_secdforest_expansion" - **52_carbon** Bugfix "p52_scaling_factor" for climate change runs - **73_timber** New scenario switch `c73_wood_scen`. - -## [4.3.0] - 2020-09-15 +## [4.3.0][4.3.0] - 2020-09-15 ### added + - **38_factor_costs** Added the new "sticky" realization to the factor costs module. The realization "sticky_feb18" favors expansion in cells with preexisting farmland and capital based on capital investment decisions. - **modules** added endogenous implementation of local biophysical (bph) impacts of afforestation to existing realizations in modules 32_forestry (dynamic_oct19) and 56_ghg_policy (price_jan20). default = off - **73_timber** Added timber module which brings the ability of producing woody biomass for timber plantations and natural vegetation. Default = off. New switch: `s73_foresight`. New scalars : `s73_timber_prod_cost`, `s73_timber_harvest_cost`,`s73_cost_multiplier`,`s73_free_prod_cost` @@ -888,129 +940,138 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added start script for making timber production runs (forestry.R). ### changed + - **scripts** updated selection routine for start and output scripts - **scripts** replaced lucode dependency with newer packages lucode2 and gms - **32_forestry** include new datasets of the bph effect of afforestation / replaced the bph ageclass switch with a fade-in between ac10 and ac30 in (dynamic_may20) - - **13_tc**, **39_landconversion**, **41_area_equipped_for_irrigation** and **58_peatland**. For the current time step, the optimization costs only include now the annuity of the present investment. magpie4's reportCosts() function was modified to consider these changes. +- **13_tc**, **39_landconversion**, **41_area_equipped_for_irrigation** and **58_peatland**. For the current time step, the optimization costs only include now the annuity of the present investment. magpie4's reportCosts() function was modified to consider these changes. ### removed - - **scripts** deleted outdated start and output scripts + +- **scripts** deleted outdated start and output scripts ### fixed - - **32_forestry** Rotation length calculation based on correct marginals of growth function in timber plantations. Clearer calculations for harvested area for timber production. - - **35_natveg** Clearer calculations for harvested area for timber production. - - **52_carbon** Fix to the Carbon densities received from LPJmL for timber plantations. +- **32_forestry** Rotation length calculation based on correct marginals of growth function in timber plantations. Clearer calculations for harvested area for timber production. +- **35_natveg** Clearer calculations for harvested area for timber production. +- **52_carbon** Fix to the Carbon densities received from LPJmL for timber plantations. -## [4.2.1] - 2020-05-15 +## [4.2.1][4.2.1] - 2020-05-15 ### added - - **modules** added option of regional scenario switches in modules 12_interest_rate, 15_food, 42_water_demand, 50_nr_soil_budget, 55_awms, 56_ghg_policy, 60_bioenergy - - **58_peatland** added peatland module. Two realizations: off (=default) and on. - - **80_optimization** added realization for parallel optimization of regions in combination with fixed trade patterns. - - **metadata** added .zenodo.json metadata file for proper metadata information in ZENODO releases + +- **modules** added option of regional scenario switches in modules 12_interest_rate, 15_food, 42_water_demand, 50_nr_soil_budget, 55_awms, 56_ghg_policy, 60_bioenergy +- **58_peatland** added peatland module. Two realizations: off (=default) and on. +- **80_optimization** added realization for parallel optimization of regions in combination with fixed trade patterns. +- **metadata** added .zenodo.json metadata file for proper metadata information in ZENODO releases ### changed - - **12_interest_rate** merged the two realizations (glo_jan16 and reg_feb18) into one (select_apr20) with same functionality and add on of option to choose different interest rate scenarios for different regions selected via country switch select_countries12 - - **scripts** streamlined and improved performance of NPI/NDC preprocessing + +- **12_interest_rate** merged the two realizations (glo_jan16 and reg_feb18) into one (select_apr20) with same functionality and add on of option to choose different interest rate scenarios for different regions selected via country switch select_countries12 +- **scripts** streamlined and improved performance of NPI/NDC preprocessing ### fixed - - **56_ghg_policy and 60_bioenergy** update of GHG prices and 2nd generation bioenergy demand from SSPDB to most recent snapshot - - **NPI/NDC policy calculations** revision of calculation method +- **56_ghg_policy and 60_bioenergy** update of GHG prices and 2nd generation bioenergy demand from SSPDB to most recent snapshot +- **NPI/NDC policy calculations** revision of calculation method -## [4.2.0] - 2020-04-15 +## [4.2.0][4.2.0] - 2020-04-15 -This release version is focussed on consistency between the MAgPIE setup and the [REMIND model] and result of a validation exercise of the coupled (REMIND 2.1)-(MAgPIE 4.2) system. +This release version is focussed on consistency between the MAgPIE setup and the [REMIND model][REMIND model] and result of a validation exercise of the coupled (REMIND 2.1)-(MAgPIE 4.2) system. ### added - - **config** Added new socioeconomic scenario (SDP) to scenario_config.csv (which include all switches to define among others the SSP scenarios). For the parametrization of the new SDP (Sustainable Development Pathway) scenario, the list of scenario switches was extended to account for a broad range of sustainability dimensions. - - **10_land** added new land realization landmatrix_dec18 to directly track land transition between land use types - - **15_food** stronger ruminant fade out in India - - **15_food** Added exogenous food substitution scenarios that can be selected via settings in the config-file, defining speed of convergence, scenario targets and transition periods (applied after the food demand model is executed). Among these scenarios are the substitution of livestock products with plant-based food commodities and the substitution of beef or fish with poultry. The food substitution scenarios are based on the model-native, regression-based calculation of food intake and demand. - - **15_food** Added exogenous EAT Lancet diet scenarios: It is now possible to define in the config-file exogenous diet scenarios that replace the regression-based calculation of food intake and demand. Possible settings are the target for total calorie intake (e.g. according to a healthy BMI) and variants of the EAT Lancet diet (e.g. in addition to the flexitarian a vegetarian or vegan variant). - - **15_food** Added exogenous food waste scenarios which can be defined via settings in the config-file, including scenario targets for the ratio between food demand and intake and the year in which full transition to the target should be achieved. - - **30_crop** added crop specific land use initialization pattern (used as interface for other modules) - - **50_nr_soil_budget and 55_awms** Additional inputs for the GoodPractice Scenario. - - **52_carbon** Added new forest growth curve parameters based on Braakhekke et al. 2019. Growth curves are now differentiated between natural vegetation (default) and plantations. - - **59_som** added new realization static_jan19 (new default) including all soil carbon related calculations. Before all carbon pools were updated in the specific land use type modules. This still holds true for the above ground pools (vegetation and litter carbon) - - **.gitattributes** file added to set line ending handling to auto for all text files - - **scaling** added scaling.gms files for several modules to improve optimization (based on gdx::calc_scaling) - - **scripts** added output scripts for global soil carbon maps (SoilMaps.R). + +- **config** Added new socioeconomic scenario (SDP) to scenario_config.csv (which include all switches to define among others the SSP scenarios). For the parametrization of the new SDP (Sustainable Development Pathway) scenario, the list of scenario switches was extended to account for a broad range of sustainability dimensions. +- **10_land** added new land realization landmatrix_dec18 to directly track land transition between land use types +- **15_food** stronger ruminant fade out in India +- **15_food** Added exogenous food substitution scenarios that can be selected via settings in the config-file, defining speed of convergence, scenario targets and transition periods (applied after the food demand model is executed). Among these scenarios are the substitution of livestock products with plant-based food commodities and the substitution of beef or fish with poultry. The food substitution scenarios are based on the model-native, regression-based calculation of food intake and demand. +- **15_food** Added exogenous EAT Lancet diet scenarios: It is now possible to define in the config-file exogenous diet scenarios that replace the regression-based calculation of food intake and demand. Possible settings are the target for total calorie intake (e.g. according to a healthy BMI) and variants of the EAT Lancet diet (e.g. in addition to the flexitarian a vegetarian or vegan variant). +- **15_food** Added exogenous food waste scenarios which can be defined via settings in the config-file, including scenario targets for the ratio between food demand and intake and the year in which full transition to the target should be achieved. +- **30_crop** added crop specific land use initialization pattern (used as interface for other modules) +- **50_nr_soil_budget and 55_awms** Additional inputs for the GoodPractice Scenario. +- **52_carbon** Added new forest growth curve parameters based on Braakhekke et al. 2019. Growth curves are now differentiated between natural vegetation (default) and plantations. +- **59_som** added new realization static_jan19 (new default) including all soil carbon related calculations. Before all carbon pools were updated in the specific land use type modules. This still holds true for the above ground pools (vegetation and litter carbon) +- **.gitattributes** file added to set line ending handling to auto for all text files +- **scaling** added scaling.gms files for several modules to improve optimization (based on gdx::calc_scaling) +- **scripts** added output scripts for global soil carbon maps (SoilMaps.R). ### changed - - **config** new default ghg emission pricing policy "redd+_nosoil" in c56_emis_policy. Includes all pools included in the previous default "SSP_nosoil", and in addition "forestry". - - **13_tau** lower bound for vm_tau for historical time steps - - **50_nr_soil_budget** atmospheric deposition is now estimated on the cluster-level instead of the region level to improve spatial patterns. - - **56_ghg_policy** updated scenarios in f56_emis_policy: none, all natural (called 'ssp') and all land use change emissions (pure co2) being included in greenhouse gas pricing. ssp and all also featuring additional scenarios excluding soil carbon pricing (marked with '_nosoil' postscript). - - **56_ghg_policy** Several changes regarding afforestation: use of detailed formula for incentive calculation instead of simplified Hotelling formula, 50 year planning horizon (instead of 80 years), phase-in of GHG prices deactivated by default (now done in REMIND), CO2 price reduction factor deactivated by default, introduced buffer reduction factor of 20% for afforestation. - - **59_som** updated cellpool_aug16 realization to use new interfaces from land module on land use type specific land expansion and reduction as well as crop type specific land initialization pattern. Additionally added irrigation as stock change factor sub-type. N fertilizer from soil organic matter decomposition is truncated after threshold to avoid unrealistically high fertilization rates. - - **80_optimization** write extended run information in list file in the case that the final solution is infeasible - - **modules** modular structure updated from version 1 to version 2 - - **line endings** changed to unix-style for all text files + +- **config** new default ghg emission pricing policy "redd+_nosoil" in c56_emis_policy. Includes all pools included in the previous default "SSP_nosoil", and in addition "forestry". +- **13_tau** lower bound for vm_tau for historical time steps +- **50_nr_soil_budget** atmospheric deposition is now estimated on the cluster-level instead of the region level to improve spatial patterns. +- **56_ghg_policy** updated scenarios in f56_emis_policy: none, all natural (called 'ssp') and all land use change emissions (pure co2) being included in greenhouse gas pricing. ssp and all also featuring additional scenarios excluding soil carbon pricing (marked with '_nosoil' postscript). +- **56_ghg_policy** Several changes regarding afforestation: use of detailed formula for incentive calculation instead of simplified Hotelling formula, 50 year planning horizon (instead of 80 years), phase-in of GHG prices deactivated by default (now done in REMIND), CO2 price reduction factor deactivated by default, introduced buffer reduction factor of 20% for afforestation. +- **59_som** updated cellpool_aug16 realization to use new interfaces from land module on land use type specific land expansion and reduction as well as crop type specific land initialization pattern. Additionally added irrigation as stock change factor sub-type. N fertilizer from soil organic matter decomposition is truncated after threshold to avoid unrealistically high fertilization rates. +- **80_optimization** write extended run information in list file in the case that the final solution is infeasible +- **modules** modular structure updated from version 1 to version 2 +- **line endings** changed to unix-style for all text files ### fixed - - **modules** Fixing of all parameters to SSP2 values until 2020 (switch sm_fix_SSP2) for having identical outcomes in all scenarios (SDP, SSP1-5) until 2020. - - **21_trade** Bugfix kall instead of k in exo realization; Bufix begr/betr trade in default realization; Bugfix sets in free realization - - **32_forestry** NPI/NDC afforestation targets are now counted towards the global afforestation limit, which can be set for specific scenarios via the switch *s32maxaff_area* and constrains the potential for carbon-price induced endogenous afforestation. - - **56_ghg_policy** bugfix full soil carbon loss in default setting, renamed it from ssp to ssp_nosoil, indicating, that soil carbon losses are not priced. - - **56_ghg_policy** bugfix afforestation: vmbtm_cell was a free variable for some sources and pollutants, which could result in GHG cost neutral shifting of age classes to ac0 (e.g. from ac55 to ac0). - - **80_optimization** added fallback routine for CONOPT4 failure (fatal system error) +- **modules** Fixing of all parameters to SSP2 values until 2020 (switch sm_fix_SSP2) for having identical outcomes in all scenarios (SDP, SSP1-5) until 2020. +- **21_trade** Bugfix kall instead of k in exo realization; Bufix begr/betr trade in default realization; Bugfix sets in free realization +- **32_forestry** NPI/NDC afforestation targets are now counted towards the global afforestation limit, which can be set for specific scenarios via the switch *s32maxaff_area* and constrains the potential for carbon-price induced endogenous afforestation. +- **56_ghg_policy** bugfix full soil carbon loss in default setting, renamed it from ssp to ssp_nosoil, indicating, that soil carbon losses are not priced. +- **56_ghg_policy** bugfix afforestation: vmbtm_cell was a free variable for some sources and pollutants, which could result in GHG cost neutral shifting of age classes to ac0 (e.g. from ac55 to ac0). +- **80_optimization** added fallback routine for CONOPT4 failure (fatal system error) -## [4.1.1] - 2020-03-09 +## [4.1.1][4.1.1] - 2020-03-09 This version provides the model version used for the publication starved, stuffed and wasteful. It provides a few technical updates compared to the 4.1 release, which include ### added + - **scripts** a startscript that allows the exchange of model parameters as a sensitivity analysis ### changed + - **core** allow for flexible calibration period of the model, which allows for uncalibrated runs of the past for validation purposes - **15_food** Parameters for bodyheight regressions were included explicitly as input parameters - **config** updated input data of the drivers and food demand regressions ### fixed -- **15_food** Precision of iteration convergence criterium for magpie-demandmodel-iteration is calculated more precisely, avoiding unnecessary iterations. +- **15_food** Precision of iteration convergence criterium for magpie-demandmodel-iteration is calculated more precisely, avoiding unnecessary iterations. -## [4.1.0] - 2019-05-02 +## [4.1.0][4.1.0] - 2019-05-02 -This release version is focussed on consistency between the MAgPIE setup and the [REMIND model] and result of a validation exercise of the coupled REMIND-MAgPIE system. +This release version is focussed on consistency between the MAgPIE setup and the [REMIND model][REMIND model] and result of a validation exercise of the coupled REMIND-MAgPIE system. ### added - - **80_optimization** added support for GAMS version 26.x.x - - **scripts** added new start and output scripts - - **license** added exception to the applied AGPL license to clarify handling of required GAMS environment, solver libraries and R libraries + +- **80_optimization** added support for GAMS version 26.x.x +- **scripts** added new start and output scripts +- **license** added exception to the applied AGPL license to clarify handling of required GAMS environment, solver libraries and R libraries ### changed - - **56_ghg_policy** apply reduction factor on CO2 price to account for potential negative side effects; lowers the economic incentive for CO2 emission reduction (avoided deforestation) and afforestation - - **56_ghg_policy** non-linar phase-in of GHG prices over 20 year period - - **56_ghg_policy** multiply GHG prices with development state to account for institutional requirements needed for implementing a GHG pricing scheme - - **40_transport** introduced transport costs for monogastric livestock products - - **NPI/NDC scripts** added forest protection policy for Brazilian Atlantic Forest in default NDC and NPI scenarios - - **NPI/NDC scripts** harmonized the starting year of the NDC policies 2020. - - **interpolation scripts** changed output files to seven magpie land use types, added additional cropsplit script for more detailed cropland output - - **15_food** clean-up and cosmetic changes (correction of comments, parameter names, structure of code); update BMI share calculations with the values of the last consistent MAgPIE/food-demand-model iteration + +- **56_ghg_policy** apply reduction factor on CO2 price to account for potential negative side effects; lowers the economic incentive for CO2 emission reduction (avoided deforestation) and afforestation +- **56_ghg_policy** non-linar phase-in of GHG prices over 20 year period +- **56_ghg_policy** multiply GHG prices with development state to account for institutional requirements needed for implementing a GHG pricing scheme +- **40_transport** introduced transport costs for monogastric livestock products +- **NPI/NDC scripts** added forest protection policy for Brazilian Atlantic Forest in default NDC and NPI scenarios +- **NPI/NDC scripts** harmonized the starting year of the NDC policies 2020. +- **interpolation scripts** changed output files to seven magpie land use types, added additional cropsplit script for more detailed cropland output +- **15_food** clean-up and cosmetic changes (correction of comments, parameter names, structure of code); update BMI share calculations with the values of the last consistent MAgPIE/food-demand-model iteration ### fixed - - **42_water_demand** bugfix environmental flow policy harmonization for historic period - - **57_maccs** correction of cost calculation; Conversion from USD per ton C to USD per ton N and USD per ton CH4 was missing. - - **71_diagg_lvst** adjusted monogastric disaggregation for more flexiblity to avoid infeasibilities with EFPs (see 42_water_demand) - - **15_food** correction regarding the convergence measure of the iterative execution of the food demand model and MAgPIE; correction accounting for unusual time step length in body height calculations; body height regression parameters updated +- **42_water_demand** bugfix environmental flow policy harmonization for historic period +- **57_maccs** correction of cost calculation; Conversion from USD per ton C to USD per ton N and USD per ton CH4 was missing. +- **71_diagg_lvst** adjusted monogastric disaggregation for more flexiblity to avoid infeasibilities with EFPs (see 42_water_demand) +- **15_food** correction regarding the convergence measure of the iterative execution of the food demand model and MAgPIE; correction accounting for unusual time step length in body height calculations; body height regression parameters updated -## [4.0.1] - 2018-10-05 +## [4.0.1][4.0.1] - 2018-10-05 ### fixed - - **FABLE** adapted FABLE-specific configuration so that it works with MAgPIE 4.0 +- **FABLE** adapted FABLE-specific configuration so that it works with MAgPIE 4.0 -## [4.0.0] - 2018-10-04 +## [4.0.0][4.0.0] - 2018-10-04 First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.org/10.5194/gmd-12-1299-2019) for more information. - [Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.8.1...develop [4.8.1]: https://github.com/magpiemodel/magpie/compare/v4.8.0...v4.8.1 [4.8.0]: https://github.com/magpiemodel/magpie/compare/v4.7.3...v4.8.0 @@ -1044,5 +1105,4 @@ First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.o [4.1.0]: https://github.com/magpiemodel/magpie/compare/v4.0.1...v4.1.0 [4.0.1]: https://github.com/magpiemodel/magpie/compare/v4.0...v4.0.1 [4.0.0]: https://github.com/magpiemodel/magpie/releases/tag/v4.0 - [REMIND model]: https://www.pik-potsdam.de/research/transformation-pathways/models/remind From 50aaaddb6efef07ec24e5de33be71b91905d32ad Mon Sep 17 00:00:00 2001 From: Singh Date: Tue, 24 Sep 2024 20:01:20 +0530 Subject: [PATCH 7/8] Edited changelog --- CHANGELOG.md | 2 +- main.gms | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e36ae321d..1e7a16f24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [Unreleased][Unreleased] +## [Unreleased] ### changed diff --git a/main.gms b/main.gms index 6817d2533..e8f0d20e6 100644 --- a/main.gms +++ b/main.gms @@ -148,23 +148,23 @@ $title magpie *##################### R SECTION START (VERSION INFO) ########################## * -* Used data set: rev4.109_h12_magpie.tgz +* Used data set: rev4.111_h12_magpie.tgz * md5sum: NA * Repository: https://rse.pik-potsdam.de/data/magpie/public * -* Used data set: rev4.109_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz +* Used data set: rev4.111_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz * md5sum: NA * Repository: https://rse.pik-potsdam.de/data/magpie/public * -* Used data set: rev4.109_h12_validation.tgz +* Used data set: rev4.111_h12_validation.tgz * md5sum: NA * Repository: https://rse.pik-potsdam.de/data/magpie/public * -* Used data set: additional_data_rev4.51.tgz +* Used data set: additional_data_rev4.53.tgz * md5sum: NA * Repository: https://rse.pik-potsdam.de/data/magpie/public * -* Used data set: calibration_H12_26Mar24.tgz +* Used data set: calibration_H12_26Mar24_fixed.tgz * md5sum: NA * Repository: https://rse.pik-potsdam.de/data/magpie/public * @@ -179,11 +179,11 @@ $title magpie * * Regionscode: 62eff8f7 * -* Regions data revision: 4.109 +* Regions data revision: 4.111 * * lpj2magpie settings: * * LPJmL data: MRI-ESM2-0:ssp370 -* * Revision: 4.109 +* * Revision: 4.111 * * 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 Sep 6 16:05:34 2024 +* Last modification (input data): Tue Sep 24 17:20:08 2024 * *###################### R SECTION END (VERSION INFO) ########################### From e7eb67c7339b2e66d312c8555b46787178b26e5d Mon Sep 17 00:00:00 2001 From: Singh Date: Wed, 25 Sep 2024 09:27:45 +0530 Subject: [PATCH 8/8] Fixed gti conflict in Changelog --- CHANGELOG.md | 379 ++++++++++++++++++++++----------------------------- 1 file changed, 162 insertions(+), 217 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e7a16f24..bd2b5718a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,57 +6,60 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### changed +- **11_costs** changed equation to fix bug in total water cost calculation -- **config** The default realization for the 38_factor_costs module was switched to `sticky_feb18`. In this realization, capital stocks and their depreciation are tracked, giving some inertia to random relocation of production, improving high resolution outputs. -- **21_trade** refactor equations for enhanced readablility and improve documentation -- **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. + + +## [4.8.2] - 2024-09-24 + +### changed - **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. +- **21_trade** refactor equations for enhanced readablility and improve documentation +- **29_cropland** added option for linear and sigmoidal faders +- **32_forestry** Interfaces `vm_landexpansion_forestry` and `vm_landreduction_forestry` have been corrected by harvested and replanted timber plantation area +- **58_peatland** variable `v58_scalingFactorExp` converted into parameter `p58_scalingFactorExp` to avoid infeasibilites. `p58_scalingFactorRed` has been revised. - **80_optimization** abort GAMS in case of execution errors, added threads = 1 as default to avoid infeasibilites and Flg_NoDefc = TRUE as option +- **config** `cfg$gms$land_snv`changed from "secdforest, forestry, past, other" to "secdforest, other" +- **config** additional data update additional_data_rev4.53.tgz - **config** default settings for 58_peatland revised -- **58_peatland** variable `v58_scalingFactorExp` converted into parameter `p58_scalingFactorExp` to avoid infeasibilites. `p58_scalingFactorRed` has been revised. -- **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 - **config** initial treecover on cropland starts from zero -- **config** additional data update additional_data_rev4.53.tgz -- **29_cropland** added option for linear and sigmoidal faders -- **scripts** output/extra/highres.R use default 13_tc realization -- **scripts** `.nc` files are no longer created by default after disaggregation -- **config** `cfg$gms$land_snv`changed from "secdforest, forestry, past, other" to "secdforest, other" +- **config** split scenario_config into project-specific configs - **config** Submissions with high memory requirements now get 16 CPUs and 80GB of memory to account for the new specifications of PIK's new HPC 'Foote'. `maxMem` was renamed to `highMem`, because 80GB of memory does not correspond to the maximum available memory of a compute node. -- **11_costs** changed equation to fix bug in total water cost calculation +- **config** The default realization for the 38_factor_costs module was switched to `sticky_feb18`. In this realization, capital stocks and their depreciation are tracked, giving some inertia to random relocation of production, improving high resolution outputs. +- **script** replaced gdx package with gdx2 package calls +- **script** scripts/start_functions.R decide individually for demand and price whether they are read from a REMIND report. +- **script** updated EATLancet project start scripts +- **scripts** `.nc` files are no longer created by default after disaggregation +- **scripts** output/extra/highres.R use default 13_tc realization +- **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. -### added -- **scripts** added output script converting all grid-level .mz files to .nc (netCDF) -- **scripts** added output report `EU_report.R` that uses `EU_report.Rmd` -- **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 +### added - **42_water_demand** added water abstraction type dimension for non-ag uses - **56_ghg_policy** added optional temporal and regional fader for GHG emission pricing policy +- **70_livestock** added realization `fbask_jan16_sticky` +- **config** added `scenario_config_year_fix.csv` for choosing until when parameters are fixed to SSP2 values - **cropland** added option for discarding initial treecover on cropland - **script** added output script for conversion of validation.mif file into validation.rds +- **script** check of variables needed in piamInterfaces in report_rds.R - **script** for downscaling to 0.25 deg using LUH2v2h as reference via mrdownscale -- **config** added `scenario_config_year_fix.csv` for choosing until when parameters are fixed to SSP2 values -- **scripts** added start script for 'Healthly Landscapes' paper `paper_healthyLscps.R` +- **scripts** added out of bounds check as output script +- **scripts** added output report `EU_report.R` that uses `EU_report.Rmd` +- **scripts** added output script converting all grid-level .mz files to .nc (netCDF) - **scripts** added script for automatic submission of SEALS allocation runs `./extra/runSEALSallocation.R` +- **scripts** added start script for 'Healthly Landscapes' paper `paper_healthyLscps.R` -### removed ### fixed - -- **scripts** fixing an error in start.R and output.R which occurred if more than one slurm job was submitted at the same time. - **15_food** fixing parameter declaration of i15_processed_kcal_structure_iso -- **80_optimization** bugfix for variables levels not obeying the bounds in nlp_par, `conopt` changed to `conopt3` - **35_natveg** bugfix secdforest and other land restoration to avoid double-counting of restoration in equation `q29_land_snv` +- **80_optimization** bugfix for variables levels not obeying the bounds in nlp_par, `conopt` changed to `conopt3` +- **scripts** fixing an error in start.R and output.R which occurred if more than one slurm job was submitted at the same time. -## [4.8.1][4.8.1] - 2024-06-19 -### changed +## [4.8.1] - 2024-06-19 +### changed - **29_ageclass** module 29_ageclass has been renamed to 28_ageclass to make space for `29_cropland` just before `30_croparea` - **30_crop** module `30_crop` renamed to `30_croparea`, which now only accounts for crop area. - **30_crop** Semi-Natural Vegetation (SNV) implementation has been moved from `30_crop` to `29_cropland` @@ -67,27 +70,25 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** updated EL2p0 start scripts ### added - - **10_land** added interface `pm_land_hist` with historic land use patterns - **29_cropland** new module `29_cropland` accounting for crop area, fallow cropland and tree cover on cropland with two realizations: `detail_apr24` and `simple_apr24` (default). - **42_water_demand** added non-agricultural water demand for entire year ### removed - - **32_forestry** removed technical balance term `v32_land_missing_ndc` ### fixed - - **22_land_conservation** avoid infeasibilities due to very small numbers, account for cropland tree cover and lower bound of cropland - **32_forestry** avoid infeasibilities due to very small numbers - **35_natveg** avoid infeasibilities due to very small numbers - **44_biodiversity** Fixing to SSP2 parameters until 2025 was not working - **config** update to input data rev4.109. In the previous rev4.108, MER GDP was wrong and was identical to PPP GDP -## [4.8.0][4.8.0] - 2024-06-10 -### changed +## [4.8.0] - 2024-06-10 + +### changed - **14_yields** revised timber yield calculations - **15_food, default.cfg and scenario_config.csv** changed fader setup and introduced new switches for specifying food substitution scenarios and exogeneous food intake scenarios - **22_land_conservation and default.cfg** Added options for baseline protection @@ -107,7 +108,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** start/test_runs.R added 2 more test runs from FSEC ### added - - **15_food** added additional sigmoid food substition scenarios `sigmoid_75pc_25_50`, `sigmoid_50pc_25_50` and `sigmoid_25pc_25_50` - **21_trade** Minimum trade margin for forestry products `s21_min_trade_margin_forestry` - **30_crop** added regional cropland equation `q30_crop_reg` and presolve growth constraint @@ -124,10 +124,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added "checkSummation" output script for consistency checking a report.mif - **scripts** added automatic set writer for new bioenergy realization to `start_functions` - **scripts** added start scripts for the GENIE project - `s60_bioenergy_price_2nd`, `c60_price_implementation` +`s60_bioenergy_price_2nd`, `c60_price_implementation` ### removed - - **14_yields** removed interface `pm_timber_yield_initial` - **21_trade** removed interface `pm_selfsuff_ext`, removed `v21_manna_from_heaven` - **32_forestry** removed interface `pm_representative_rotation` @@ -138,7 +137,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/output/extra** removed scripts disaggregation_cropsplit and disaggregation_transitions ### fixed - - **14_yields** fix division by zero in preloop of managementcalib_aug19 - **44_biodiversity** avoid division by zero - **58_peatland** Added balance variable to avoid random infeasibilites @@ -149,10 +147,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/start/test_runs.R** include all default output script, in particular disaggregation.R, which is needed for BII - **start/projects/fsec.R** scenario settings -## [4.7.3][4.7.3] - 2024-04-12 -### changed +## [4.7.3] - 2024-04-12 +### changed - **21_trade** Revision of trade module. Replaced `cfg$gms$s21_trade_bal_damper` in favour of `cfg$gms$k_import21`, which allows for additional imports to maintain feasibility - **21_trade** v21_import_for_feasibility now available for all countries, not just for importers - **70_livestock** if `c70_fac_req_regr` is set to `reg`: use of USDA/FAO values for historic factor requirements for livestock instead of using regression values and change of calibration year from 2005 to 2010 for regional factor requirements regression @@ -163,7 +161,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/calibration/landconversion_cost.R** Revised calibration approach for conversion costs for cropland. Information from all calibration time steps in combination with a lowpass filter is now used for deriving the calibration factors, which avoids the previous zickzack pattern. The previous option `cfg$damping_factor_landconversion_cost` has been removed in favor of `cfg$lowpass_filter_landconversion_cost`. ### added - - **14_yields** added minimum threshold for wood yields. Below this threshold, wood yields are set to zero. - **config** added switch for minimum timber yields - **56_ghg_policy** added NDC scenarios @@ -171,17 +168,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** start script for EAT2p0 Deep Dive project ### fixed - - **15_food** Small number rather 0 in condition checking calorie balancing - **34_urban** `static` realization was not working because `vm_carbon_stock` was referenced without the set `stockType` - **52_carbon** removing jump of carbon content into fully grown forest when a forest changes from second-last age class to last age-class. - **58_peatland** Equation `q58_scalingFactorExp` revised to avoid division by zero. - **80_optimization** duplicated solve statement in all instances to avoid non-matchting left- and right-hand sides of equations -## [4.7.2][4.7.2] - 2024-04-02 -### changed +## [4.7.2] - 2024-04-02 +### changed - **21_trade** Revision of trade module. Replaced `cfg$gms$s21_trade_bal_damper` in favour of `cfg$gms$k_import21`, which allows for additional imports to maintain feasibility - **58_peatland** Threshold in equations changed from 1e-10 to 1e-8 to avoid rare divisions by zero - **70_livestock** if `c70_fac_req_regr` is set to `reg`: use of USDA/FAO values for historic factor requirements for livestock instead of using regression values and change of calibration year from 2005 to 2010 for regional factor requirements regression @@ -189,25 +185,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** modified output reporting for SEALS to account for forestry plantations ### added - - **30_crop** Improved representation of cropland requiring relocation in response to introducing semi-natural habitat at the 1 km level based on high-resolution satellite imagery. - **config** added `.codeCheck` with additonal configuration when running `gms::codeCheck` - **scripts** add additional BII reporting variables in FSDP_collect.R - **scripts** added a new validation_cell.R output script that generates a pdf with the comparison of magpie land use and crop type outputs with LUH and MAPSPAM historical data at cellular resolution. ### removed - - **core** removed no longer needed set `si` Suitability classes ### fixed - - **52_carbon** i52_land_carbon_sink was not identical before 2020 for different RCPs. Fixed by setting to RCPBU until the year defined in sm_fix_cc. - **inputdata** currency fixed in historic value of production for crops and livestock which affects e.g. total labor costs and in turn hourly labor costs, bugfix in aggregation weight of capital cost share out of factor costs -## [4.7.1][4.7.1] - 2024-02-28 -### changed +## [4.7.1] - 2024-02-28 +### changed - **15_food** Added improved EAT Lancet diet implementation (EAT 2p0) - **21_trade** s21_trade_bal_damper for roundwood changed from 0.75 to 0.65 - **31_past** in grasslands_apr22 realization: changed structure of f31_pastr_suitability to align with ssp-rcp specific input data formulation. Changed input filename from cs3 to cs2. Added `cc`, `nocc` and `nocc_hist` options for `i31_manpast_suit` and changed input gams code from table to parameter. Climate scenario assignment moved from preloop.gms to input.gms. Removed pastSuit set in sets.gms as not needed anymore. Adjusted not_used.txt in both grasslands_apr22 and static realizations. @@ -223,19 +216,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **start_functions** Check if cfg$recalibrate is consistent with cfg$gms$s14_use_yield_calib ### added - - **32_forestry** new interfaces `vm_land_forestry`, `pcm_land_forestry` `vm_landexpansion_forestry` and `vm_landreduction_forestry` - **56_ghg_policy_** added new trajectories for R32M46 - **60_bioenergy** added new trajectories for R32M46 - **scripts** added peatland to output/extra/disaggregation.R ### removed - - **58_peatland** removed realization "on" - **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. ### fixed - - **21_trade** introduced s21_manna_from_heaven for fixing v21_manna_from_heaven to zero. Without fixing to zero, v21_manna_from_heaven was used unnecessarily in runs started with highres.R - **32_forestry** bugfix unit p32_observed_gs_reg - **32_forestry** keep c-density for timber plantations constant after rotation length to avoid unrealistic carbon sequestration in unharvested timber plantation @@ -248,10 +238,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** fixed memory spike leading to crashes in disaggregation.R - **scripts** fixed writing of NetCDF files in output/reportMAgPIE2SEALS.R -## [4.7.0][4.7.0] - 2023-12-11 -### changed +## [4.7.0] - 2023-12-11 +### changed - **14_yields_and_config** The new default is to not use yield calibration factors from a calibration run. The switch s14_use_yield_calib can optionally reenable the use of yield calibration factors. - **36_employment** regression between hourly labor regression and GDP pc changed from linear to log-log - **inputdata** Now using inputdata rev4.94 which is based on 67420 cells (67k, previously 59k) @@ -259,61 +249,56 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** LUH2_disaggregation output script was modified. Specifically, flooded area was made compatible with the LUH definition, cropland and grazing land were added to the states.nc file, and specific naming/details (datatype, zname, xname, and yname) were added when creating the .nc files. ### added - - **14_yields/config** Added option for considering impacts of land degradation on yields. If `s14_degradation` is switched to 1, MAgPIE will include cluster-specific information on the state of nature's contributions to people relevant for yields `./modules/14_yields/input/f14_yld_ncp_report.cs3`. - **18_residues** Included cluster-level residue realization, for cluster-level production of residues (but balancing of recycling and burning budgets remains at region-level, for computational lightness) - **32_forestry** new interface `vm_land_forestry` - **58_peatland** added realization "v2" with updated peatland map and GHG emission factors ### fixed - - **inputdata** There was a major bug (related to proj/terra) in the rev4.91 inputdata that was fixed with rev4.92 - **inputdata** There was another bug (terra default na.rm changed) in the inputdata that was fixed with rev4.93 - **scripts** Fixed a bug in NPI/NDC calculations leading to missing AD policies when run with 67k -## [4.6.11][4.6.11] - 2023-09-05 -### changed +## [4.6.11] - 2023-09-05 +### changed - **scripts** All time steps between 2015 and 2050 are now reported to SEALS ### fixed - - **70_livestock** fixed division by zero that could occur depending on the scenario set-up -## [4.6.10][4.6.10] - 2023-08-16 -### changed +## [4.6.10] - 2023-08-16 +### changed - **config** update preprocessing to newest input data v4.88 with new transport costs - **GitHub action** the github action is now faster, because it installs binary packages from Posit Package Manager - **scenario_config.csv** update preprocessing to newest input data v4.88 - **scripts** output.R is now faster, because it no longer searches runfolder renvs for full.gms files ### fixed - - **scripts** check_config does not warn about c_input_gdx_path anymore while running empty model - **scripts** fixed erronoeous if clause in output.R - **scripts** fixed output/extra/disaggregation_LUH2.R. The script was not working any more because magpie4::protectedArea was changed to return protected area for all land types. Moreover, the script now also works for runs without dynamic forestry (default run) but with a warning message. -## [4.6.9][4.6.9] - 2023-07-27 -### fixed +## [4.6.9] - 2023-07-27 +### fixed - **70_livestock** consideration of milk demand in the calculation of the pasture management factor - **scripts** Fixed inaccuracies and inconsistent application of SNV policies during disaggregation in luscale::interpolateAvlCroplandWeighted(), which is called in extra/disaggregation.R -## [4.6.8][4.6.8] - 2023-07-17 -### changed +## [4.6.8] - 2023-07-17 +### changed - **41_area_equipped_for_irrigation** new AEI data (Mehta2022) replacing old Siebert data - **80_optimization** printing of solprint when solver status is 7 re-activated - **scripts** start_functions.R can now handle clusters per region flexibly - **scripts** the REMIND-MAgPIE coupling now uses renv ### added - - **31_past** added `cc`, `nocc` and `nocc_hist` options for `c31_past_suit_scen` and `c31_grassl_yld_scenario` - **32_carbon** added `nocc` and `nocc_hist` option for `c52_land_carbon_sink_rcp` - **71_disagg_lvst** added new realisation `foragebased_jul23` which solves GAMS issues at higher spatial resolutions @@ -323,22 +308,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** New output script for reporting disaggregated land use patterns to the SEALS (Spatial Economic Allocation Landscape Simulator) downscaling model ### removed - - **config** `s80_num_nonopt_allowed` - **scripts** removed .snapshot.Rprofile and the Rprofile.R script, renv now fully supersedes snapshots ### fixed - - **30_crop** corrected q30_cropland in module realization rotation_apr22, where fallow land was on the wrong side of the equation - **71_disagg_lvst** reworked `foragebased_aug18` (including removal of linear version and correction of balance flow calculation) - **80_optimization** resolve was not working in nlp_par realization due to `s80_num_nonopt_allowed` - **config** corrected wrong names of parameters for peatland costs - **config** updated scenario configs to newest preprocessing (4.87) -## [4.6.7][4.6.7] - 2023-05-10 -### changed +## [4.6.7] - 2023-05-10 +### changed - **09_drivers** Harmonization of sets for population, gdp, pal and demography - **56_ghg_policy** added emission policies without GHG emissions from peatlands - **config** added scenario `SSP2EU` in scenario_config.csv @@ -349,21 +332,20 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** NDC/NPI calculations can now handle 59k and 67k cell inputs ### added - - **15_food** added an option in `s15_exo_diet` to allow for exogenous diet scenario for India -## [4.6.6][4.6.6] - 2023-05-10 -### changed +## [4.6.6] - 2023-05-10 +### changed - **config** updated scenario_fsec.csv to reflect new GST validation - **scripts** included new output indicator for water - **scripts** updated global surface temperature maps to new RCPs per scenario -## [4.6.5][4.6.5] - 2023-03-29 -### changed +## [4.6.5] - 2023-03-29 +### changed - **22_land_conservation** Replaced old options for land conservation by new conservation priority areas. These include among others a new 30by30 template (based on Key Biodiversity Areas, unprotected habitat in Biodiversity Hotspots, Ecoregions with a high beta-diversity from the Global Safety Net (Dinerstein et al. 2020) and critical connectivity areas (Brennan et al. 2022), a new Half Earth template based on the Global Safety Net (Dinerstein et al. 2020) and land conservation of irrecoverable carbon (Noon et al. 2022). - **56_ghg_policy** renamed `cfg$mute_ghgprices_until` to `cfg$gms$c56_mute_ghgprices_until` and changed the default to `y2030`, i.e. no GHG emission pricing in the AFOLU sector before (and including) 2030. This setting will be also used in coupled REMIND-MAgPIE runs. - **config** input data revision to rev4.82 to include new conservation priority areas @@ -373,26 +355,23 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** Disaggregation of land use to 0.5° now takes land conservation into account - i.e. cropland expansion is not mapped to areas that are subject to land conservation ### added - - **56_ghg_policy** added switch `s56_minimum_cprice` - **config** minimum CO2 price (`s56_minimum_cprice`) of 5 USD per tCO2 (18 USD per tC) for all future time steps in case of NDC policy to guide land-use decisions - **scripts** added output script which writes landuse data on cluster resolution to a shapefile ### removed - - **56_ghg_policy** removed `s56_ghgprice_phase_in` and `s56_ghgprice_start` - **scripts** removed argument `mute_ghgprices_until`, now handeld in GAMS code ### fixed - - **31_past** fixed pasture suitability to SSP2 before and including 2020 (only relevant for grassland implementation) - **56_ghg_policy** the renamed switch `c56_mute_ghgprices_until` is now always used for coupled as well as standalone runs. - **scripts** Fixed occasional memory failure in the disaggregation script -## [4.6.4][4.6.4] - 2023-02-22 -### changed +## [4.6.4] - 2023-02-22 +### changed - **15_food** Interpret EAT-Lancet guidelines not as target but as lower/upper limits - **config** changed order of output scripts. Some functions in rds_report require gridded outputs. - **config** input data revision to rev4.81 for trade margin bugfix @@ -407,7 +386,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **sticky_labor** renamed equation `q38_labor_capital_ratio` to `q38_labor_share_target` ### added - - **15_food** half_overweight scenario added - **21_trade** New Bilateral trade realization selfsuff_reduced_bilat22 for bilateral trade within selffsuff constraints - **32_forestry** added switch `s32_aff_prot` for protection of afforested areas (0=until end of planning horizon 1=forever) @@ -420,11 +398,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **sticky_labor** `nl_fix`, `nl_relax` and `nl_release` added ### removed - - **42_water_demand** removed fm_multicropping factor because of fallow inconsistency ### fixed - - **14_yields** nl_fix updated to current equation - **32_forestry** pm_land_conservation(t,j,"secdforest","restore") now accounts for the rotation length in timber plantations to avoid infeasibilities - **44_biodiversity** added regional layer `i` in `bii_target` realisation to make it compatible with the high-resolution parallel optimization output script @@ -432,10 +408,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** fixed a bug where renvs for high resolution runs were missing some packages - **scripts** fixed in the calc_calib.R script the saving of calib_factors used in each iteration to ensure that they correspond to the divergence reported. Changed divergence from zero to NA for those iterations where calib_factors are above the limit. The best_calib selection criterion was changed from selecting the factors of the iteration with the lowest standard deviation to the selection, for each region, of the factor of the iteration with the lowest divergence. Also, factors from the first iteration are now not considered, and if two different factors had the same divergence for a region, the one of the latest iteration is picked. -## [4.6.3][4.6.3] - 2023-01-19 -### changed +## [4.6.3] - 2023-01-19 +### changed - **15_food** changed `anthro_iso_jun22` realisation such that results in case of `exo_diet = 1/0` and `exo_waste = 1/0` are identical until 2020 - **30_crop** identical assumptions for bioenergy until 2020 - **38_factor_costs** changed name of set `req` to `factors` (also used in 11_costs, 57_maccs, 70_livestock) @@ -446,19 +422,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **config** update input data to rev4.79 ### added - - **31_past** added additional limitation (single climate scenario input) for **grasslands_apr22** - **59_som** added new **cellpool_jan23** realization with updated 2019 IPCC guidelines values - **scripts** added start script which starts an empty model just regenerating a previous run ### fixed - - **scripts** make sure that `c_title` in the GAMS code is not containing dots which otherwise could lead to compilation errors -## [4.6.2][4.6.2] - 2023-01-12 -### changed +## [4.6.2] - 2023-01-12 +### changed - **36_employment** include labor costs from MACCs in employment - **38_factor_cots** renamed `p36_cost_shares` to `pm_cost_share_crops` - **57_maccs** split costs into labor and capital @@ -467,16 +441,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** FSDP_collect FSDP_process fsec.R updates ### added - - **renv** MAgPIE now runs in an isolated, stable, reproducible R package environment - **scripts** added output script that generates a short mif containing only variables relevant for the REMIND coupling - **scripts** added output script that generates subnational validation outputs for fable_India projects - **setup** required R packages are automatically installed -## [4.6.1][4.6.1] - 2022-12-13 -### changed +## [4.6.1] - 2022-12-13 +### changed - **42_water_demand** replaced `f42_env_flow_policy` with macro - **30_crop** replaced `f30_scenario_fader` with macro - **30_crop/config** changed switch `c30_rotation_scenario_speed` to `s30_rotation_scenario_target` @@ -484,7 +457,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **config** changed default value for `c30_marginal_land` from `'all_marginal'` to `'q33_marginal'` for better spatial cropland patterns ### added - - **10_land** added `vm_lu_transitions` as interface - **10_land** added interface `fm_land_iso` for consistency - **30_crop/config** added switch `s30_rotation_scenario_start` @@ -493,7 +465,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **39_landconversion** scalar `s39_reward_crop_reduction` provides a cropland reduction reward ### removed - - **10_land** removed `feb15` realization - **10_land** removed the interfaces `vm_croplandexpansion` and `vm_croplandreduction` - **30_crop** removed `f30_scenario_fader.csv`input @@ -502,15 +473,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** removed remind2::deletePlus in coupling interface of start_function ### fixed - - **59_som** fixed land use change tracking for non-cropland pools in the `cellpool_aug16` realization - **config** changed default value for s56_limit_ch4_n2o_price from 1000 to 4000 for consistency with c57_macc_version = "PBL_2022" - **scripts** rewrite of land conversion cost calibration script `landconversion_cost.R` -## [4.6.0][4.6.0] - 2022-11-09 -### changed +## [4.6.0] - 2022-11-09 +### changed - **18_residues** bugfix in `q18_cost_prod_res` - **36_employment** included calculations for minimum wage scenario - **38_factor_costs** included labor cost scaling in case of wage scenario @@ -547,7 +517,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts/start** cleanup of old start scripts ### added - - **14_yields** added input file containing AQUASTAT yield calibration factors and switch `s14_calib_ir2rf` in default.cfg to activate this yield calibration - **15_food** added new realization with country level exogenous diets, product-specific intake estimates, new scenarios for exogenous BMI and decomposition switches for EAT Lancet diets. Simplified code and improved iteration procedure. - **50_nr_soil_budget** new module realization for more consistent MACCs implementation. change of interface from vm_btm_reg to vm_emissions_reg @@ -569,7 +538,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added water output script for FSEC model runs ### removed - - **15_food** removed read-in of non-needed input file "f15_calib_factor_FAOfsupply_iso" - **38_factor_costs** removed `mixed_reg_feb17` realization - **50_nr_soil_budget** old inconsistent module realizations @@ -578,16 +546,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **57_maccs** old inconsistent module realizations ### fixed - - **38_factor_costs** fixed calibration of share parameter in `sticky_labor` realization - **43_water_availability** added missing years after 2100 in "f43_wat_avail" to avoid infeasibilities in coupled runs with less_ts timesteps - **59_som** corrected the som pool due to the carbon transfer from other and primary forest to secondary forest before optimization (presolve) - **scripts** fixed some bugs related to background execution of start/output scripts -## [4.5.0][4.5.0] - 2022-07-07 -### changed +## [4.5.0] - 2022-07-07 +### changed - **09_drivers** separation of GDP and population scenarios - **09_drivers** changed `i09_gdp_pc_mer_iso` to `im_gdp_pc_mer_iso` - **11_costs** Split of production costs per sector, addded new separated costs to the costs function. @@ -595,10 +562,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **13_tc** Replace endo_jan18 realization by endo_jan22. The new realization adds a new dimension to vm_tau separating crop from managed pastures tau. - **15_food** added more options to define convergence towards exogenous food intake and waste scenarios accounting for different transition periods - **18_residues** The variable that include production costs vm_cost_prod for residues changed to a new independent variable called vm_cost_prod_kres - (specific to residues). +(specific to residues). - **30_crop** renamed switch `s30_set_aside_shr`, `s30_set_aside_shr_noselect` and `c30_set_aside_target` to `s30_snv_shr`, `s30_snv_shr_noselect` and `c30_snv_target`. - **31_past** The variable that include production costs vm_cost_prod for pasture changed to a new independent variable called vm_cost_prod_past - (specific to past). +(specific to past). - **31_past** added new realization implementing the separation of rangelands and managed pastures for the production of grass biomass. - **32_forestry** simplification and bugfix of afforestation limit. `c32_max_aff_area_glo` renamed to `s32_max_aff_area_glo` in default.cfg. - **34_urban** added set urban_scen34 and the switch c34_urban_scenario @@ -632,7 +599,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** scripts/output/extra/emulator.R Remove dependency on deprecated R package "magpie" ### added - - **core** macros for linear and sigmoidal time interpolation - **22_land_conservation** added new module and realisation for land conservation. The realisation also includes a new WDPA initialisation data set (from 1995 to 2020) for protected areas under legal protection, meeting IUCN and CBD protected area definitions. The module also adds the interface `pm_land_conservation`. - **30_crop** new module realizations including crop rotation scenarios by strict constraints (`rotation_apr22`) and by penalties (`penalty_apr22`) @@ -645,11 +611,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **config** added option for CO2 emission pricing `cfg$gms$c56_carbon_stock_pricing` - **config** added cfg$gms$s70_past_mngmnt_factor_fix with default 2005 (previous default was 2010). The previous setting caused a strong spike in CO2 emissions from pasture expansion in SSA. With 2005, this can be avoided. - **inputs** New input files added: - f13_pastr_tau_hist.csv -> historical tau for managed pastures. - f31_pastr_suitability.cs3 -> Managed pasture suitability - f31_LUH2v2.cs3 -> LUH2v2 land classes separating rangelands from managed pastures - f31_grassl_yld.cs3 -> Rangelands and managed pastures grass yields - f31_grass_bio_hist.cs3 -> Historical grass biomass demand + f13_pastr_tau_hist.csv -> historical tau for managed pastures. + f31_pastr_suitability.cs3 -> Managed pasture suitability + f31_LUH2v2.cs3 -> LUH2v2 land classes separating rangelands from managed pastures + f31_grassl_yld.cs3 -> Rangelands and managed pastures grass yields + f31_grass_bio_hist.cs3 -> Historical grass biomass demand - **modules** New dimension in `vm_carbon_stock` for different carbon stock types (actual, previousLandPattern, previousCarbonDensity) - **scripts** output/projects/FSEC_StevenLord.R to create output for Steven Lord in the FSEC context - **scripts** output/projects/FSEC_costs.R to create costs ouput for the FSEC project @@ -659,11 +625,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** `start/projects/test_rotations.R` testscript for different rotation scenario settings ### removed - - **38_factor_costs** mixed_feb17 and fixed_per_ton_mar18 realizations removed because they are not being used at the moment. ### fixed - - **09_drivers** bugfix concerning the use of the switch c09_gdp_scenario for defining population assumptions - **09_drivers** introduced new sets for PAL and demography scenarios to account for only partial coverage of available socio-economic gdp and population scenarios - **18_residues** off realization; missing variable declarations @@ -682,10 +646,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** fixed configuration error in FSEC output scripts, FSEC_dietaryIndicators.R and FSEC_environmentalPollutants.R - **scripts** scripts/start/extra/emulator.R Throw an error if no file can be found to take the GHG prices from -## [4.4.0][4.4.0] - 2021-12-13 -### changed +## [4.4.0] - 2021-12-13 +### changed - **additional_data** NDCs for Chinas afforestation now start earlier (1995) in line with observed afforestation. - **config** comments added for correct use of nitrogen switches - **inputs** new default LPJmL version with growing season adaptation (gsadapt) on @@ -725,7 +689,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** start/test_runs.R added SSP1, SSP2 and SSP5 as default test runs ### added - - **34_urban** New exo_nov21 exogenous realization of urban land expansion - **21_trade** Missing interface parameter for failing exo realization runs - **59_som** exogenous pathway for vm_nr_som via f59_som_exogenous @@ -748,7 +711,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **output.R** added SLURM standby maxMem and SLURM priority maxMem; needed for some output scripts (e.g. disaggregation_LUH2.R) ### removed - - **32_foresty** Removed static realization - **35_natveg** Removed static realization - **scripts** lpjml_addon script is removed and all calls within dependend starting scripts @@ -761,7 +723,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **39_landconversion_cost** removed realizations "global_static_aug18" and "devstate" ### fixed - - **80_optimization** Improved solve logic in "nlp_apr17" and "nlp_par" realization, multiple bugfixes and switch to solvelink=3 in "nlp_par" - **58_peatland** fixed rare infeasibility in "on" realization - **10_land** fixed rare infeasibility in "landmatrix_dec18" realization @@ -776,10 +737,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **73_timber** plausible cost for balance variable in case of s73_timber_demand_switch = 0 to avoid cost distortion - **56_ghg_policy** choose the correct scenario for fixing the GHG prices until sm_fix_SSP2 -## [4.3.5][4.3.5] - 2021-09-02 -### changed +## [4.3.5] - 2021-09-02 +### changed - **13_tc** added switch to ignore historic tau patterns in historic time steps (new default) - **16_demand** Moved most of cropping related set definitions (k, kve, kcr) from **16_demand** to **14_yield** - **32_foresty** Added option to choose a rotation length calculation criteria @@ -795,8 +756,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **inputs** Changed file format from cs2 to cs2b for cellular input files with a single data column - **scenario_config** added RCPs as columns for use with setSceanrio function. This required the addition of "gms$" in the 1st column. -### added +### added - **73_timber** Added construction wood demand scenarios based on Churkina et al. 2020 - **script(s)** Added scripts to replicate runs for Mishra et al. 2021 (in review : https://doi.org/10.5194/gmd-2021-76) - **13_tc** Added new interfaces for tau factor of the previous time step (`pcm_tau`) @@ -817,12 +778,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **sets** added superregional layer `h` as additional spatial layer and moved constraints in **13_tc** and **21_trade** partly to the superregional level. ### removed - - **13_tc** Removed disfuctional setting c13_tccost = "mixed" - **core** removed sets ac_young and ac_mature (no longer needed due to changes in 44_biodiversity) ### fixed - - **32_foresty** BII coefficients for CO2 price driven afforestation - **32_foresty** growth curve CO2 price driven afforestation - **32_foresty** NPI/NDC afforestation infeasibility @@ -830,29 +789,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **35_natveg** option to fade out damage from shifting agriculture by 2030 - **44_biodiversity** ac0 included in pricing of biodiversity loss -## [4.3.4][4.3.4] - 2021-04-30 -### changed +## [4.3.4] - 2021-04-30 +### changed - **51_nitrogen** New calculations for emissions from agricultural residues (vm_res_ag_burn) - **53_methane** New calculations for emissions from agricultural residues (vm_res_ag_burn) - **citation file** added new contributors ### added - - **config** The set "kfo_rd" (livst_rum, livst_milk), which is used in the food substitution scenarios c15_rumdairy_scp_scen and c15_rumdairyscen, has been added to the default.cfg file. This allows for sensitivity scenarios (e.g. only livst_milk or only livst_rum). - A new scenario (nocc_hist) was added to the cc/nocc switch. In this scenario, parameters affected by the cc/nocc switch in **14_yields**,**42_water_demand**,**43_water_availability**,**52_carbon**,**59_som** keep their historical/variable values up to the year defined by sm_fix_cc. Afterwards, sm_fix_cc values are kept constant for the overall run horizon. ### fixed - - **09_drivers** migration of sm_fix_SSP2 and sm_fix_cc declaration from the core declarations to the drivers module. This will allow to set the scalars properly . - - **15_food** single-cell protein substitution scenarios included in intersolve.gms. - **20_processing** The "mixed" scenario for single-cell protein production (c20_scp_type) was not working as expected. The corresponding code in 20_processing has been updated. -## [4.3.3][4.3.3] - 2021-03-30 -### added +## [4.3.3] - 2021-03-30 +### added - **15_food*** added 3 sigmoid food substitution scenarios - **44_biodiversity** New biodiversity module. The realization bv_btc_mar21 now allows to calculate an area-based biodiversity value across all land types. Switch `c44_price_bv_loss` to implement cost for biodiversity loss. - **56_ghg_policy** Automatic sets for scenarios @@ -863,13 +820,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** Added pre-commit hook ### fixed - - **60_bioenergy** Minimal bioenergy demand -## [4.3.2][4.3.2] - 2021-03-17 -### changed +## [4.3.2] - 2021-03-17 +### changed - **12_interest_rate** Interest fader changed to csv - **15_food** better documentation of parameters over model iterations - **15_food** added scenario switch for ruminant and dairy replacement by Single-Cell Protein @@ -882,7 +838,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **tests** Replaced TravisCI with GithubActions ### added - - **15_food** Added the option to fade out livestock demand towards a target level in kcal/cap/day. - **21_trade** Added scalar `s21_trade_bal_damper` and new set `k_trade_excl_timber` - **29_ageclass** New age-class module @@ -903,32 +858,29 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added output script for disaggregation of land transitions ### removed - - **32_forestry** Removed previous default realization - **35_natveg** Removed previous default realization - **73_timber** Removed previous default realization ### fixed - - **32_forestry** Bugfixes for "ac_est" and carbon treshold afforestation; removed plantations from "vm_cdr_aff". - **core** bugfix m_fillmissingyears macro; was running over t before; now running over t_all_ -## [4.3.1][4.3.1] - 2020-11-03 -### added +## [4.3.1] - 2020-11-03 +### added - **main** Added Dockerfile for running MAgPIE in a container ### fixed - - **35_natveg** Bugfix "v35_secdforest_expansion" - **52_carbon** Bugfix "p52_scaling_factor" for climate change runs - **73_timber** New scenario switch `c73_wood_scen`. -## [4.3.0][4.3.0] - 2020-09-15 -### added +## [4.3.0] - 2020-09-15 +### added - **38_factor_costs** Added the new "sticky" realization to the factor costs module. The realization "sticky_feb18" favors expansion in cells with preexisting farmland and capital based on capital investment decisions. - **modules** added endogenous implementation of local biophysical (bph) impacts of afforestation to existing realizations in modules 32_forestry (dynamic_oct19) and 56_ghg_policy (price_jan20). default = off - **73_timber** Added timber module which brings the ability of producing woody biomass for timber plantations and natural vegetation. Default = off. New switch: `s73_foresight`. New scalars : `s73_timber_prod_cost`, `s73_timber_harvest_cost`,`s73_cost_multiplier`,`s73_free_prod_cost` @@ -940,139 +892,131 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **scripts** added start script for making timber production runs (forestry.R). ### changed - - **scripts** updated selection routine for start and output scripts - **scripts** replaced lucode dependency with newer packages lucode2 and gms - **32_forestry** include new datasets of the bph effect of afforestation / replaced the bph ageclass switch with a fade-in between ac10 and ac30 in (dynamic_may20) -- **13_tc**, **39_landconversion**, **41_area_equipped_for_irrigation** and **58_peatland**. For the current time step, the optimization costs only include now the annuity of the present investment. magpie4's reportCosts() function was modified to consider these changes. + - **13_tc**, **39_landconversion**, **41_area_equipped_for_irrigation** and **58_peatland**. For the current time step, the optimization costs only include now the annuity of the present investment. magpie4's reportCosts() function was modified to consider these changes. ### removed - -- **scripts** deleted outdated start and output scripts + - **scripts** deleted outdated start and output scripts ### fixed + - **32_forestry** Rotation length calculation based on correct marginals of growth function in timber plantations. Clearer calculations for harvested area for timber production. + - **35_natveg** Clearer calculations for harvested area for timber production. + - **52_carbon** Fix to the Carbon densities received from LPJmL for timber plantations. -- **32_forestry** Rotation length calculation based on correct marginals of growth function in timber plantations. Clearer calculations for harvested area for timber production. -- **35_natveg** Clearer calculations for harvested area for timber production. -- **52_carbon** Fix to the Carbon densities received from LPJmL for timber plantations. -## [4.2.1][4.2.1] - 2020-05-15 +## [4.2.1] - 2020-05-15 ### added - -- **modules** added option of regional scenario switches in modules 12_interest_rate, 15_food, 42_water_demand, 50_nr_soil_budget, 55_awms, 56_ghg_policy, 60_bioenergy -- **58_peatland** added peatland module. Two realizations: off (=default) and on. -- **80_optimization** added realization for parallel optimization of regions in combination with fixed trade patterns. -- **metadata** added .zenodo.json metadata file for proper metadata information in ZENODO releases + - **modules** added option of regional scenario switches in modules 12_interest_rate, 15_food, 42_water_demand, 50_nr_soil_budget, 55_awms, 56_ghg_policy, 60_bioenergy + - **58_peatland** added peatland module. Two realizations: off (=default) and on. + - **80_optimization** added realization for parallel optimization of regions in combination with fixed trade patterns. + - **metadata** added .zenodo.json metadata file for proper metadata information in ZENODO releases ### changed - -- **12_interest_rate** merged the two realizations (glo_jan16 and reg_feb18) into one (select_apr20) with same functionality and add on of option to choose different interest rate scenarios for different regions selected via country switch select_countries12 -- **scripts** streamlined and improved performance of NPI/NDC preprocessing + - **12_interest_rate** merged the two realizations (glo_jan16 and reg_feb18) into one (select_apr20) with same functionality and add on of option to choose different interest rate scenarios for different regions selected via country switch select_countries12 + - **scripts** streamlined and improved performance of NPI/NDC preprocessing ### fixed + - **56_ghg_policy and 60_bioenergy** update of GHG prices and 2nd generation bioenergy demand from SSPDB to most recent snapshot + - **NPI/NDC policy calculations** revision of calculation method -- **56_ghg_policy and 60_bioenergy** update of GHG prices and 2nd generation bioenergy demand from SSPDB to most recent snapshot -- **NPI/NDC policy calculations** revision of calculation method -## [4.2.0][4.2.0] - 2020-04-15 +## [4.2.0] - 2020-04-15 -This release version is focussed on consistency between the MAgPIE setup and the [REMIND model][REMIND model] and result of a validation exercise of the coupled (REMIND 2.1)-(MAgPIE 4.2) system. +This release version is focussed on consistency between the MAgPIE setup and the [REMIND model] and result of a validation exercise of the coupled (REMIND 2.1)-(MAgPIE 4.2) system. ### added - -- **config** Added new socioeconomic scenario (SDP) to scenario_config.csv (which include all switches to define among others the SSP scenarios). For the parametrization of the new SDP (Sustainable Development Pathway) scenario, the list of scenario switches was extended to account for a broad range of sustainability dimensions. -- **10_land** added new land realization landmatrix_dec18 to directly track land transition between land use types -- **15_food** stronger ruminant fade out in India -- **15_food** Added exogenous food substitution scenarios that can be selected via settings in the config-file, defining speed of convergence, scenario targets and transition periods (applied after the food demand model is executed). Among these scenarios are the substitution of livestock products with plant-based food commodities and the substitution of beef or fish with poultry. The food substitution scenarios are based on the model-native, regression-based calculation of food intake and demand. -- **15_food** Added exogenous EAT Lancet diet scenarios: It is now possible to define in the config-file exogenous diet scenarios that replace the regression-based calculation of food intake and demand. Possible settings are the target for total calorie intake (e.g. according to a healthy BMI) and variants of the EAT Lancet diet (e.g. in addition to the flexitarian a vegetarian or vegan variant). -- **15_food** Added exogenous food waste scenarios which can be defined via settings in the config-file, including scenario targets for the ratio between food demand and intake and the year in which full transition to the target should be achieved. -- **30_crop** added crop specific land use initialization pattern (used as interface for other modules) -- **50_nr_soil_budget and 55_awms** Additional inputs for the GoodPractice Scenario. -- **52_carbon** Added new forest growth curve parameters based on Braakhekke et al. 2019. Growth curves are now differentiated between natural vegetation (default) and plantations. -- **59_som** added new realization static_jan19 (new default) including all soil carbon related calculations. Before all carbon pools were updated in the specific land use type modules. This still holds true for the above ground pools (vegetation and litter carbon) -- **.gitattributes** file added to set line ending handling to auto for all text files -- **scaling** added scaling.gms files for several modules to improve optimization (based on gdx::calc_scaling) -- **scripts** added output scripts for global soil carbon maps (SoilMaps.R). + - **config** Added new socioeconomic scenario (SDP) to scenario_config.csv (which include all switches to define among others the SSP scenarios). For the parametrization of the new SDP (Sustainable Development Pathway) scenario, the list of scenario switches was extended to account for a broad range of sustainability dimensions. + - **10_land** added new land realization landmatrix_dec18 to directly track land transition between land use types + - **15_food** stronger ruminant fade out in India + - **15_food** Added exogenous food substitution scenarios that can be selected via settings in the config-file, defining speed of convergence, scenario targets and transition periods (applied after the food demand model is executed). Among these scenarios are the substitution of livestock products with plant-based food commodities and the substitution of beef or fish with poultry. The food substitution scenarios are based on the model-native, regression-based calculation of food intake and demand. + - **15_food** Added exogenous EAT Lancet diet scenarios: It is now possible to define in the config-file exogenous diet scenarios that replace the regression-based calculation of food intake and demand. Possible settings are the target for total calorie intake (e.g. according to a healthy BMI) and variants of the EAT Lancet diet (e.g. in addition to the flexitarian a vegetarian or vegan variant). + - **15_food** Added exogenous food waste scenarios which can be defined via settings in the config-file, including scenario targets for the ratio between food demand and intake and the year in which full transition to the target should be achieved. + - **30_crop** added crop specific land use initialization pattern (used as interface for other modules) + - **50_nr_soil_budget and 55_awms** Additional inputs for the GoodPractice Scenario. + - **52_carbon** Added new forest growth curve parameters based on Braakhekke et al. 2019. Growth curves are now differentiated between natural vegetation (default) and plantations. + - **59_som** added new realization static_jan19 (new default) including all soil carbon related calculations. Before all carbon pools were updated in the specific land use type modules. This still holds true for the above ground pools (vegetation and litter carbon) + - **.gitattributes** file added to set line ending handling to auto for all text files + - **scaling** added scaling.gms files for several modules to improve optimization (based on gdx::calc_scaling) + - **scripts** added output scripts for global soil carbon maps (SoilMaps.R). ### changed - -- **config** new default ghg emission pricing policy "redd+_nosoil" in c56_emis_policy. Includes all pools included in the previous default "SSP_nosoil", and in addition "forestry". -- **13_tau** lower bound for vm_tau for historical time steps -- **50_nr_soil_budget** atmospheric deposition is now estimated on the cluster-level instead of the region level to improve spatial patterns. -- **56_ghg_policy** updated scenarios in f56_emis_policy: none, all natural (called 'ssp') and all land use change emissions (pure co2) being included in greenhouse gas pricing. ssp and all also featuring additional scenarios excluding soil carbon pricing (marked with '_nosoil' postscript). -- **56_ghg_policy** Several changes regarding afforestation: use of detailed formula for incentive calculation instead of simplified Hotelling formula, 50 year planning horizon (instead of 80 years), phase-in of GHG prices deactivated by default (now done in REMIND), CO2 price reduction factor deactivated by default, introduced buffer reduction factor of 20% for afforestation. -- **59_som** updated cellpool_aug16 realization to use new interfaces from land module on land use type specific land expansion and reduction as well as crop type specific land initialization pattern. Additionally added irrigation as stock change factor sub-type. N fertilizer from soil organic matter decomposition is truncated after threshold to avoid unrealistically high fertilization rates. -- **80_optimization** write extended run information in list file in the case that the final solution is infeasible -- **modules** modular structure updated from version 1 to version 2 -- **line endings** changed to unix-style for all text files + - **config** new default ghg emission pricing policy "redd+_nosoil" in c56_emis_policy. Includes all pools included in the previous default "SSP_nosoil", and in addition "forestry". + - **13_tau** lower bound for vm_tau for historical time steps + - **50_nr_soil_budget** atmospheric deposition is now estimated on the cluster-level instead of the region level to improve spatial patterns. + - **56_ghg_policy** updated scenarios in f56_emis_policy: none, all natural (called 'ssp') and all land use change emissions (pure co2) being included in greenhouse gas pricing. ssp and all also featuring additional scenarios excluding soil carbon pricing (marked with '_nosoil' postscript). + - **56_ghg_policy** Several changes regarding afforestation: use of detailed formula for incentive calculation instead of simplified Hotelling formula, 50 year planning horizon (instead of 80 years), phase-in of GHG prices deactivated by default (now done in REMIND), CO2 price reduction factor deactivated by default, introduced buffer reduction factor of 20% for afforestation. + - **59_som** updated cellpool_aug16 realization to use new interfaces from land module on land use type specific land expansion and reduction as well as crop type specific land initialization pattern. Additionally added irrigation as stock change factor sub-type. N fertilizer from soil organic matter decomposition is truncated after threshold to avoid unrealistically high fertilization rates. + - **80_optimization** write extended run information in list file in the case that the final solution is infeasible + - **modules** modular structure updated from version 1 to version 2 + - **line endings** changed to unix-style for all text files ### fixed + - **modules** Fixing of all parameters to SSP2 values until 2020 (switch sm_fix_SSP2) for having identical outcomes in all scenarios (SDP, SSP1-5) until 2020. + - **21_trade** Bugfix kall instead of k in exo realization; Bufix begr/betr trade in default realization; Bugfix sets in free realization + - **32_forestry** NPI/NDC afforestation targets are now counted towards the global afforestation limit, which can be set for specific scenarios via the switch *s32maxaff_area* and constrains the potential for carbon-price induced endogenous afforestation. + - **56_ghg_policy** bugfix full soil carbon loss in default setting, renamed it from ssp to ssp_nosoil, indicating, that soil carbon losses are not priced. + - **56_ghg_policy** bugfix afforestation: vmbtm_cell was a free variable for some sources and pollutants, which could result in GHG cost neutral shifting of age classes to ac0 (e.g. from ac55 to ac0). + - **80_optimization** added fallback routine for CONOPT4 failure (fatal system error) -- **modules** Fixing of all parameters to SSP2 values until 2020 (switch sm_fix_SSP2) for having identical outcomes in all scenarios (SDP, SSP1-5) until 2020. -- **21_trade** Bugfix kall instead of k in exo realization; Bufix begr/betr trade in default realization; Bugfix sets in free realization -- **32_forestry** NPI/NDC afforestation targets are now counted towards the global afforestation limit, which can be set for specific scenarios via the switch *s32maxaff_area* and constrains the potential for carbon-price induced endogenous afforestation. -- **56_ghg_policy** bugfix full soil carbon loss in default setting, renamed it from ssp to ssp_nosoil, indicating, that soil carbon losses are not priced. -- **56_ghg_policy** bugfix afforestation: vmbtm_cell was a free variable for some sources and pollutants, which could result in GHG cost neutral shifting of age classes to ac0 (e.g. from ac55 to ac0). -- **80_optimization** added fallback routine for CONOPT4 failure (fatal system error) -## [4.1.1][4.1.1] - 2020-03-09 +## [4.1.1] - 2020-03-09 This version provides the model version used for the publication starved, stuffed and wasteful. It provides a few technical updates compared to the 4.1 release, which include ### added - - **scripts** a startscript that allows the exchange of model parameters as a sensitivity analysis ### changed - - **core** allow for flexible calibration period of the model, which allows for uncalibrated runs of the past for validation purposes - **15_food** Parameters for bodyheight regressions were included explicitly as input parameters - **config** updated input data of the drivers and food demand regressions ### fixed - - **15_food** Precision of iteration convergence criterium for magpie-demandmodel-iteration is calculated more precisely, avoiding unnecessary iterations. -## [4.1.0][4.1.0] - 2019-05-02 -This release version is focussed on consistency between the MAgPIE setup and the [REMIND model][REMIND model] and result of a validation exercise of the coupled REMIND-MAgPIE system. +## [4.1.0] - 2019-05-02 -### added +This release version is focussed on consistency between the MAgPIE setup and the [REMIND model] and result of a validation exercise of the coupled REMIND-MAgPIE system. -- **80_optimization** added support for GAMS version 26.x.x -- **scripts** added new start and output scripts -- **license** added exception to the applied AGPL license to clarify handling of required GAMS environment, solver libraries and R libraries +### added + - **80_optimization** added support for GAMS version 26.x.x + - **scripts** added new start and output scripts + - **license** added exception to the applied AGPL license to clarify handling of required GAMS environment, solver libraries and R libraries ### changed - -- **56_ghg_policy** apply reduction factor on CO2 price to account for potential negative side effects; lowers the economic incentive for CO2 emission reduction (avoided deforestation) and afforestation -- **56_ghg_policy** non-linar phase-in of GHG prices over 20 year period -- **56_ghg_policy** multiply GHG prices with development state to account for institutional requirements needed for implementing a GHG pricing scheme -- **40_transport** introduced transport costs for monogastric livestock products -- **NPI/NDC scripts** added forest protection policy for Brazilian Atlantic Forest in default NDC and NPI scenarios -- **NPI/NDC scripts** harmonized the starting year of the NDC policies 2020. -- **interpolation scripts** changed output files to seven magpie land use types, added additional cropsplit script for more detailed cropland output -- **15_food** clean-up and cosmetic changes (correction of comments, parameter names, structure of code); update BMI share calculations with the values of the last consistent MAgPIE/food-demand-model iteration + - **56_ghg_policy** apply reduction factor on CO2 price to account for potential negative side effects; lowers the economic incentive for CO2 emission reduction (avoided deforestation) and afforestation + - **56_ghg_policy** non-linar phase-in of GHG prices over 20 year period + - **56_ghg_policy** multiply GHG prices with development state to account for institutional requirements needed for implementing a GHG pricing scheme + - **40_transport** introduced transport costs for monogastric livestock products + - **NPI/NDC scripts** added forest protection policy for Brazilian Atlantic Forest in default NDC and NPI scenarios + - **NPI/NDC scripts** harmonized the starting year of the NDC policies 2020. + - **interpolation scripts** changed output files to seven magpie land use types, added additional cropsplit script for more detailed cropland output + - **15_food** clean-up and cosmetic changes (correction of comments, parameter names, structure of code); update BMI share calculations with the values of the last consistent MAgPIE/food-demand-model iteration ### fixed + - **42_water_demand** bugfix environmental flow policy harmonization for historic period + - **57_maccs** correction of cost calculation; Conversion from USD per ton C to USD per ton N and USD per ton CH4 was missing. + - **71_diagg_lvst** adjusted monogastric disaggregation for more flexiblity to avoid infeasibilities with EFPs (see 42_water_demand) + - **15_food** correction regarding the convergence measure of the iterative execution of the food demand model and MAgPIE; correction accounting for unusual time step length in body height calculations; body height regression parameters updated -- **42_water_demand** bugfix environmental flow policy harmonization for historic period -- **57_maccs** correction of cost calculation; Conversion from USD per ton C to USD per ton N and USD per ton CH4 was missing. -- **71_diagg_lvst** adjusted monogastric disaggregation for more flexiblity to avoid infeasibilities with EFPs (see 42_water_demand) -- **15_food** correction regarding the convergence measure of the iterative execution of the food demand model and MAgPIE; correction accounting for unusual time step length in body height calculations; body height regression parameters updated -## [4.0.1][4.0.1] - 2018-10-05 +## [4.0.1] - 2018-10-05 ### fixed + - **FABLE** adapted FABLE-specific configuration so that it works with MAgPIE 4.0 -- **FABLE** adapted FABLE-specific configuration so that it works with MAgPIE 4.0 -## [4.0.0][4.0.0] - 2018-10-04 +## [4.0.0] - 2018-10-04 First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.org/10.5194/gmd-12-1299-2019) for more information. -[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.8.1...develop + +[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.8.2...develop +[4.8.2]: https://github.com/magpiemodel/magpie/compare/v4.8.1...v4.8.2 [4.8.1]: https://github.com/magpiemodel/magpie/compare/v4.8.0...v4.8.1 [4.8.0]: https://github.com/magpiemodel/magpie/compare/v4.7.3...v4.8.0 [4.7.3]: https://github.com/magpiemodel/magpie/compare/v4.7.2...v4.7.3 @@ -1105,4 +1049,5 @@ First open source release of the framework. See [MAgPIE 4.0 paper](https://doi.o [4.1.0]: https://github.com/magpiemodel/magpie/compare/v4.0.1...v4.1.0 [4.0.1]: https://github.com/magpiemodel/magpie/compare/v4.0...v4.0.1 [4.0.0]: https://github.com/magpiemodel/magpie/releases/tag/v4.0 + [REMIND model]: https://www.pik-potsdam.de/research/transformation-pathways/models/remind