From 9fa7a22a24be44763c9d68e18b812ddffb0c69ba Mon Sep 17 00:00:00 2001 From: Felicitas Date: Mon, 23 Sep 2024 09:58:14 +0200 Subject: [PATCH] re-introduced agriculture option for users argument in water_usage --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/water_usage.R | 7 ++++--- README.md | 6 +++--- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 5fa5c5d..de9ea70 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '42456636' +ValidationKey: '42476625' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 52b42a3..cffed89 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.12.4 +version: 2.12.5 date-released: '2024-09-23' abstract: Common output routines for extracting results from the MAgPIE framework (versions 4.x). diff --git a/DESCRIPTION b/DESCRIPTION index de0b501..7552fd1 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.12.4 +Version: 2.12.5 Date: 2024-09-23 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/water_usage.R b/R/water_usage.R index 7e02425..a0f6670 100644 --- a/R/water_usage.R +++ b/R/water_usage.R @@ -54,9 +54,10 @@ 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 ("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" } user <- list() diff --git a/README.md b/README.md index a3b561d..796d1a9 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.12.4** +R package **magpie4**, version **2.12.5** [![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.12.4, . +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.12.5, . 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.12.4}, + note = {R package version 2.12.5}, url = {https://github.com/pik-piam/magpie4}, doi = {10.5281/zenodo.1158582}, }