bugfix related to rounding

pik-piam · Aug 31, 2023 · 8a34ab2 · 8a34ab2
1 parent f6ed677
commit 8a34ab2
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '37534000'
+ValidationKey: '37553600'
 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.15
+version: 1.9.16
 date-released: '2023-08-31'
 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.15
+Version: 1.9.16
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE

diff --git a/R/calcCropAreaPotIrrig.R b/R/calcCropAreaPotIrrig.R
@@ -178,7 +178,7 @@ calcCropAreaPotIrrig <- function(selectyears, comagyear, iniyear,
     out <- currRF * rfdCropmix + currIRnores * irrCropmix
 
     ### Checks ###
-    if (any(round(total * totCropmix - out - actComAgArea * irrCropmix, digits = 6)) < 0) {
+    if (any(round(total * totCropmix - out - actComAgArea * irrCropmix, digits = 6) < 0)) {
       stop("There is a mismatch in the crop-specific irrigation area accounting.
         Please check what is wrong starting in mrwater::calcCropAreaPotIrrig")
     }

diff --git a/R/calcFullIrrigationRequirement.R b/R/calcFullIrrigationRequirement.R
@@ -126,7 +126,7 @@ calcFullIrrigationRequirement <- function(lpjml, climatetype,
     stop("mrwater::calcFullIrrigationRequirements:
          produced NA full irrigation requirements")
   }
-  if (any(irrigWat < 0)) {
+  if (any(round(irrigWat, digits = 6) < 0)) {
     stop("mrwater::calcFullIrrigationRequirements:
          produced negative full irrigation requirements")
   }

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.15**
+R package **mrwater**, version **1.9.16**
 
 [![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.15, <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.16, <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.15},
+  note = {R package version 1.9.16},
   url = {https://github.com/pik-piam/mrwater},
 }
 ```