From 8591beea87bde679d7f7a4d917d9046bd2d9bd37 Mon Sep 17 00:00:00 2001 From: Jan Philipp Dietrich Date: Thu, 28 Mar 2024 16:04:37 +0100 Subject: [PATCH 1/3] added compatibility of master to recent gms package release --- .codeCheck | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .codeCheck diff --git a/.codeCheck b/.codeCheck new file mode 100644 index 0000000000..0c2f270989 --- /dev/null +++ b/.codeCheck @@ -0,0 +1,6 @@ +capitalExclusionList: + - land + - iso + - type + - age + - k From ab37df1796e29abe15afb785334522aa5ecbea82 Mon Sep 17 00:00:00 2001 From: Pascal Sauer Date: Tue, 2 Apr 2024 13:58:28 +0200 Subject: [PATCH 2/3] release 4.7.2 --- .zenodo.json | 4 ++-- CHANGELOG.md | 17 +++++++++-------- CITATION.cff | 4 ++-- README.md | 6 +++--- 4 files changed, 16 insertions(+), 15 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index e4d2e90f7a..f426c80450 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.7.1dev", + "version": "4.7.2", "creators": [ { "name": "Dietrich, Jan Philipp", @@ -114,5 +114,5 @@ "license": { "id": "AGPL-3.0-or-later" }, - "publication_date": "2024-02-28" + "publication_date": "2024-04-02" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 3dfbffae20..fb0f942c3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,23 +4,23 @@ 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] +## [4.7.2] - 2024-04-02 ### changed -- **scripts** modified output reporting for SEALS to account for forestry plantations -- **config** updated FSEC scenario config for revision and included new calibration file (after cost fix in preprocessing) -- **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 - **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 +- **config** updated FSEC scenario config for revision and included new calibration file (after cost fix in preprocessing) +- **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. -- **config** added `.codeCheck` with additonal configuration when running `gms::codeCheck` -- **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. ### removed -- **core** removed no longer needed set `si` Suitability classes +- **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. @@ -844,7 +844,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.7.1...develop +[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.7.2...develop +[4.7.2]: https://github.com/magpiemodel/magpie/compare/v4.7.1...v4.7.2 [4.7.1]: https://github.com/magpiemodel/magpie/compare/v4.7.0...v4.7.1 [4.7.0]: https://github.com/magpiemodel/magpie/compare/v4.6.11...v4.7.0 [4.6.11]: https://github.com/magpiemodel/magpie/compare/v4.6.10...v4.6.11 diff --git a/CITATION.cff b/CITATION.cff index 271e8173e4..fcdbdc8eee 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -131,8 +131,8 @@ authors: email: popp@pik-potsdam.de title: MAgPIE - An Open Source land-use modeling framework -version: 4.7.1dev -date-released: 2024-02-28 +version: 4.7.2 +date-released: 2024-04-02 repository-code: https://github.com/magpiemodel/magpie keywords: - landuse diff --git a/README.md b/README.md index 3132b3be89..c2bcd28745 100644 --- a/README.md +++ b/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.7.1 can be found at -https://rse.pik-potsdam.de/doc/magpie/4.7.1/ +The model documentation for version 4.7.2 can be found at +https://rse.pik-potsdam.de/doc/magpie/4.7.2/ 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 @@ 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.7.1/#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.7.2/#how-to-cite) in the model documentation for information how to cite the model. ## AUTHORS See list of authors in CITATION.cff From 413bc615738c2bdea01c4d7ef50fca49bdefe09a Mon Sep 17 00:00:00 2001 From: Pascal Sauer Date: Wed, 3 Apr 2024 10:37:49 +0200 Subject: [PATCH 3/3] merge master into develop --- .zenodo.json | 2 +- CHANGELOG.md | 15 +++++++++++++++ CITATION.cff | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index f426c80450..7b5aeeed0c 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.7.2", + "version": "4.7.2dev", "creators": [ { "name": "Dietrich, Jan Philipp", diff --git a/CHANGELOG.md b/CHANGELOG.md index fb0f942c3b..5892061e44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ 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] + +### changed +- + +### added +- + +### removed +- + +### fixed +- + ## [4.7.2] - 2024-04-02 ### changed diff --git a/CITATION.cff b/CITATION.cff index fcdbdc8eee..2514db68e0 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -131,7 +131,7 @@ authors: email: popp@pik-potsdam.de title: MAgPIE - An Open Source land-use modeling framework -version: 4.7.2 +version: 4.7.2dev date-released: 2024-04-02 repository-code: https://github.com/magpiemodel/magpie keywords: