From 4b0d072bedd0eb0697d20924806cf9175b6e5696 Mon Sep 17 00:00:00 2001 From: Felicitas Date: Mon, 23 Sep 2024 09:37:14 +0200 Subject: [PATCH] bugfix related to calling of sectors in water_usage --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/water_usage.R | 4 ++-- README.md | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index ea4a761..5fa5c5d 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '42432401' +ValidationKey: '42456636' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 5c81f66..52b42a3 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.12.3 -date-released: '2024-09-21' +version: 2.12.4 +date-released: '2024-09-23' abstract: Common output routines for extracting results from the MAgPIE framework (versions 4.x). authors: diff --git a/DESCRIPTION b/DESCRIPTION index a02b622..de0b501 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.12.3 -Date: 2024-09-21 +Version: 2.12.4 +Date: 2024-09-23 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 16f52ca..7e02425 100644 --- a/R/water_usage.R +++ b/R/water_usage.R @@ -55,8 +55,8 @@ water_usage <- function(gdx, file = NULL, level = "reg", users = NULL, 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 ("kcr" %in% usersInput) users <- c(users, kcr) + if ("kli" %in% usersInput) users <- c(users, kli) } user <- list() diff --git a/README.md b/README.md index 858e4cd..a3b561d 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.3** +R package **magpie4**, version **2.12.4** [![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.3, . +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.4, . 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.3}, + note = {R package version 2.12.4}, url = {https://github.com/pik-piam/magpie4}, doi = {10.5281/zenodo.1158582}, }