Updated script for SIMPLE

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '37661205'
+ValidationKey: '37682732'
 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.9.21
-date-released: '2023-09-05'
+version: 1.9.22
+date-released: '2023-09-06'
 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.9.21
+Version: 1.9.22
 URL: https://github.com/pik-piam/mrwater, 
 https: //doi.org/10.5281/zenodo.5801680
 License: LGPL-3 | file LICENSE
-Date: 2023-09-05
+Date: 2023-09-06
 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/fullSIMPLE.R

@@ -50,7 +50,6 @@ fullSIMPLE <- function(transDist = 100, fossilGW = TRUE,
  multicropping <- FALSE
  yieldcalib <- "TRUE:FALSE"
  cropmix <- "hist_total"
- protectLand <- "HalfEarth"
  irrigationsystem <- "initialization"
 
  # retrieve arguments
@@ -62,6 +61,33 @@ fullSIMPLE <- function(transDist = 100, fossilGW = TRUE,
  # MAIN RESULTS #
  ################
 
+ # Current cropland area
+ calcOutput("CropareaAdjusted",
+ iniyear = iniyear, dataset = "Toolbox",
+ aggregate = FALSE,
+ file = "croparea.mz")
+
+ # Crop yields (in USD/ha)
+ calcOutput("YieldsValued", lpjml = lpjml, climatetype = climatetype,
+ iniyear = iniyear, selectyears = selectyears,
+ yieldcalib = yieldcalib,
+ priceAgg = str_split(rankmethod, pattern = ":")[[1]][2],
+ multicropping = FALSE, aggregate = FALSE,
+ file = "yields.mz")
+
+ # Yield gain through irrigation (in )
+ # Cellular yield improvement potential for all crops (in USD/ha)
+ calcOutput("IrrigYieldImprovementPotential",
+ selectyears = selectyears, iniyear = iniyear,
+ lpjml = lpjml, climatetype = climatetype, cropmix = cropmix,
+ unit = thresholdtype, yieldcalib = yieldcalib,
+ comagyear = NULL, efrMethod = NULL, transDist = NULL,
+ irrigationsystem = irrigationsystem,
+ landScen = "currCropland:NA",
+ multicropping = as.logical(stringr::str_split(multicropping, ":")[[1]][1]),
+ aggregate = FALSE,
+ file = "yieldgain.mz")
+
  # The transformation elasticity between rainfed and irrigated area (tau_Li)
  # is calculated based on currently irrigated area and the maximum
  # potentially irrigated area

README.md

@@ -1,6 +1,6 @@
 # madrat based MAgPIE water Input Data Library
 
-R package **mrwater**, version **1.9.21**
+R package **mrwater**, version **1.9.22**
 
 [![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.21, <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.22, <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.21},
+ note = {R package version 1.9.22},
  url = {https://github.com/pik-piam/mrwater},
 }
 ```