From fd2a170cb09deac9608b8fb7a723595c2cd23d05 Mon Sep 17 00:00:00 2001 From: Jake Tommey Date: Wed, 19 Jun 2024 14:00:10 +0200 Subject: [PATCH] MAgPIE 4.8.1 --- .zenodo.json | 4 ++-- CHANGELOG.md | 11 ++++++----- CITATION.cff | 4 ++-- README.md | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 9497ab145..da8ee5605 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "MAgPIE - An Open Source land-use modeling framework", - "version": "4.8.0dev", + "version": "4.8.1", "creators": [ { "name": "Dietrich, Jan Philipp", @@ -119,5 +119,5 @@ "license": { "id": "AGPL-3.0-or-later" }, - "publication_date": "2024-06-10" + "publication_date": "2024-06-19" } diff --git a/CHANGELOG.md b/CHANGELOG.md index aeb59f199..d13f633d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,22 +4,22 @@ 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.8.1] - 2024-06-19 ### changed - **29_ageclass** module 29_ageclass has been renamed to 28_ageclass to make space for `29_cropland` just before `30_croparea` - **30_crop** module `30_crop` renamed to `30_croparea`, which now only accounts for crop area. - **30_crop** Semi-Natural Vegetation (SNV) implementation has been moved from `30_crop` to `29_cropland` -- **30_crop** the two realizations `penalty_apr22` and `rotation_apr22` have been merged into a single `30_croparea/detail_apr24` realization - **30_crop** the previous `30_crop/endo_apr21` realization has been moved to `30_croparea/simple_apr24` +- **30_crop** the two realizations `penalty_apr22` and `rotation_apr22` have been merged into a single `30_croparea/detail_apr24` realization - **default.cfg** update additional data to rev4.51 - **scripts** adjusted SLURM job handling - **scripts** updated EL2p0 start scripts ### added -- **42_water_demand** added non-agricultural water demand for entire year -- **29_cropland** new module `29_cropland` accounting for crop area, fallow cropland and tree cover on cropland with two realizations: `detail_apr24` and `simple_apr24` (default). - **10_land** added interface `pm_land_hist` with historic land use patterns +- **29_cropland** new module `29_cropland` accounting for crop area, fallow cropland and tree cover on cropland with two realizations: `detail_apr24` and `simple_apr24` (default). +- **42_water_demand** added non-agricultural water demand for entire year ### removed - **32_forestry** removed technical balance term `v32_land_missing_ndc` @@ -962,7 +962,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.8.0...develop +[Unreleased]: https://github.com/magpiemodel/magpie/compare/v4.8.1...develop +[4.8.1]: https://github.com/magpiemodel/magpie/compare/v4.8.0...v4.8.1 [4.8.0]: https://github.com/magpiemodel/magpie/compare/v4.7.3...v4.8.0 [4.7.3]: https://github.com/magpiemodel/magpie/compare/v4.7.2...v4.7.3 [4.7.2]: https://github.com/magpiemodel/magpie/compare/v4.7.1...v4.7.2 diff --git a/CITATION.cff b/CITATION.cff index d14a59954..0b1d746a7 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -151,8 +151,8 @@ abstract: The *Model of Agricultural Production and its Impact on the Environmen exogenously given population in 10 food energy categories, based on regional diets. Future trends in food demand are derived from a cross-country regression analysis, based on future scenarios on GDP and population growth. -version: 4.8.0dev -date-released: 2024-06-10 +version: 4.8.1 +date-released: 2024-06-19 repository-code: https://github.com/magpiemodel/magpie keywords: - landuse diff --git a/README.md b/README.md index 175f8dd5b..4871b882d 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.8.0 can be found at -https://rse.pik-potsdam.de/doc/magpie/4.8.0/ +The model documentation for version 4.8.1 can be found at +https://rse.pik-potsdam.de/doc/magpie/4.8.1/ 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.8.0/#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.8.1/#how-to-cite) in the model documentation for information how to cite the model. ## AUTHORS See list of authors in CITATION.cff