Bugfix: accessibilityrule handed over for case of committed_agricultu…

…re_fullMulticropping

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '220469940'
+ValidationKey: '220500889'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

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: 'mrwater: madrat based MAgPIE water Input Data Library'
-version: 1.11.18
-date-released: '2024-04-17'
+version: 1.11.19
+date-released: '2024-04-18'
 abstract: Provides functions for MAgPIE cellular input data generation and stand-alone
  water calculations.
 authors:

DESCRIPTION

@@ -1,11 +1,11 @@
 Type: Package
 Package: mrwater
 Title: madrat based MAgPIE water Input Data Library
-Version: 1.11.18
+Version: 1.11.19
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE
-Date: 2024-04-17
+Date: 2024-04-18
 Authors@R: c(person("Felicitas", "Beier", email = "[email protected]", role = c("aut","cre")),
  person("Jens", "Heinke", email = "[email protected]", role = "aut"),
  person("Kristine", "Karstens", email = "[email protected]", role = "aut"),

R/calcPotWater.R

@@ -207,11 +207,12 @@ calcPotWater <- function(lpjml, selectyears, climatetype, efrMethod,
  transDist = transDist, comAg = NULL,
  efrMethod = efrMethod, multicropping = multicropping,
  selectyears = selectyears, iniyear = iniyear,
- accessibilityrule = NULL,
- rankmethod = NULL, gainthreshold = NULL,
- cropmix = NULL, yieldcalib = NULL,
- irrigationsystem = NULL, landScen = NULL,
+ accessibilityrule = accessibilityrule,
+ rankmethod = rankmethod, gainthreshold = gainthreshold,
+ cropmix = cropmix, yieldcalib = yieldcalib,
+ irrigationsystem = irrigationsystem, landScen = landScen,
  aggregate = FALSE)
+
  currHuman <- currHuman + currHumanAdd
  }
 

README.md

@@ -1,6 +1,6 @@
 # madrat based MAgPIE water Input Data Library
 
-R package **mrwater**, version **1.11.18**
+R package **mrwater**, version **1.11.19**
 
 [![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 (2024). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.11.18, <https://github.com/pik-piam/mrwater>.
+Beier F, Heinke J, Karstens K, Bodirsky B, Dietrich J (2024). _mrwater: madrat based MAgPIE water Input Data Library_. R package version 1.11.19, <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 = {2024},
- note = {R package version 1.11.18},
+ note = {R package version 1.11.19},
  url = {https://github.com/pik-piam/mrwater},
 }
 ```