na_warning -> warnNA

.buildlibrary

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

.zenodo.json

@@ -1,6 +1,6 @@
 {
   "title": "mrvalidation: madrat data preparation for validation purposes",
-  "version": "2.36.7",
+  "version": "2.36.8",
   "description": "<p>Package contains routines to prepare data for validation exercises.<\/p>",
   "creators": [
     {

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: mrvalidation
 Type: Package
 Title: madrat data preparation for validation purposes
-Version: 2.36.7
-Date: 2022-02-28
+Version: 2.36.8
+Date: 2022-03-01
 Authors@R: c(person("Benjamin Leon", "Bodirsky", email = "[email protected]", role = c("aut","cre")),
              person("Stephen", "Wirth", role = "aut"),
              person("Kristine", "Karstens", role = "aut"),
@@ -26,7 +26,7 @@ Description: Package contains routines to prepare data for validation exercises.
 Depends:
     R(>= 2.10.0),
     magclass(>= 3.17),
-    madrat(>= 2.11.0),
+    madrat(>= 2.11.3),
     mrdrivers(>= 0.2.2),
     mrcommons(>= 1.0.0),
     mrmagpie

R/fullVALIDATION.R

@@ -24,7 +24,7 @@ if (rev < 4.66) stop("mrvalidation(>= 2.34.0) does not support revision below 4.
 
   # Population and Income
   calcOutput(type = "ValidPopulation", aggregate = "REG+GLO", file = valfile,
-             append = FALSE, na_warning = FALSE, try = TRUE) # ready
+             append = FALSE, warnNA = FALSE, try = TRUE) # ready
   calcOutput(type = "ValidIncome", datasource = "James", aggregate = "REG+GLO",
              file = valfile, append = TRUE, try = TRUE)
   calcOutput(type = "ValidIncome", datasource = "WDI-MI_SSPs-MI",
@@ -59,7 +59,7 @@ if (rev < 4.66) stop("mrvalidation(>= 2.34.0) does not support revision below 4.
   calcOutput(type = "ValidDemand", aggregate = "REG+GLO", file = valfile,
              append = TRUE, detail = TRUE, try = TRUE) # ready
   calcOutput(type = "ValidDemandBioenergy", aggregate = "REG+GLO", file = valfile,
-             append = TRUE, na_warning = FALSE, try = TRUE) # ready
+             append = TRUE, warnNA = FALSE, try = TRUE) # ready
   calcOutput(type = "ValidProduction", aggregate = "REG+GLO", file = valfile,
              append = TRUE, detail = TRUE, try = TRUE) # ready
   calcOutput(type = "ValidTrade", aggregate = "REG+GLO", file = valfile,
@@ -89,9 +89,9 @@ if (rev < 4.66) stop("mrvalidation(>= 2.34.0) does not support revision below 4.
   calcOutput(type = "ValidLand", datasource = "MAgPIEown", aggregate = "REG+GLO",
              file = valfile, append = TRUE, try = TRUE) # ready
   calcOutput(type = "ValidLand", datasource = "SSPResults", aggregate = "REG+GLO",
-             file = valfile, append = TRUE, na_warning = FALSE, try = TRUE) # ready
+             file = valfile, append = TRUE, warnNA = FALSE, try = TRUE) # ready
   calcOutput(type = "ValidLand", datasource = "FRA2020", aggregate = "REG+GLO",
-             file = valfile, append = TRUE, na_warning = FALSE, try = TRUE) # ready
+             file = valfile, append = TRUE, warnNA = FALSE, try = TRUE) # ready
 
   # Land Cover Change
   calcOutput(type = "ValidLandChange", datasource = "FAO_crop_past", aggregate = "REG+GLO",
@@ -103,7 +103,7 @@ if (rev < 4.66) stop("mrvalidation(>= 2.34.0) does not support revision below 4.
   calcOutput(type = "ValidLandChange", datasource = "MAgPIEown", aggregate = "REG+GLO",
              file = valfile, append = TRUE, try = TRUE) # ready
   calcOutput(type = "ValidLandChange", datasource = "SSPResults", aggregate = "REG+GLO",
-             file = valfile, append = TRUE, na_warning = FALSE, try = TRUE) # ready
+             file = valfile, append = TRUE, warnNA = FALSE, try = TRUE) # ready
 
   # WaterUsage
   calcOutput(type = "ValidWaterUsage", datasource = "foley_2011", aggregate = FALSE,
@@ -185,7 +185,7 @@ if (rev < 4.66) stop("mrvalidation(>= 2.34.0) does not support revision below 4.
              file = valfile, append = TRUE, try = TRUE) # ready
   calcOutput(type = "ValidEmissions", datasource = "GFED", aggregate = "REG+GLO",
              file = valfile, append = TRUE, try = TRUE) # ready
-  calcOutput(type = "ValidEmissions", datasource = "EDGAR6", aggregate = "REG+GLO", 
+  calcOutput(type = "ValidEmissions", datasource = "EDGAR6", aggregate = "REG+GLO",
              file = valfile, append = TRUE, try = TRUE) # ready
   calcOutput(type = "ValidEmissions", datasource = "PRIMAPhist", aggregate = "REG+GLO",
              file = valfile, append = TRUE, try = TRUE) # ready
@@ -234,9 +234,9 @@ if (rev < 4.66) stop("mrvalidation(>= 2.34.0) does not support revision below 4.
              file = valfile, append = TRUE, try = TRUE)
 
   calcOutput(type = "ValidPriceBioenergy", aggregate = "REG+GLO", file = valfile, append = TRUE,
-             na_warning = FALSE, try = TRUE) # ready
+             warnNA = FALSE, try = TRUE) # ready
   calcOutput(type = "ValidPriceGHG",   datasource = "SSPResults", aggregate = "REG+GLO",
-             file = valfile, append = TRUE, na_warning = FALSE, try = TRUE)
+             file = valfile, append = TRUE, warnNA = FALSE, try = TRUE)
 
   # PriceIndex
   calcOutput(type = "ValidPriceIndex", datasource = "FAO", baseyear = "y2010", round = TRUE,

README.md

@@ -1,6 +1,6 @@
 # madrat data preparation for validation purposes
 
-R package **mrvalidation**, version **2.36.7**
+R package **mrvalidation**, version **2.36.8**
 
 [![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/ui#builds)
 
@@ -38,7 +38,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, Molina Bacca E, Kreidenweis U, W. Yalew A, Humpenoeder F, von Jeetze P, Wang X, Dietrich J, Alves M (2022). _mrvalidation: madrat data preparation for validation purposes_. doi: 10.5281/zenodo.4317826 (URL: https://doi.org/10.5281/zenodo.4317826), R package version 2.36.7, <URL: 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, Molina Bacca E, Kreidenweis U, W. Yalew A, Humpenoeder F, von Jeetze P, Wang X, Dietrich J, Alves M (2022). _mrvalidation: madrat data preparation for validation purposes_. doi: 10.5281/zenodo.4317826 (URL: https://doi.org/10.5281/zenodo.4317826), R package version 2.36.8, <URL: https://github.com/pik-piam/mrvalidation>.
 
 A BibTeX entry for LaTeX users is
 
@@ -47,7 +47,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 Edna {Molina Bacca} and Ulrich Kreidenweis and Amsalu {W. Yalew} and Florian {Humpenoeder } and Patrick {von Jeetze } and Xiaoxi Wang and Jan Philipp Dietrich and Marcos Alves},
   year = {2022},
-  note = {R package version 2.36.7},
+  note = {R package version 2.36.8},
   doi = {10.5281/zenodo.4317826},
   url = {https://github.com/pik-piam/mrvalidation},
 }