bugfix in condition for exceptions

pik-piam · Aug 7, 2023 · 487c171 · 487c171
1 parent ea538a0
commit 487c171
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '3817320'
+ValidationKey: '3836896'
 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.9.5
+version: 1.9.6
 date-released: '2023-08-07'
 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.9.5
+Version: 1.9.6
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE

diff --git a/R/calcIrrigAreaPotential.R b/R/calcIrrigAreaPotential.R
@@ -215,12 +215,15 @@ calcIrrigAreaPotential <- function(cropAggregation,
   out <- collapseNames(irrigatableArea * cropareaShr)
   out <- out + comAgArea[, , getItems(out, dim = 3)]
 
-  if (grepl("currIrrig", landScen) && !multicropping && fossilGW) {
+  if (grepl("currIrrig", landScen) &&
+        !(as.logical(stringr::str_split(multicropping, ":")[[1]][1])) &&
+          fossilGW) {
     # In single cropping case, currently irrigated area can be over-fulfilled
     # when non-renewable groundwater use is activated because
     # groundwater is calculated based on actual multiple cropping patterns
     # This is corrected here:
     out <- pmin(out, comAgArea[, , getItems(out, dim = 3)])
+    # Note: maybe same special treatment is required for different transport distances
   }
 
   # check for NAs and negative values

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # madrat based MAgPIE water Input Data Library
 
-R package **mrwater**, version **1.9.5**
+R package **mrwater**, version **1.9.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.9.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.9.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.9.5},
+  note = {R package version 1.9.6},
   url = {https://github.com/pik-piam/mrwater},
 }
 ```