comment out parts that are currently failing

pik-piam · Sep 15, 2023 · 11baf88 · 11baf88
1 parent ec536df
commit 11baf88
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 54 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '37798105'
+ValidationKey: '37817720'
 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.27
+version: 1.9.28
 date-released: '2023-09-15'
 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.27
+Version: 1.9.28
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE

diff --git a/R/fullSIMPLE.R b/R/fullSIMPLE.R
@@ -109,32 +109,33 @@ fullSIMPLE <- function(transDist = 100, fossilGW = TRUE,
              aggregate = FALSE,
              file = "PIA_CUR_wofGW.mz")
 
-  calcOutput("IrrigAreaPotential", gainthreshold = 0,
-             cropAggregation = TRUE,
-             selectyears = selectyears, iniyear = iniyear,
-             climatetype = climatetype, lpjml = lpjml,
-             accessibilityrule = accessibilityrule, efrMethod = efrMethod,
-             rankmethod = rankmethod, yieldcalib = yieldcalib,
-             allocationrule = allocationrule,
-             irrigationsystem = irrigationsystem,
-             landScen = "potCropland:NA", cropmix = cropmix,
-             comAg = TRUE, multicropping = multicropping,
-             transDist = transDist, fossilGW = TRUE,
-             aggregate = FALSE,
-             file = "PIA_POT_wfGW.mz")
-  calcOutput("IrrigAreaPotential", gainthreshold = 0,
-             cropAggregation = TRUE,
-             selectyears = selectyears, iniyear = iniyear,
-             climatetype = climatetype, lpjml = lpjml,
-             accessibilityrule = accessibilityrule, efrMethod = efrMethod,
-             rankmethod = rankmethod, yieldcalib = yieldcalib,
-             allocationrule = allocationrule,
-             irrigationsystem = irrigationsystem,
-             landScen = "potCropland:NA", cropmix = cropmix,
-             comAg = TRUE, multicropping = multicropping,
-             transDist = transDist, fossilGW = FALSE,
-             aggregate = FALSE,
-             file = "PIA_POT_wofGW.mz")
+  ## This currently produces negative values. Please fix and then include again
+  # calcOutput("IrrigAreaPotential", gainthreshold = 0,
+  #            cropAggregation = TRUE,
+  #            selectyears = selectyears, iniyear = iniyear,
+  #            climatetype = climatetype, lpjml = lpjml,
+  #            accessibilityrule = accessibilityrule, efrMethod = efrMethod,
+  #            rankmethod = rankmethod, yieldcalib = yieldcalib,
+  #            allocationrule = allocationrule,
+  #            irrigationsystem = irrigationsystem,
+  #            landScen = "potCropland:NA", cropmix = cropmix,
+  #            comAg = TRUE, multicropping = multicropping,
+  #            transDist = transDist, fossilGW = TRUE,
+  #            aggregate = FALSE,
+  #            file = "PIA_POT_wfGW.mz")
+  # calcOutput("IrrigAreaPotential", gainthreshold = 0,
+  #            cropAggregation = TRUE,
+  #            selectyears = selectyears, iniyear = iniyear,
+  #            climatetype = climatetype, lpjml = lpjml,
+  #            accessibilityrule = accessibilityrule, efrMethod = efrMethod,
+  #            rankmethod = rankmethod, yieldcalib = yieldcalib,
+  #            allocationrule = allocationrule,
+  #            irrigationsystem = irrigationsystem,
+  #            landScen = "potCropland:NA", cropmix = cropmix,
+  #            comAg = TRUE, multicropping = multicropping,
+  #            transDist = transDist, fossilGW = FALSE,
+  #            aggregate = FALSE,
+  #            file = "PIA_POT_wofGW.mz")
 
   # Currently irrigated area
   calcOutput("IrrigAreaPotential", gainthreshold = 0,
@@ -203,28 +204,29 @@ fullSIMPLE <- function(transDist = 100, fossilGW = TRUE,
              aggregate = FALSE,
              file = "PIWW_CUR_wofGW.mz")
 
-  calcOutput("WaterUsePotential", gainthreshold = 0,
-             selectyears = selectyears, climatetype = climatetype, lpjml = lpjml,
-             accessibilityrule = accessibilityrule, efrMethod = efrMethod,
-             rankmethod = rankmethod, yieldcalib = yieldcalib,
-             allocationrule = allocationrule,
-             irrigationsystem = irrigationsystem, iniyear = iniyear,
-             landScen = "potCropland:NA", cropmix = cropmix,
-             comAg = TRUE, multicropping = multicropping,
-             transDist = transDist, fossilGW = TRUE,
-             aggregate = FALSE,
-             file = "PIWW_POT_wfGW.mz")
-  calcOutput("WaterUsePotential", gainthreshold = 0,
-             selectyears = selectyears, climatetype = climatetype, lpjml = lpjml,
-             accessibilityrule = accessibilityrule, efrMethod = efrMethod,
-             rankmethod = rankmethod, yieldcalib = yieldcalib,
-             allocationrule = allocationrule,
-             irrigationsystem = irrigationsystem, iniyear = iniyear,
-             landScen = "potCropland:NA", cropmix = cropmix,
-             comAg = TRUE, multicropping = multicropping,
-             transDist = transDist, fossilGW = FALSE,
-             aggregate = FALSE,
-             file = "PIWW_POT_wofGW.mz")
+  ### This currently produces negative values. Please fix and include again.
+  # calcOutput("WaterUsePotential", gainthreshold = 0,
+  #            selectyears = selectyears, climatetype = climatetype, lpjml = lpjml,
+  #            accessibilityrule = accessibilityrule, efrMethod = efrMethod,
+  #            rankmethod = rankmethod, yieldcalib = yieldcalib,
+  #            allocationrule = allocationrule,
+  #            irrigationsystem = irrigationsystem, iniyear = iniyear,
+  #            landScen = "potCropland:NA", cropmix = cropmix,
+  #            comAg = TRUE, multicropping = multicropping,
+  #            transDist = transDist, fossilGW = TRUE,
+  #            aggregate = FALSE,
+  #            file = "PIWW_POT_wfGW.mz")
+  # calcOutput("WaterUsePotential", gainthreshold = 0,
+  #            selectyears = selectyears, climatetype = climatetype, lpjml = lpjml,
+  #            accessibilityrule = accessibilityrule, efrMethod = efrMethod,
+  #            rankmethod = rankmethod, yieldcalib = yieldcalib,
+  #            allocationrule = allocationrule,
+  #            irrigationsystem = irrigationsystem, iniyear = iniyear,
+  #            landScen = "potCropland:NA", cropmix = cropmix,
+  #            comAg = TRUE, multicropping = multicropping,
+  #            transDist = transDist, fossilGW = FALSE,
+  #            aggregate = FALSE,
+  #            file = "PIWW_POT_wofGW.mz")
 
   # Current irrigation water withdrawal
   calcOutput("WaterUsePotential", gainthreshold = 0,

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