Merge pull request #756 from pascal-sauer/develop

release MAgPIE 4.9.0

.Rprofile

@@ -27,6 +27,7 @@ if (!"https://rse.pik-potsdam.de/r/packages" %in% getOption("repos")) {
 # bootstrapping, will only run once after this repo is freshly cloned
 if (isTRUE(rownames(installed.packages(priority = "NA")) == "renv")) {
   message("R package dependencies are not installed in this renv, installing now...")
+  renv::install("rmarkdown", prompt = FALSE) # rmarkdown is required to find dependencies in Rmd files
   renv::hydrate(prompt = FALSE, report = FALSE) # auto-detect and install all dependencies
   message("Finished installing R package dependencies.")
   if (!("upstream" %in% gert::git_remote_list()$name)) {
@@ -37,5 +38,5 @@ if (isTRUE(rownames(installed.packages(priority = "NA")) == "renv")) {
 
 # in case bootstrapping fails halfway, install piamenv and rely on requirement auto-fixing
 if (tryCatch(utils::packageVersion("piamenv") < "0.5.5", error = function(error) TRUE)) {
-  renv::install("piamenv", type = getOption("pkgType"), prompt = FALSE)
+  renv::install("piamenv", prompt = FALSE)
 }

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.8.2",
+  "version": "4.9.0",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",
@@ -123,5 +123,5 @@
   "license": {
     "id": "AGPL-3.0-or-later"
   },
-  "publication_date": "2024-09-24"
+  "publication_date": "2024-12-05"
 }

CHANGELOG.md

@@ -3,6 +3,50 @@
 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/).
 
+## [4.9.0] - 2024-12-05
+
+### changed
+- **35_natveg** revised age-class initialization of secondary forest
+- **38_factor_costs** updated use of USDA cost shares
+- **config** changed default input data to use 2017USD
+- **config** default for `c60_bioenergy_subsidy` changed from 369 to 246 USD17MER per ton
+- **config** SHAPE scenarios start year of dietary shift changed to 2025
+- **config** updated input data to rev4.114
+- **core** number of age-classes doubled from 150 to 300 years for better match of growth curves with potential natural vegetation.
+- **extra/disaggregation** Peatland now considered in disaggregation of land pools
+- **inputdata** changed GDP base year from 2005USD to 2017USD
+- **module_documentation** all references to USD05 changed to USD17
+- **modules** update of scaling factors in several modules
+- **scripts** NPI/NDC policies synced to the year 2025 - update of additional data to `additional_data_rev4.59.tgz`
+- **scripts** REMIND coupling reads data in US$2017, not US$2005
+- **scripts** renamed disaggregation_mrdownscale.R -> mrdownscale_LUH2.R
+
+### added
+- **32_forestry** added option s32_npi_ndc_reversal
+- **35_natveg** added option s35_npi_ndc_reversal
+- **56_ghg_policy** added new interface pcm_carbon_stock to avoid use of vm_carbon_stock.l in equations
+- **58_peatland** added option for exogenous peatland rewetting
+- **62_material** added switch to turn off future material demand for bioplastic
+- **config** added SSP1-POP-GDP SSP2-POP-GDP and SSP5-POP-GDP
+- **modules[29-35]** added initial values for ov_bv for better starting point
+- **scripts** add mrdownscale script (0.5deg downscaling using LandUseInit as reference)
+
+### removed
+- **13_tau** removed interface `fm_pastr_tau_hist`
+- **31_past** removed `grasslands_apr22` realization
+
+### fixed
+- **10_land** Simplified land transition matrix for improved feasibility
+- **11_costs** changed equation to fix bug in total water cost calculation
+- **28_ageclass** bugfix input data unit and code clean-up. Renamed `feb21` realization to `oct24`
+- **29_cropland** treecover age-class growth was not working properly because ac_sub was erroneously not fixed
+- **44_biodiversity** bugfix biorealm_biome.cs3 in input data (shares did not add-up to 1)
+- **56_ghg_policy** Fader for GHG emission pricing policy
+- **70_livestock** bugfix scaling.gms file in wrong folder
+- **config** additional data increased to `additional_data_rev4.58.tgz` which fixes missing gdp2017 conversions in f20_processing_unitcosts
+- **config** settings in default.cfg for some switches in `73_timber` did not work correctly
+- **scripts** script/output/extra/resubmit.R
+
 
 ## [4.8.2] - 2024-09-24
 
@@ -26,7 +70,7 @@ 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
 - **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.
-
+- **modules** renamed `country_dummy` to `country_switch` in all modules
 
 ### added
 - **42_water_demand** added water abstraction type dimension for non-ag uses
@@ -43,7 +87,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **scripts** added script for automatic submission of SEALS allocation runs `./extra/runSEALSallocation.R`
 - **scripts** added start script for 'Healthly Landscapes' paper `paper_healthyLscps.R`
 
-
 ### fixed
 - **15_food** fixing parameter declaration of i15_processed_kcal_structure_iso
 - **35_natveg** bugfix secdforest and other land restoration to avoid double-counting of restoration in equation `q29_land_snv`
@@ -79,7 +122,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - **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
 
 ### changed
@@ -1009,7 +1051,8 @@ This release version is focussed on consistency between the MAgPIE setup and the
 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.2...develop
+[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.9.0...develop
+[4.9.0]: https://github.com/magpiemodel/magpie/compare/v4.8.2...v4.9.0
 [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

CITATION.cff

@@ -156,8 +156,8 @@ abstract: The *Model of Agricultural Production and its Impact on the Environmen
   exogenously given population in 10 food energy categories, based on regional diets.
   Future trends in food demand are derived from a cross-country regression analysis,
   based on future scenarios on GDP and population growth.
-version: 4.8.2
-date-released: 2024-09-24
+version: 4.9.0
+date-released: 2024-12-05
 repository-code: https://github.com/magpiemodel/magpie
 keywords:
   - landuse

DESCRIPTION

@@ -21,14 +21,14 @@ Imports:
     m4fsdp,
     madrat,
     magclass (>= 6.14.0),
-    magpie4 (>= 2.12.6),
+    magpie4 (>= 2.15.8),
     MagpieNCGains,
-    magpiesets,
+    magpiesets (>= 0.46.1),
     mip,
     mrcommons,
     patchwork,
     piamenv (>= 0.5.5),
-    piamInterfaces (>= 0.20.7),
+    piamInterfaces (>= 0.37.1),
     piamutils,
     quitte,
     raster,
@@ -40,7 +40,7 @@ Imports:
 Suggests:
     goxygen,
     languageserver,
-    mrdownscale (>= 0.23.0),
+    mrdownscale (>= 0.28.0),
     qgraph,
     shinyresults,
     XML

README.md

@@ -24,8 +24,8 @@ https://www.pik-potsdam.de/research/projects/activities/land-use-modelling/magpi
 A framework description paper has been published in
 Geoscientific Model Development (GMD): https://doi.org/10.5194/gmd-12-1299-2019
 
-The model documentation for version 4.8.2 can be found at
-https://rse.pik-potsdam.de/doc/magpie/4.8.2/
+The model documentation for version 4.9.0 can be found at
+https://rse.pik-potsdam.de/doc/magpie/4.9.0/
 
 A most recent version of the documentation can also be extracted from the
 model source code via the R package goxygen
@@ -226,7 +226,7 @@ [email protected]
 Please contact [email protected]
 
 ## CITATION
-See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.8.2/#how-to-cite) in the model documentation for information how to cite the model.
+See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.9.0/#how-to-cite) in the model documentation for information how to cite the model.
 
 ## AUTHORS
 See list of authors in CITATION.cff