From 0d3545e8260eb1bf0b89d3f967e3f048532da3ab Mon Sep 17 00:00:00 2001 From: emolinab Date: Tue, 27 Feb 2024 15:20:13 +0100 Subject: [PATCH] warning fix, NAs to 0 --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/calcMAPSPAM.R | 1 + README.md | 6 +++--- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 2b64c5e6..b3de9db2 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '27889800' +ValidationKey: '27909580' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 256b0476..14a32cdc 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ cff-version: 1.2.0 message: If you use this software, please cite it using the metadata from this file. type: software title: 'mrmagpie: madrat based MAgPIE Input Data Library' -version: 1.41.0 +version: 1.41.1 date-released: '2024-02-27' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index c5e948a2..37db448c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.41.0 +Version: 1.41.1 Date: 2024-02-27 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/calcMAPSPAM.R b/R/calcMAPSPAM.R index 9529a2e9..d1c7bbd1 100644 --- a/R/calcMAPSPAM.R +++ b/R/calcMAPSPAM.R @@ -13,6 +13,7 @@ calcMAPSPAM <- function(subtype = "physical") { x <- readSource(type = "MAPSPAM", subtype = subtype) / 1e6 # to convert to mio. of hectares + x[!is.finite(x)] <- 0 return(list( diff --git a/README.md b/README.md index 4c693035..b698c471 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.41.0** +R package **mrmagpie**, version **1.41.1** [![CRAN status](https://www.r-pkg.org/badges/version/mrmagpie)](https://cran.r-project.org/package=mrmagpie) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4319612.svg)](https://doi.org/10.5281/zenodo.4319612) [![R build status](https://github.com/pik-piam/mrmagpie/workflows/check/badge.svg)](https://github.com/pik-piam/mrmagpie/actions) [![codecov](https://codecov.io/gh/pik-piam/mrmagpie/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrmagpie) [![r-universe](https://pik-piam.r-universe.dev/badges/mrmagpie)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Kristine Karstens . +Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2024). _mrmagpie: madrat based MAgPIE Input Data Library_. doi: 10.5281/zenodo.4319612 (URL: https://doi.org/10.5281/zenodo.4319612), R package version 1.41.1, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrmagpie: madrat based MAgPIE Input Data Library}, author = {Kristine Karstens and Jan Philipp Dietrich and David Chen and Michael Windisch and Marcos Alves and Felicitas Beier and Alexandre Köberle and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer}, year = {2024}, - note = {R package version 1.41.0}, + note = {R package version 1.41.1}, doi = {10.5281/zenodo.4319612}, url = {https://github.com/pik-piam/mrmagpie}, }