From c32a1268b6f503218f282eb84fa98f0c3e1cbca1 Mon Sep 17 00:00:00 2001 From: Felicitas Date: Mon, 30 Sep 2024 12:41:16 +0200 Subject: [PATCH] bugfix in sectors and rounding of check in water_usage --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/water_usage.R | 14 +++++++++----- README.md | 6 +++--- 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 1fbad54..e6ec6fe 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '42605083' +ValidationKey: '42631472' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 37762ce..12efa80 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: 'magpie4: MAgPIE outputs R package for MAgPIE version 4.x' -version: 2.13.1 -date-released: '2024-09-27' +version: 2.13.2 +date-released: '2024-09-30' abstract: Common output routines for extracting results from the MAgPIE framework (versions 4.x). authors: diff --git a/DESCRIPTION b/DESCRIPTION index 8e63134..440dc44 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: magpie4 Title: MAgPIE outputs R package for MAgPIE version 4.x -Version: 2.13.1 -Date: 2024-09-27 +Version: 2.13.2 +Date: 2024-09-30 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Florian", "Humpenoeder", , "humpenoeder@pik-potsdam.de", role = "aut"), diff --git a/R/water_usage.R b/R/water_usage.R index a0f6670..7482a95 100644 --- a/R/water_usage.R +++ b/R/water_usage.R @@ -54,10 +54,14 @@ water_usage <- function(gdx, file = NULL, level = "reg", users = NULL, } else { usersInput <- users users <- NULL - if ("sectors" %in% usersInput) users <- c(users, sectors) - if ("kcr" %in% usersInput) users <- c(users, kcr) - if ("kli" %in% usersInput) users <- c(users, kli) - if ("agriculture" %in% usersInput) users <- "agriculture" + + if ("kcr" %in% usersInput) { + users <- c(users, kcr) + } else if ("kli" %in% usersInput) { + users <- c(users, kli) + } else { + users <- c(users, sectors) + } } user <- list() @@ -116,7 +120,7 @@ water_usage <- function(gdx, file = NULL, level = "reg", users = NULL, } else { stop("Please choose seasonality argument in magpie4::water_usage() function.") } - if (any(ratioGrperTotal > 1)) { + if (any(round(ratioGrperTotal, digits = 6) > 1)) { stop("More water in growing period than in entire year. Please double-check starting from magpie4::water_usage()") } diff --git a/README.md b/README.md index 12a2285..1056ff2 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.13.1** +R package **magpie4**, version **2.13.2** [![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.13.1, . +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.13.2, . 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.13.1}, + note = {R package version 2.13.2}, url = {https://github.com/pik-piam/magpie4}, doi = {10.5281/zenodo.1158582}, }