From c65463bcf77d6913c2e222dc43df0e64a34141b5 Mon Sep 17 00:00:00 2001 From: Felicitas Date: Wed, 30 Aug 2023 17:05:58 +0200 Subject: [PATCH] bugfix related to fossilGW argument in RiverHumanUseAccounting --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/calcRiverHumanUseAccounting.R | 4 ++-- README.md | 6 +++--- man/calcRiverHumanUseAccounting.Rd | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 87eb1903..445061e9 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '37492887' +ValidationKey: '37512486' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index c1330248..d4e42eef 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: 'mrwater: madrat based MAgPIE water Input Data Library' -version: 1.9.13 +version: 1.9.14 date-released: '2023-08-30' abstract: Provides functions for MAgPIE cellular input data generation and stand-alone water calculations. diff --git a/DESCRIPTION b/DESCRIPTION index d10bc44c..064a1919 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrwater Title: madrat based MAgPIE water Input Data Library -Version: 1.9.13 +Version: 1.9.14 URL: https://github.com/pik-piam/mrwater, https: //doi.org/10.5281/zenodo.5801680 License: LGPL-3 | file LICENSE diff --git a/R/calcRiverHumanUseAccounting.R b/R/calcRiverHumanUseAccounting.R index 7773e36c..67026d6c 100755 --- a/R/calcRiverHumanUseAccounting.R +++ b/R/calcRiverHumanUseAccounting.R @@ -8,7 +8,7 @@ #' @param iteration Water use to be allocated in this river routing iteration #' (non_agriculture, committed_agriculture, potential_irrigation, #' special case (for current irrigated area analysis): "committed_agriculture_fullPotential"). -#' @param fossilGW For case of iteration = potential_irrigation to determine full irrigation requirements based on the +#' @param fossilGW For case of iteration = potential_irrigation to determine full irrigation requirements based on the #' correct available area: #' If TRUE: non-renewable groundwater can be used. #' If FALSE: non-renewable groundwater cannot be used. @@ -117,7 +117,7 @@ calcRiverHumanUseAccounting <- function(iteration, ### Inputs from previous river routings inputData <- calcOutput("RiverRoutingInputs", - iteration = iteration, + iteration = iteration, fossilGW = fossilGW, lpjml = lpjml, climatetype = climatetype, transDist = transDist, comAg = comAg, selectyears = selectyears, iniyear = iniyear, diff --git a/README.md b/README.md index 22dcf3d1..38ad3b74 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE water Input Data Library -R package **mrwater**, version **1.9.13** +R package **mrwater**, version **1.9.14** [![CRAN status](https://www.r-pkg.org/badges/version/mrwater)](https://cran.r-project.org/package=mrwater) [![R build status](https://github.com/pik-piam/mrwater/workflows/check/badge.svg)](https://github.com/pik-piam/mrwater/actions) [![codecov](https://codecov.io/gh/pik-piam/mrwater/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrwater) [![r-universe](https://pik-piam.r-universe.dev/badges/mrwater)](https://pik-piam.r-universe.dev/builds) @@ -50,7 +50,7 @@ In case of questions / problems please contact Felicitas Beier . +Beier F, Heinke J, Karstens K, Bodirsky B, Dietrich J (2023). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.9.14, . A BibTeX entry for LaTeX users is @@ -59,7 +59,7 @@ A BibTeX entry for LaTeX users is title = {mrwater: madrat based MAgPIE water Input Data Library}, author = {Felicitas Beier and Jens Heinke and Kristine Karstens and Benjamin Leon Bodirsky and Jan Philipp Dietrich}, year = {2023}, - note = {R package version 1.9.13}, + note = {R package version 1.9.14}, url = {https://github.com/pik-piam/mrwater}, } ``` diff --git a/man/calcRiverHumanUseAccounting.Rd b/man/calcRiverHumanUseAccounting.Rd index 8431c39f..2dd6d7f3 100644 --- a/man/calcRiverHumanUseAccounting.Rd +++ b/man/calcRiverHumanUseAccounting.Rd @@ -64,7 +64,7 @@ unfulfilled water demand by surrounding cell water availability} if FALSE: no irrigation areas reserved (irrigation potential). Only relevant for iteration = potential} -\item{fossilGW}{For case of iteration = potential_irrigation to determine full irrigation requirements based on the +\item{fossilGW}{For case of iteration = potential_irrigation to determine full irrigation requirements based on the correct available area: If TRUE: non-renewable groundwater can be used. If FALSE: non-renewable groundwater cannot be used.}