diff --git a/.buildlibrary b/.buildlibrary index 1547a79..967703c 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '533624' +ValidationKey: '552682' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/.zenodo.json b/.zenodo.json index 2596a89..80a31a3 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -1,6 +1,6 @@ { "title": "mrtutorial: Tutorial Package For Madrat Package Library", - "version": "0.2.8", + "version": "0.2.9", "description": "

Example package of mr- world libraries, in conjunction with MAgPIE MADRat tutorial. For more information please see: https://github.com/magpiemodel/tutorials/tree/master/madrat .<\/p>", "creators": [ { diff --git a/DESCRIPTION b/DESCRIPTION index f362c62..88972da 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: mrtutorial Type: Package Title: Tutorial Package For Madrat Package Library Date: 2022-03-07 -Version: 0.2.8 +Version: 0.2.9 Authors@R: person("David Meng-Chuen", "Chen", email = "david.chen@pik-potsdam.de", role = c("aut","cre")) Description: Example package of mr- world libraries, in conjunction with MAgPIE MADRat tutorial. For more information please see: https://github.com/magpiemodel/tutorials/tree/master/madrat . diff --git a/R/fullTUTORIALVALIDATION.R b/R/fullTUTORIALVALIDATION.R index ceee8dc..cf96c10 100644 --- a/R/fullTUTORIALVALIDATION.R +++ b/R/fullTUTORIALVALIDATION.R @@ -21,13 +21,10 @@ fullTUTORIALVALIDATION <- function(rev = 0.1) { # Please put the validation.mif into your output folder. # Use retrieveData("VALIDATION") to create a .tgz - file.copy(lucode2::path(paste0(getConfig("mainfolder"), "/output/"), "validation.mif"), - lucode2::path(getConfig("outputfolder"), "validation.mif")) - valfile <- "validation.mif" # Add your validation scripts here calcOutput(type = "ValidPopulation", datasource = "WDI", aggregate = "REG+GLO", - file = valfile, append = TRUE, na_warning = FALSE, try = TRUE) + file = valfile, append = TRUE, warnNA = FALSE, try = TRUE) } diff --git a/README.md b/README.md index 3b5dd42..3152d73 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Tutorial Package For Madrat Package Library -R package **mrtutorial**, version **0.2.8** +R package **mrtutorial**, version **0.2.9** [![CRAN status](https://www.r-pkg.org/badges/version/mrtutorial)](https://cran.r-project.org/package=mrtutorial) [![R build status](https://github.com/pik-piam/mrtutorial/workflows/check/badge.svg)](https://github.com/pik-piam/mrtutorial/actions) [![codecov](https://codecov.io/gh/pik-piam/mrtutorial/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrtutorial) [![r-universe](https://pik-piam.r-universe.dev/badges/mrtutorial)](https://pik-piam.r-universe.dev/ui#builds) @@ -38,7 +38,7 @@ In case of questions / problems please contact David Meng-Chuen Chen