diff --git a/.buildlibrary b/.buildlibrary index 457a11b7..042fbad2 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '30533550' +ValidationKey: '30561202' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package .* was built under R version' diff --git a/CITATION.cff b/CITATION.cff index e1350f68..7fc8c84a 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,8 +2,8 @@ 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.52.5 -date-released: '2024-10-26' +version: 1.52.6 +date-released: '2024-10-31' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: - family-names: Karstens diff --git a/DESCRIPTION b/DESCRIPTION index fdef095a..be6bb198 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.52.5 -Date: 2024-10-26 +Version: 1.52.6 +Date: 2024-10-31 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"), diff --git a/R/calcAreaEquippedForIrrigation.R b/R/calcAreaEquippedForIrrigation.R index 05aa2457..bb3b9b53 100644 --- a/R/calcAreaEquippedForIrrigation.R +++ b/R/calcAreaEquippedForIrrigation.R @@ -105,7 +105,7 @@ calcAreaEquippedForIrrigation <- function(cellular = FALSE, out <- dimSums(out, dim = c("x", "y")) } else { mapping <- toolGetMapping(name = "CountryToCellMapping.rds", - where = "mrcommons") + where = "mstools") out <- toolAggregate(out, rel = mapping, from = "celliso", to = "iso", dim = 1) } diff --git a/README.md b/README.md index 3392c912..969ae599 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.52.5** +R package **mrmagpie**, version **1.52.6** [![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 , R package version 1.52.5, . +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.52.6, . A BibTeX entry for LaTeX users is @@ -48,8 +48,8 @@ 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.52.5}, - url = {https://github.com/pik-piam/mrmagpie}, + note = {R package version 1.52.6}, doi = {10.5281/zenodo.4319612}, + url = {https://github.com/pik-piam/mrmagpie}, } ```