add another fallow validation dataset

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '50128848'
+ValidationKey: '50158744'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

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: 'mrvalidation: madrat data preparation for validation purposes'
-version: 2.54.1
-date-released: '2024-01-06'
+version: 2.54.2
+date-released: '2024-01-10'
 abstract: Package contains routines to prepare data for validation exercises.
 authors:
 - family-names: Bodirsky

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrvalidation
 Title: madrat data preparation for validation purposes
-Version: 2.54.1
-Date: 2024-01-06
+Version: 2.54.2
+Date: 2024-01-10
 Authors@R: c(
  person("Benjamin Leon", "Bodirsky", , "[email protected]", role = c("aut", "cre")),
  person("Stephen", "Wirth", role = "aut"),

R/calcValidCroparea.R

@@ -10,7 +10,7 @@
 #' @param datasource Currently only "FAO" available
 #' @param detail how much detail?
 #' @return list of magpie object with data and weight
-#' @author Ulrich Kreidenweis
+#' @author Benjamin Bodirsky, Ulrich Kreidenweis
 #' @importFrom magpiesets reporthelper summationhelper
 #' @importFrom magclass getNames
 calcValidCroparea <- function(datasource = "FAO", detail = FALSE) {
@@ -38,6 +38,14 @@ calcValidCroparea <- function(datasource = "FAO", detail = FALSE) {
  "Resources|Land Cover|Cropland|+|Croparea")
  out <- mbind(cropland, fallow, croparea)
  getNames(out) <- paste(getNames(out), "(million ha)", sep = " ")
+ } else if (datasource == "FAOfallow") {
+ fallow <- calcOutput("FAOLand", aggregate = FALSE)[, , "6640", pmatch = TRUE]
+ # cut off incomplete data before 2001
+ out <- fallow[, getYears(fallow, as.integer = TRUE)[which(getYears(fallow, as.integer = TRUE) > 2000)], ]
+ getNames(out) <- paste("Resources|Land Cover|Cropland|+|", reportingnames("fallow"), sep = "")
+
+ out <- add_dimension(out, dim = 3.1, add = "scenario", nm = "historical")
+ out <- add_dimension(out, dim = 3.2, add = "model", nm = "FAOSTAT")
  } else {
  stop("No data exist for the given datasource!")
  }

R/fullVALIDATION.R

@@ -109,6 +109,9 @@ fullVALIDATION <- function(rev = 0.1) {
  file = valfile, append = TRUE, detail = TRUE, try = TRUE) # ready
  calcOutput(type = "ValidCroparea", datasource = "ostberg2023", aggregate = "REG+GLO",
  file = valfile, append = TRUE, detail = TRUE, try = TRUE) # ready
+ calcOutput(type = "ValidCroparea", datasource = "FAOfallow", aggregate = "REG+GLO",
+ file = valfile, append = TRUE, detail = TRUE, try = TRUE) # ready
+
  # Land Cover
  calcOutput(type = "ValidLand", datasource = "FAO_crop_past", aggregate = "REG+GLO",
  file = valfile, append = TRUE, try = TRUE) # ready

README.md

@@ -1,6 +1,6 @@
 # madrat data preparation for validation purposes
 
-R package **mrvalidation**, version **2.54.1**
+R package **mrvalidation**, version **2.54.2**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrvalidation)](https://cran.r-project.org/package=mrvalidation) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4317826.svg)](https://doi.org/10.5281/zenodo.4317826) [![R build status](https://github.com/pik-piam/mrvalidation/workflows/check/badge.svg)](https://github.com/pik-piam/mrvalidation/actions) [![codecov](https://codecov.io/gh/pik-piam/mrvalidation/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrvalidation) [![r-universe](https://pik-piam.r-universe.dev/badges/mrvalidation)](https://pik-piam.r-universe.dev/builds)
 
@@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky <bodirsky@
 
 To cite package **mrvalidation** in publications use:
 
-Bodirsky B, Wirth S, Karstens K, Humpenoeder F, Stevanovic M, Mishra A, Biewald A, Weindl I, Beier F, Chen D, Crawford M, Leip D, Molina Bacca E, Kreidenweis U, W. Yalew A, von Jeetze P, Wang X, Dietrich J, Alves M (2024). _mrvalidation: madrat data preparation for validation purposes_. doi:10.5281/zenodo.4317826 <https://doi.org/10.5281/zenodo.4317826>, R package version 2.54.1, <https://github.com/pik-piam/mrvalidation>.
+Bodirsky B, Wirth S, Karstens K, Humpenoeder F, Stevanovic M, Mishra A, Biewald A, Weindl I, Beier F, Chen D, Crawford M, Leip D, Molina Bacca E, Kreidenweis U, W. Yalew A, von Jeetze P, Wang X, Dietrich J, Alves M (2024). _mrvalidation: madrat data preparation for validation purposes_. doi:10.5281/zenodo.4317826 <https://doi.org/10.5281/zenodo.4317826>, R package version 2.54.2, <https://github.com/pik-piam/mrvalidation>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is
  title = {mrvalidation: madrat data preparation for validation purposes},
  author = {Benjamin Leon Bodirsky and Stephen Wirth and Kristine Karstens and Florian Humpenoeder and Mishko Stevanovic and Abhijeet Mishra and Anne Biewald and Isabelle Weindl and Felicitas Beier and David Chen and Michael Crawford and Debbora Leip and Edna {Molina Bacca} and Ulrich Kreidenweis and Amsalu {W. Yalew} and Patrick {von Jeetze} and Xiaoxi Wang and Jan Philipp Dietrich and Marcos Alves},
  year = {2024},
- note = {R package version 2.54.1},
+ note = {R package version 2.54.2},
  doi = {10.5281/zenodo.4317826},
  url = {https://github.com/pik-piam/mrvalidation},
 }