From b02b6ffe2277f353ffc981711fef2d5b89ac33ed Mon Sep 17 00:00:00 2001 From: florianh Date: Fri, 14 Jun 2024 23:59:29 +0200 Subject: [PATCH] bugfix --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/calcCroplandTreecover.R | 2 +- README.md | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index fa5b96a..8f3f078 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '11753808' +ValidationKey: '11773696' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 644faa3..4218d14 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: 'mrland: MadRaT land data package' -version: 0.59.1 +version: 0.59.2 date-released: '2024-06-14' abstract: The package provides land related data via the madrat framework. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 2c6cec7..6d3bd2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrland Title: MadRaT land data package -Version: 0.59.1 +Version: 0.59.2 Date: 2024-06-14 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/calcCroplandTreecover.R b/R/calcCroplandTreecover.R index 622ca04..e0f5b79 100644 --- a/R/calcCroplandTreecover.R +++ b/R/calcCroplandTreecover.R @@ -48,7 +48,7 @@ calcCroplandTreecover <- function(maginput = TRUE, cells = "magpiecell", country out <- collapseDim(out, dim = 3) if (countryLevel) { - out <- toolCountryFill(dimSums(out, dim = c("x", "y")), fill = 0) + out <- toolCountryFill(dimSums(out, dim = 1.2), fill = 0) } return(list( diff --git a/README.md b/README.md index 3770f10..fa9d0b3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRaT land data package -R package **mrland**, version **0.59.1** +R package **mrland**, version **0.59.2** [![CRAN status](https://www.r-pkg.org/badges/version/mrland)](https://cran.r-project.org/package=mrland) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822083.svg)](https://doi.org/10.5281/zenodo.3822083) [![R build status](https://github.com/pik-piam/mrland/workflows/check/badge.svg)](https://github.com/pik-piam/mrland/actions) [![codecov](https://codecov.io/gh/pik-piam/mrland/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrland) [![r-universe](https://pik-piam.r-universe.dev/badges/mrland)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich , R package version 0.59.1, . +Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D, Sauer P (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 , R package version 0.59.2, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {mrland: MadRaT land data package}, author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten and Pascal Sauer}, year = {2024}, - note = {R package version 0.59.1}, + note = {R package version 0.59.2}, url = {https://github.com/pik-piam/mrland}, doi = {10.5281/zenodo.3822083}, }