Merge pull request #262 from magpiemodel/rc

Release v4.3.2

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.github/workflows/test-code.yaml

@@ -0,0 +1,48 @@
+on:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+  pull_request:
+    branches:
+      - main
+      - master
+      - develop
+
+name: check
+
+jobs:
+  check:
+    runs-on: ubuntu-20.04
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: r-lib/actions/setup-r@v1
+
+      - name: Query dependencies
+        run: |
+          saveRDS("gms", ".github/depends.Rds", version = 2)
+          writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
+        shell: Rscript {0}
+
+      - name: Cache R packages
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.R_LIBS_USER }}
+          key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
+          restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
+
+      - name: Install R dependencies
+        run: |
+          repos <- c("https://cloud.r-project.org","https://rse.pik-potsdam.de/r/packages/")
+          install.packages(c("remotes"), repos=repos)
+          remotes::install_cran("gms", repos=repos)
+        shell: Rscript {0}
+
+      - name: codeCheck
+        run: null <- gms::codeCheck(strict=TRUE)
+        shell: Rscript {0}
+

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.3.1",
+  "version": "4.3.2",
   "creators": [
     {
       "name": "Dietrich, Jan Philipp",
@@ -76,5 +76,5 @@
   "license": {
     "id": "AGPL-3.0-or-later"
   },
-  "publication_date": "2020-11-03"
+  "publication_date": "2021-03-17"
 }

CHANGELOG.md

@@ -5,6 +5,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/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## [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
+- **20_processing** added different options for Single-Cell Protein production
+- **35_natveg** Fader for HalfEarth protection policy
+- **50_nr_soil_budget** added necessary interfaces to 50_nitrogen module
+- **70_livestock** added scenario switch for feed replacement (crop and forage) by Single-Cell Protein
+- **scripts** Updated AgMIP output scripts.
+- **runscripts** adapted to new input data and model version
+- **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
+- **32_forestry** added new default realization
+- **32_forestry** Simplified routine for plantation establishments. Added plantation area initialization based on MODIS data. Calibration to FAO growing stocks via carbon densities. New switches: `s32_distribution_type `, `s32_hvarea`, `s32_establishment_dynamic`, `s32_establishment_static`, `s32_max_self_suff`. New settings `c32_dev_scen`, `c32_incr_rate`, `c32_incr_rate`
+- **35_natveg** Added new default realization
+- **35_natveg** Added distribution in secondary forest based on Poulter et al. 2019. Added forest damages due to wildfire and shifting agriculture. Bugfix in forest protection calculations. New switches: `s35_secdf_distribution`, `s35_forest_damage`, `s35_hvarea`
+- **35_natveg** Added HalfEarth scenario to protection scenarios
+- **51_nitrogen** new module realization rescaled_jan21, which rescales n-related emissions with nitrogen surplus to account for lower emissions with higher NUE
+- **52_carbon** Simplified routine for carbon stock calculations in timber plantations and cleanup of unused code.
+- **56_ghg_policy** Added new scenario to emission policy
+- **73_timber** Additive calibration with FAO data for roundwood demand. New switches: `c73_wood_scen`
+- **73_timber** Added new realization `default` (modified version of previous realization)
+- **default.cfg** New `forestry` scenario which simulates timber production in MAgPIE
+- **scenario.csv** Added three plantation scenarios
+- **scaling** Updated scaling across the modules
+- **scripts** Updated to `forestry` script with general cleanup for publication. Added `forestry_magpie` script for generic forestry runs.
+- **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
 
 ### added
@@ -13,6 +57,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### 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
 
@@ -150,7 +195,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.3.1...develop
+[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.3.2...develop
+[4.3.2]: https://github.com/magpiemodel/magpie/compare/v4.3.1...v4.3.2
 [4.3.1]: https://github.com/magpiemodel/magpie/compare/v4.3.0...v4.3.1
 [4.3.0]: https://github.com/magpiemodel/magpie/compare/v4.2.1...v4.3.0
 [4.2.1]: https://github.com/magpiemodel/magpie/compare/v4.2.0...v4.2.1

CITATION.cff

@@ -86,8 +86,8 @@ authors:
     email: popp@pik-potsdam.de
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.3.1
-date-released: 2020-11-03
+version: 4.3.2
+date-released: 2021-03-17
 repository-code: https://github.com/magpiemodel/magpie
 keywords:
   - landuse

README.md

@@ -1,6 +1,7 @@
 # MAgPIE - Modular open source framework for modeling global land-systems
 
 [![DOI](https://zenodo.org/badge/135430060.svg)](https://zenodo.org/badge/latestdoi/135430060)
+[![R build status](https://github.com/magpiemodel/magpie/workflows/check/badge.svg)](https://github.com/magpiemodel/magpie/actions) 
 
 ## WHAT IS MAGPIE?
 The *Model of Agricultural Production and its Impact on the Environment* (MAgPIE)
@@ -23,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.3 can be found at
-https://rse.pik-potsdam.de/doc/magpie/4.3/
+The model documentation for version 4.3.2 can be found at
+https://rse.pik-potsdam.de/doc/magpie/4.3.2/
 
 A most recent version of the documentation can also be extracted from the
 model source code via the R package goxygen
@@ -212,7 +213,7 @@ magpie@pik-potsdam.de
 Please contact magpie@pik-potsdam.de
 
 ## CITATION
-See file CITATION.cff or the [How-to-Cite section](https://rse.pik-potsdam.de/doc/magpie/4.3/#howtocite) 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.3.2/#howtocite) in the model documentation for information how to cite the model.
 
 ## AUTHORS
 See list of authors in CITATION.cff