From 537643ec1a7338324b63a97b1ce2bf1b7de35ff9 Mon Sep 17 00:00:00 2001 From: florianh Date: Mon, 10 Jun 2024 18:01:23 +0200 Subject: [PATCH] bugfix duplicate entries --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/reportCroparea.R | 5 +---- README.md | 6 +++--- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 71e92f9..20c6e7a 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4712508' +ValidationKey: '4732392' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 11c107d..037963a 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'magpie4: MAgPIE outputs R package for MAgPIE version 4.x' -version: 2.3.7 +version: 2.3.8 date-released: '2024-06-10' abstract: Common output routines for extracting results from the MAgPIE framework (versions 4.x). diff --git a/DESCRIPTION b/DESCRIPTION index 3c20e96..32a3dc2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: magpie4 Title: MAgPIE outputs R package for MAgPIE version 4.x -Version: 2.3.7 +Version: 2.3.8 Date: 2024-06-10 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/reportCroparea.R b/R/reportCroparea.R index 1c04472..0eae937 100644 --- a/R/reportCroparea.R +++ b/R/reportCroparea.R @@ -19,11 +19,8 @@ reportCroparea <- function(gdx, detail = FALSE) { out <- croparea(gdx, level = "regglo", products = "kcr", product_aggr = FALSE, water_aggr = TRUE) - fallowland <- fallow(gdx, level = "regglo") - treecover <- croplandTreeCover(gdx, level = "regglo") - # Adapting reportingnames for fallow land and tree cover + # Adapting reportingnames for inclusing of fallow land and tree cover in reportLandUse ReportingnameCroparea <- "Resources|Land Cover|Cropland|Croparea" - x <- setNames(dimSums(out), "Resources|Land Cover|Cropland|+|Croparea (million ha)") out <- reporthelper(x = out, dim = 3.1, level_zero_name = ReportingnameCroparea, detail = detail) diff --git a/README.md b/README.md index 23150f5..c0dfb34 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MAgPIE outputs R package for MAgPIE version 4.x -R package **magpie4**, version **2.3.7** +R package **magpie4**, version **2.3.8** [![CRAN status](https://www.r-pkg.org/badges/version/magpie4)](https://cran.r-project.org/package=magpie4) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158582.svg)](https://doi.org/10.5281/zenodo.1158582) [![R build status](https://github.com/pik-piam/magpie4/workflows/check/badge.svg)](https://github.com/pik-piam/magpie4/actions) [![codecov](https://codecov.io/gh/pik-piam/magpie4/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/magpie4) [![r-universe](https://pik-piam.r-universe.dev/badges/magpie4)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky , R package version 2.3.7, . +Bodirsky B, Humpenoeder F, Dietrich J, Stevanovic M, Weindl I, Karstens K, Wang X, Mishra A, Beier F, Breier J, Yalew A, Chen D, Biewald A, Wirth S, von Jeetze P, Leip D, Crawford M, Alves M (2024). _magpie4: MAgPIE outputs R package for MAgPIE version 4.x_. doi:10.5281/zenodo.1158582 , R package version 2.3.8, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {magpie4: MAgPIE outputs R package for MAgPIE version 4.x}, author = {Benjamin Leon Bodirsky and Florian Humpenoeder and Jan Philipp Dietrich and Miodrag Stevanovic and Isabelle Weindl and Kristine Karstens and Xiaoxi Wang and Abhijeet Mishra and Felicitas Beier and Jannes Breier and Amsalu Woldie Yalew and David Chen and Anne Biewald and Stephen Wirth and Patrick {von Jeetze} and Debbora Leip and Michael Crawford and Marcos Alves}, year = {2024}, - note = {R package version 2.3.7}, + note = {R package version 2.3.8}, url = {https://github.com/pik-piam/magpie4}, doi = {10.5281/zenodo.1158582}, }