Skip to content

Commit a3b2cd4

Browse files
tscheypiditscheypidi
committed
na_warning -> warnNA
1 parent 4552b12 commit a3b2cd4

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

‎.buildlibrary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ValidationKey: '45093717'
1+
ValidationKey: '45115136'
22
AutocreateReadme: yes
33
AcceptedWarnings:
44
- 'Warning: package ''.*'' was built under R version'

‎.zenodo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "mrvalidation: madrat data preparation for validation purposes",
3-
"version": "2.36.7",
3+
"version": "2.36.8",
44
"description": "<p>Package contains routines to prepare data for validation exercises.<\/p>",
55
"creators": [
66
{

‎DESCRIPTION

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: mrvalidation
22
Type: Package
33
Title: madrat data preparation for validation purposes
4-
Version: 2.36.7
5-
Date: 2022-02-28
4+
Version: 2.36.8
5+
Date: 2022-03-01
66
Authors@R: c(person("Benjamin Leon", "Bodirsky", email = "bodirsky@pik-potsdam.de", role = c("aut","cre")),
77
person("Stephen", "Wirth", role = "aut"),
88
person("Kristine", "Karstens", role = "aut"),
@@ -26,7 +26,7 @@ Description: Package contains routines to prepare data for validation exercises.
2626
Depends:
2727
R(>= 2.10.0),
2828
magclass(>= 3.17),
29-
madrat(>= 2.11.0),
29+
madrat(>= 2.11.3),
3030
mrdrivers(>= 0.2.2),
3131
mrcommons(>= 1.0.0),
3232
mrmagpie

‎R/fullVALIDATION.R

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if (rev < 4.66) stop("mrvalidation(>= 2.34.0) does not support revision below 4.
2424

2525
# Population and Income
2626
calcOutput(type = "ValidPopulation", aggregate = "REG+GLO", file = valfile,
27-
append = FALSE, na_warning = FALSE, try = TRUE) # ready
27+
append = FALSE, warnNA = FALSE, try = TRUE) # ready
2828
calcOutput(type = "ValidIncome", datasource = "James", aggregate = "REG+GLO",
2929
file = valfile, append = TRUE, try = TRUE)
3030
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.
5959
calcOutput(type = "ValidDemand", aggregate = "REG+GLO", file = valfile,
6060
append = TRUE, detail = TRUE, try = TRUE) # ready
6161
calcOutput(type = "ValidDemandBioenergy", aggregate = "REG+GLO", file = valfile,
62-
append = TRUE, na_warning = FALSE, try = TRUE) # ready
62+
append = TRUE, warnNA = FALSE, try = TRUE) # ready
6363
calcOutput(type = "ValidProduction", aggregate = "REG+GLO", file = valfile,
6464
append = TRUE, detail = TRUE, try = TRUE) # ready
6565
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.
8989
calcOutput(type = "ValidLand", datasource = "MAgPIEown", aggregate = "REG+GLO",
9090
file = valfile, append = TRUE, try = TRUE) # ready
9191
calcOutput(type = "ValidLand", datasource = "SSPResults", aggregate = "REG+GLO",
92-
file = valfile, append = TRUE, na_warning = FALSE, try = TRUE) # ready
92+
file = valfile, append = TRUE, warnNA = FALSE, try = TRUE) # ready
9393
calcOutput(type = "ValidLand", datasource = "FRA2020", aggregate = "REG+GLO",
94-
file = valfile, append = TRUE, na_warning = FALSE, try = TRUE) # ready
94+
file = valfile, append = TRUE, warnNA = FALSE, try = TRUE) # ready
9595

9696
# Land Cover Change
9797
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.
103103
calcOutput(type = "ValidLandChange", datasource = "MAgPIEown", aggregate = "REG+GLO",
104104
file = valfile, append = TRUE, try = TRUE) # ready
105105
calcOutput(type = "ValidLandChange", datasource = "SSPResults", aggregate = "REG+GLO",
106-
file = valfile, append = TRUE, na_warning = FALSE, try = TRUE) # ready
106+
file = valfile, append = TRUE, warnNA = FALSE, try = TRUE) # ready
107107

108108
# WaterUsage
109109
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.
185185
file = valfile, append = TRUE, try = TRUE) # ready
186186
calcOutput(type = "ValidEmissions", datasource = "GFED", aggregate = "REG+GLO",
187187
file = valfile, append = TRUE, try = TRUE) # ready
188-
calcOutput(type = "ValidEmissions", datasource = "EDGAR6", aggregate = "REG+GLO",
188+
calcOutput(type = "ValidEmissions", datasource = "EDGAR6", aggregate = "REG+GLO",
189189
file = valfile, append = TRUE, try = TRUE) # ready
190190
calcOutput(type = "ValidEmissions", datasource = "PRIMAPhist", aggregate = "REG+GLO",
191191
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.
234234
file = valfile, append = TRUE, try = TRUE)
235235

236236
calcOutput(type = "ValidPriceBioenergy", aggregate = "REG+GLO", file = valfile, append = TRUE,
237-
na_warning = FALSE, try = TRUE) # ready
237+
warnNA = FALSE, try = TRUE) # ready
238238
calcOutput(type = "ValidPriceGHG", datasource = "SSPResults", aggregate = "REG+GLO",
239-
file = valfile, append = TRUE, na_warning = FALSE, try = TRUE)
239+
file = valfile, append = TRUE, warnNA = FALSE, try = TRUE)
240240

241241
# PriceIndex
242242
calcOutput(type = "ValidPriceIndex", datasource = "FAO", baseyear = "y2010", round = TRUE,

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# madrat data preparation for validation purposes
22

3-
R package **mrvalidation**, version **2.36.7**
3+
R package **mrvalidation**, version **2.36.8**
44

55
[![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)
66

@@ -38,7 +38,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky <bodirsky@
3838

3939
To cite package **mrvalidation** in publications use:
4040

41-
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>.
41+
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>.
4242

4343
A BibTeX entry for LaTeX users is
4444

@@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is
4747
title = {mrvalidation: madrat data preparation for validation purposes},
4848
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},
4949
year = {2022},
50-
note = {R package version 2.36.7},
50+
note = {R package version 2.36.8},
5151
doi = {10.5281/zenodo.4317826},
5252
url = {https://github.com/pik-piam/mrvalidation},
5353
}

0 commit comments

Comments
 (0)