bugfix for single cropping scenario and GW use in IrrigAreaActuallyCo…

…mmitted
pik-piam · Jul 14, 2023 · 013fcc9 · 013fcc9
1 parent 1606044
commit 013fcc9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '3421600'
+ValidationKey: '3441152'
 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
@@ -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.7.5
+version: 1.7.6
 date-released: '2023-07-14'
 abstract: Provides functions for MAgPIE cellular input data generation and stand-alone
  water calculations.

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: mrwater
 Title: madrat based MAgPIE water Input Data Library
-Version: 1.7.5
+Version: 1.7.6
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE

diff --git a/R/calcIrrigAreaActuallyCommitted.R b/R/calcIrrigAreaActuallyCommitted.R
@@ -43,7 +43,6 @@
 #'
 #' @importFrom madrat calcOutput
 #' @importFrom magclass collapseNames collapseDim new.magpie getCells getNames
-#' @importFrom utils tail
 
 calcIrrigAreaActuallyCommitted <- function(iteration = "committed_agriculture",
  lpjml, climatetype,
@@ -126,7 +125,7 @@ calcIrrigAreaActuallyCommitted <- function(iteration = "committed_agriculture",
  # Fossil groundwater use to fulfill committed agricultural water use
  if (fossilGW) {
  gw <- calcOutput("NonrenGroundwatUse",
- output = "comAg",
+ output = "comAg", multicropping = m,
  lpjml = lpjml, climatetype = climatetype,
  selectyears = selectyears, iniyear = iniyear,
  aggregate = FALSE)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # madrat based MAgPIE water Input Data Library
 
-R package **mrwater**, version **1.7.5**
+R package **mrwater**, version **1.7.6**
 
 [![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)
 
@@ -48,7 +48,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.7.5, <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.7.6, <URL: https://github.com/pik-piam/mrwater>.
 
 A BibTeX entry for LaTeX users is
 
@@ -57,7 +57,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.7.5},
+ note = {R package version 1.7.6},
  url = {https://github.com/pik-piam/mrwater},
 }
 ```