Merge pull request #66 from magpiemodel/develop

Develop
magpiemodel · Aug 22, 2023 · 4ca6a2d · 4ca6a2d
2 parents c33ebca + bf3f871
commit 4ca6a2d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git 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
@@ -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
+- **scripts** All time steps between 2015 and 2050 are now reported to SEALS
+
+### added
+-
+
+### removed
+-
+
+### fixed
+-
+
+
 ## [4.6.10] - 2023-08-16
 
 ### changed

diff --git a/CITATION.cff b/CITATION.cff
@@ -125,7 +125,7 @@ authors:
     email: [email protected]
 
 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:

diff --git 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)
 )