From 2fe992ea6e6ea6b338c849fd5d511c1ce22b6afb Mon Sep 17 00:00:00 2001 From: florianh Date: Sat, 15 Jun 2024 00:00:03 +0200 Subject: [PATCH] bugfix --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/calcPeatland2.R | 2 +- R/fullCELLULARMAGPIE.R | 4 ++-- README.md | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index dd89be02..dad7cd9e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '29672896' +ValidationKey: '29692784' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package .* was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 6903895a..9d723ab1 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.49.2 +version: 1.49.3 date-released: '2024-06-14' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 6324bc66..e305a988 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.49.2 +Version: 1.49.3 Date: 2024-06-14 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/calcPeatland2.R b/R/calcPeatland2.R index dd20644a..7a9ee4c3 100644 --- a/R/calcPeatland2.R +++ b/R/calcPeatland2.R @@ -36,7 +36,7 @@ calcPeatland2 <- function(cells = "magpiecell", countryLevel = FALSE) { } if (countryLevel) { - outCell <- toolCountryFill(dimSums(outCell, dim = c("x", "y")), fill = 0) + outCell <- toolCountryFill(dimSums(outCell, dim = 1.2), fill = 0) } description <- "Intact and degraded peatland area (Mha) by land-use type, based GPD 2022 and GPM2.0" diff --git a/R/fullCELLULARMAGPIE.R b/R/fullCELLULARMAGPIE.R index 5d0d6bc2..dcc1cbde 100644 --- a/R/fullCELLULARMAGPIE.R +++ b/R/fullCELLULARMAGPIE.R @@ -246,7 +246,7 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "", aggregate = "cluster", cells = cells, round = roundArea, file = paste0("CroplandTreecover_", ctype, ".mz")) calcOutput("CroplandTreecover", - aggregate = FALSE, cells = cells, country_level = TRUE, + aggregate = FALSE, cells = cells, countryLevel = TRUE, round = roundArea, file = "CroplandTreecover_iso.cs2") calcOutput("SNVTargetCropland", @@ -463,7 +463,7 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "", calcOutput("Peatland2", aggregate = "cluster", cells = cells, round = roundArea, file = paste0("f58_peatland_area_", ctype, ".mz")) calcOutput("Peatland2", aggregate = FALSE, cells = cells, round = roundArea, - country_level = TRUE, file = "f58_peatland_area_iso.cs3") + countryLevel = TRUE, file = "f58_peatland_area_iso.cs3") # 59 som calcOutput("SOMinitialsiationPools", aggregate = "cluster", round = 6, cells = cells, diff --git a/README.md b/README.md index 600d95b4..ceedd737 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.49.2** +R package **mrmagpie**, version **1.49.3** [![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.49.2, . +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 , R package version 1.49.3, . 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.49.2}, + note = {R package version 1.49.3}, url = {https://github.com/pik-piam/mrmagpie}, doi = {10.5281/zenodo.4319612}, }