From 03c874ab24b3468981165835ebad94d4577bffc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20F=C3=BChrlich?= Date: Wed, 16 Aug 2023 15:50:00 +0200 Subject: [PATCH 1/6] 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 b6d04973ab..3d0c487ac5 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.6.10", + "version": "4.6.10dev", "creators": [ { "name": "Dietrich, Jan Philipp", diff --git a/CHANGELOG.md b/CHANGELOG.md index eaefd59888..74ad927e6f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,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.6.10] - 2023-08-16 ### changed diff --git a/CITATION.cff b/CITATION.cff index 6ea5a354d0..4b0388a61f 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -125,7 +125,7 @@ authors: email: popp@pik-potsdam.de title: MAgPIE - An Open Source land-use modeling framework -version: 4.6.10 +version: 4.6.10dev date-released: 2023-08-16 repository-code: https://github.com/magpiemodel/magpie keywords: From db6dbf3818b757ffec34fb412e693093b42ed2db Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Wed, 16 Aug 2023 18:18:52 +0200 Subject: [PATCH 2/6] extended the set of years that are reported to SEALS --- scripts/output/extra/reportMAgPIE2SEALS.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/output/extra/reportMAgPIE2SEALS.R b/scripts/output/extra/reportMAgPIE2SEALS.R index eb4ea1dacc..9045995e17 100644 --- a/scripts/output/extra/reportMAgPIE2SEALS.R +++ b/scripts/output/extra/reportMAgPIE2SEALS.R @@ -36,5 +36,5 @@ title <- cfg$title reportLandUseForSEALS( magCellLand = "cell.land_0.5_share.nc", outFile = paste0("cell.land_0.5_SEALS_", title, ".nc"), - dir = outputdir, selectyears = c(2015, 2050) + dir = outputdir, selectyears = c(2015, 2020, 2025, 2030, 2035, 2040, 2045, 2050) ) From 68197b75f2bd6b74dcc54a36391c6e0b7a8c675d Mon Sep 17 00:00:00 2001 From: pvjeetze Date: Wed, 16 Aug 2023 18:23:22 +0200 Subject: [PATCH 3/6] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74ad927e6f..e363af8d22 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] ### changed -- +- **scripts** All time steps between 2015 and 2050 are now reported to SEALS ### added - From c33ebca35b5c67635d066139a1947614332eca24 Mon Sep 17 00:00:00 2001 From: Isabelle Weindl Date: Tue, 22 Aug 2023 17:30:23 +0200 Subject: [PATCH 4/6] bugfix --- modules/70_livestock/fbask_jan16/presolve.gms | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/70_livestock/fbask_jan16/presolve.gms b/modules/70_livestock/fbask_jan16/presolve.gms index 902ad25139..fd48c144a4 100644 --- a/modules/70_livestock/fbask_jan16/presolve.gms +++ b/modules/70_livestock/fbask_jan16/presolve.gms @@ -35,13 +35,13 @@ p70_cattle_feed_pc_proxy(t,i,kli_rd) = pm_kcal_pc_initial(t,i,kli_rd)*im_feed_ba *' The parameter `p70_incr_cattle` describes the changes in the number of cattle *' relative to the previous time step: -p70_incr_cattle(t,i) = 1$(ord(t)=1) - + ( - ( p70_cattle_feed_pc_proxy(t,i,"livst_rum") * (p70_cattle_stock_proxy(t,i)/p70_cattle_stock_proxy(t-1,i)) - + - p70_cattle_feed_pc_proxy(t,i,"livst_milk") * (p70_milk_cow_proxy(t,i)/p70_milk_cow_proxy(t-1,i)) ) - / sum(kli_rd, p70_cattle_feed_pc_proxy(t,i,kli_rd) ) - )$(ord(t)>1); +if (ord(t)>1, + p70_incr_cattle(t,i) = ( (p70_cattle_feed_pc_proxy(t,i,"livst_rum") + 10**(-6))* (p70_cattle_stock_proxy(t,i)/p70_cattle_stock_proxy(t-1,i)) + + (p70_cattle_feed_pc_proxy(t,i,"livst_milk") + 10**(-6)) * (p70_milk_cow_proxy(t,i)/p70_milk_cow_proxy(t-1,i)) ) + / sum(kli_rd, p70_cattle_feed_pc_proxy(t,i,kli_rd) + 10**(-6)); +else + p70_incr_cattle(t,i) = 1; +); *' The pasture management factor is calculated by applying a linear relationship *' that links changes in pasture management with changes in the number of cattle: From 72ca3d9721d895c25912b973e35b307eac04438a Mon Sep 17 00:00:00 2001 From: weindl <39915455+weindl@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:58:50 +0200 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e363af8d22..718d0efac6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,7 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - ### fixed -- +- **70_livestock** fixed division by zero that could occur depending on the scenario set-up ## [4.6.10] - 2023-08-16 From 736ed84678f0844a81bb5f4b1ec73631054dec5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20F=C3=BChrlich?= Date: Tue, 5 Sep 2023 10:59:57 +0200 Subject: [PATCH 6/6] magpie release 4.6.11 --- .zenodo.json | 4 ++-- CHANGELOG.md | 11 +++-------- CITATION.cff | 4 ++-- README.md | 6 +++--- 4 files changed, 10 insertions(+), 15 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 3d0c487ac5..151a3f7b0a 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.6.10dev", + "version": "4.6.11", "creators": [ { "name": "Dietrich, Jan Philipp", @@ -109,5 +109,5 @@ "license": { "id": "AGPL-3.0-or-later" }, - "publication_date": "2023-08-16" + "publication_date": "2023-09-05" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 718d0efac6..7d66df98b4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,17 +5,11 @@ 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.6.11] - 2023-09-05 ### changed - **scripts** All time steps between 2015 and 2050 are now reported to SEALS -### added -- - -### removed -- - ### fixed - **70_livestock** fixed division by zero that could occur depending on the scenario set-up @@ -766,7 +760,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.6.10...develop +[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.11...develop +[4.6.11]: https://github.com/magpiemodel/magpie/compare/v4.6.10...v4.6.11 [4.6.10]: https://github.com/magpiemodel/magpie/compare/v4.6.9...v4.6.10 [4.6.9]: https://github.com/magpiemodel/magpie/compare/v4.6.8...v4.6.9 [4.6.8]: https://github.com/magpiemodel/magpie/compare/v4.6.7...v4.6.8 diff --git a/CITATION.cff b/CITATION.cff index 4b0388a61f..dc43cf0107 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -125,8 +125,8 @@ authors: email: popp@pik-potsdam.de title: MAgPIE - An Open Source land-use modeling framework -version: 4.6.10dev -date-released: 2023-08-16 +version: 4.6.11 +date-released: 2023-09-05 repository-code: https://github.com/magpiemodel/magpie keywords: - landuse diff --git a/README.md b/README.md index f6321100fa..84a747e145 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.6.10 can be found at -https://rse.pik-potsdam.de/doc/magpie/4.6.10/ +The model documentation for version 4.6.11 can be found at +https://rse.pik-potsdam.de/doc/magpie/4.6.11/ A most recent version of the documentation can also be extracted from the model source code via the R package goxygen @@ -188,7 +188,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.6.10/#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.6.11/#how-to-cite) in the model documentation for information how to cite the model. ## AUTHORS See list of authors in CITATION.cff