From a7a8df3fd69e378f575709ae5e9f1212536f5c3d Mon Sep 17 00:00:00 2001 From: florianh Date: Sat, 3 Feb 2024 10:17:20 +0100 Subject: [PATCH] added CroplandTreecover and SNVTargetCropland to fullCelluar magpie --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/fullCELLULARMAGPIE.R | 20 ++++++++++++++++++++ README.md | 6 +++--- 5 files changed, 28 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 06e39026..80c51925 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '27734616' +ValidationKey: '27757180' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index d7afc632..ee68167d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'mrmagpie: madrat based MAgPIE Input Data Library' -version: 1.40.4 -date-released: '2024-02-01' +version: 1.40.5 +date-released: '2024-02-03' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: - family-names: Karstens diff --git a/DESCRIPTION b/DESCRIPTION index 6de32dc8..5fa32297 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.40.4 -Date: 2024-02-01 +Version: 1.40.5 +Date: 2024-02-03 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), diff --git a/R/fullCELLULARMAGPIE.R b/R/fullCELLULARMAGPIE.R index 055ea4c0..f4202967 100755 --- a/R/fullCELLULARMAGPIE.R +++ b/R/fullCELLULARMAGPIE.R @@ -230,6 +230,26 @@ fullCELLULARMAGPIE <- function(rev = 0.1, dev = "", aggregate = FALSE, cells = cells, country_level = TRUE, round = roundArea, file = paste0("avl_cropland_iso.cs3")) + calcOutput("CroplandTreecover", + aggregate = FALSE, cells = cells, + round = roundArea, file = "CroplandTreecover_0.5.mz") + calcOutput("CroplandTreecover", + aggregate = "cluster", cells = cells, + round = roundArea, file = paste0("CroplandTreecover_", ctype, ".mz")) + calcOutput("CroplandTreecover", + aggregate = FALSE, cells = cells, country_level = TRUE, + round = roundArea, file = paste0("CroplandTreecover_iso.cs3")) + + calcOutput("SNVTargetCropland", + aggregate = FALSE, cells = cells, + round = roundArea, file = "SNVTargetCropland_0.5.mz") + calcOutput("SNVTargetCropland", + aggregate = "cluster", cells = cells, + round = roundArea, file = paste0("SNVTargetCropland_", ctype, ".mz")) + calcOutput("SNVTargetCropland", + aggregate = FALSE, cells = cells, country_level = TRUE, + round = roundArea, file = paste0("SNVTargetCropland_iso.cs3")) + # 31 past calcOutput("GrasslandBiomass", round = 3, file = "f31_grass_bio_hist.cs3", cells = cells, aggregate = "region") diff --git a/README.md b/README.md index 002c2f4b..4ae10281 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.40.4** +R package **mrmagpie**, version **1.40.5** [![CRAN status](https://www.r-pkg.org/badges/version/mrmagpie)](https://cran.r-project.org/package=mrmagpie) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4319612.svg)](https://doi.org/10.5281/zenodo.4319612) [![R build status](https://github.com/pik-piam/mrmagpie/workflows/check/badge.svg)](https://github.com/pik-piam/mrmagpie/actions) [![codecov](https://codecov.io/gh/pik-piam/mrmagpie/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrmagpie) [![r-universe](https://pik-piam.r-universe.dev/badges/mrmagpie)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Kristine Karstens , R package version 1.40.4, . +Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2024). _mrmagpie: madrat based MAgPIE Input Data Library_. doi:10.5281/zenodo.4319612 , R package version 1.40.5, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrmagpie: madrat based MAgPIE Input Data Library}, author = {Kristine Karstens and Jan Philipp Dietrich and David Chen and Michael Windisch and Marcos Alves and Felicitas Beier and Alexandre Köberle and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer}, year = {2024}, - note = {R package version 1.40.4}, + note = {R package version 1.40.5}, doi = {10.5281/zenodo.4319612}, url = {https://github.com/pik-piam/mrmagpie}, }