From 283a04c656b4a989b1592fd5cb90da247b632df0 Mon Sep 17 00:00:00 2001 From: bodirsky Date: Tue, 30 Jan 2024 17:42:25 +0100 Subject: [PATCH] missing data source added --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/calcValidCroparea.R | 2 ++ README.md | 6 +++--- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index bd53afc..1610db5 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '50396896' +ValidationKey: '50446608' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 9551ea5..c76d1da 100644 --- a/CITATION.cff +++ b/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.55.2 -date-released: '2024-01-26' +version: 2.55.4 +date-released: '2024-01-30' abstract: Package contains routines to prepare data for validation exercises. authors: - family-names: Bodirsky diff --git a/DESCRIPTION b/DESCRIPTION index 0a267d3..c867ff9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrvalidation Title: madrat data preparation for validation purposes -Version: 2.55.2 -Date: 2024-01-26 +Version: 2.55.4 +Date: 2024-01-30 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Stephen", "Wirth", role = "aut"), diff --git a/R/calcValidCroparea.R b/R/calcValidCroparea.R index f5240af..6e56c39 100644 --- a/R/calcValidCroparea.R +++ b/R/calcValidCroparea.R @@ -38,6 +38,8 @@ calcValidCroparea <- function(datasource = "FAO", detail = FALSE) { "Resources|Land Cover|Cropland|+|Croparea") out <- mbind(cropland, fallow, croparea) getNames(out) <- paste(getNames(out), "(million ha)", sep = " ") + out <- add_dimension(out, dim = 3.1, add = "scenario", nm = "historical") + out <- add_dimension(out, dim = 3.2, add = "model", nm = "Ostberg2023") } else if (datasource == "FAOfallow") { fallow <- calcOutput("FAOLand", aggregate = FALSE)[, , "6640", pmatch = TRUE] # cut off incomplete data before 2001 diff --git a/README.md b/README.md index f890d78..d94389e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat data preparation for validation purposes -R package **mrvalidation**, version **2.55.2** +R package **mrvalidation**, version **2.55.4** [![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 , R package version 2.55.2, . +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 , R package version 2.55.4, . 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.55.2}, + note = {R package version 2.55.4}, doi = {10.5281/zenodo.4317826}, url = {https://github.com/pik-piam/mrvalidation}, }