Merge pull request #590 from pfuehrlich-pik/master

merge master into develop

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "MAgPIE - An Open Source land-use modeling framework",
-  "version": "4.6.9dev",
+  "version": "4.6.10dev",
   "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"
 }

CHANGELOG.md

@@ -8,10 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### changed
-- **config**  update preprocessing to newest input data v4.88 with new transport costs
-- **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
 -
@@ -20,9 +17,22 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 -
 
 ### 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
+-
+
+
+## [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
+
+### fixed
 - **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 +766,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

CITATION.cff

@@ -125,8 +125,8 @@ authors:
     email: [email protected]
 
 title: MAgPIE - An Open Source land-use modeling framework
-version: 4.6.9dev
-date-released: 2023-07-27
+version: 4.6.10dev
+date-released: 2023-08-16
 repository-code: https://github.com/magpiemodel/magpie
 keywords:
   - landuse

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 @@ [email protected]
 Please contact [email protected]
 
 ## 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