From 49c8b3aa07ed31bb126f4f2b03658115ae101a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20F=C3=BChrlich?= Date: Wed, 16 Aug 2023 15:01:22 +0200 Subject: [PATCH] magpie release 4.6.10 --- .zenodo.json | 4 ++-- CHANGELOG.md | 18 +++++++----------- CITATION.cff | 4 ++-- README.md | 6 +++--- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index d04a6a0a64..b6d04973ab 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.6.9dev", + "version": "4.6.10", "creators": [ { "name": "Dietrich, Jan Philipp", @@ -109,5 +109,5 @@ "license": { "id": "AGPL-3.0-or-later" }, - "publication_date": "2023-07-27" + "publication_date": "2023-08-16" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 0165d62e99..eaefd59888 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,24 +5,19 @@ 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.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 -- **GitHub action** the github action is now faster, because it installs binary packages from Posit Package Manager - -### added -- - -### removed -- ### fixed -- **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. -- **scripts** fixed erronoeous if clause in output.R - **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 @@ -756,7 +751,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.9...develop +[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.10...develop +[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 [4.6.7]: https://github.com/magpiemodel/magpie/compare/v4.6.6...v4.6.7 diff --git a/CITATION.cff b/CITATION.cff index 8a4be0b247..6ea5a354d0 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.9dev -date-released: 2023-07-27 +version: 4.6.10 +date-released: 2023-08-16 repository-code: https://github.com/magpiemodel/magpie keywords: - landuse diff --git a/README.md b/README.md index 9a13bf8260..f6321100fa 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.9 can be found at -https://rse.pik-potsdam.de/doc/magpie/4.6.9/ +The model documentation for version 4.6.10 can be found at +https://rse.pik-potsdam.de/doc/magpie/4.6.10/ 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.9/#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.10/#how-to-cite) in the model documentation for information how to cite the model. ## AUTHORS See list of authors in CITATION.cff