diff --git a/.zenodo.json b/.zenodo.json index 2a350b0c8b..254e507cce 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.6.8dev", + "version": "4.6.9", "creators": [ { "name": "Dietrich, Jan Philipp", @@ -109,5 +109,5 @@ "license": { "id": "AGPL-3.0-or-later" }, - "publication_date": "2023-07-17" + "publication_date": "2023-07-27" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 6069243ba3..1550497d58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,16 +5,7 @@ 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 -- +## [4.6.9] - 2023-07-27 ### fixed - **70_livestock** consideration of milk demand in the calculation of the pasture management factor @@ -49,6 +40,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - **config** corrected wrong names of parameters for peatland costs - **config** updated scenario configs to newest preprocessing (4.87) + ## [4.6.7] - 2023-05-10 ### changed @@ -745,7 +737,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.8...develop +[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.6.9...develop +[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 [4.6.6]: https://github.com/magpiemodel/magpie/compare/v4.6.5...v4.6.6 diff --git a/CITATION.cff b/CITATION.cff index 5f85de2e0d..843aea845c 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.8dev -date-released: 2023-07-17 +version: 4.6.9 +date-released: 2023-07-27 repository-code: https://github.com/magpiemodel/magpie keywords: - landuse diff --git a/README.md b/README.md index 5f15852147..9a13bf8260 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.8 can be found at -https://rse.pik-potsdam.de/doc/magpie/4.6.8/ +The model documentation for version 4.6.9 can be found at +https://rse.pik-potsdam.de/doc/magpie/4.6.9/ 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.8/#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.9/#how-to-cite) in the model documentation for information how to cite the model. ## AUTHORS See list of authors in CITATION.cff