bugfix related to fossilGW argument in RiverHumanUseAccounting

.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'

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.

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

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,

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@pik-potsda
 
 To cite package **mrwater** in publications use:
 
-Beier F, Heinke J, Karstens K, Bodirsky B, Dietrich J (2023). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.9.13, <URL: https://github.com/pik-piam/mrwater>.
+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, <https://github.com/pik-piam/mrwater>.
 
 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},
 }
 ```