From df8d42b51057093b8e422b7305a709454100652f Mon Sep 17 00:00:00 2001 From: florianh Date: Thu, 4 Jul 2024 15:09:33 +0200 Subject: [PATCH] fix weight warnings --- .buildlibrary | 2 +- CITATION.cff | 2 +- DESCRIPTION | 2 +- R/calcCarbon.R | 2 +- R/calcPeatland.R | 2 +- README.md | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 43819f71..f3064cc1 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '30160620' +ValidationKey: '30180528' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package .* was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 7da2c592..ac725d4f 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.51.5 +version: 1.51.6 date-released: '2024-07-04' abstract: Provides functions for MAgPIE country and cellular input data generation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 649fc788..68bb1107 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: mrmagpie Title: madrat based MAgPIE Input Data Library -Version: 1.51.5 +Version: 1.51.6 Date: 2024-07-04 Authors@R: c( person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/calcCarbon.R b/R/calcCarbon.R index 7efea51b..006948c8 100644 --- a/R/calcCarbon.R +++ b/R/calcCarbon.R @@ -130,7 +130,7 @@ calcCarbon <- function(lpjml = c(natveg = "LPJmL4_for_MAgPIE_44ac93de", crop = " return(list( x = carbonStocks, - weight = weight, + weight = weight + 10^-10, unit = "t per ha", description = "Carbon in tons per hectar for different land use types.", note = ifelse(grasssoil, "Pasture soil carbon stocks are based on allcrop run.", diff --git a/R/calcPeatland.R b/R/calcPeatland.R index 44e86737..e94cd0c4 100644 --- a/R/calcPeatland.R +++ b/R/calcPeatland.R @@ -23,7 +23,7 @@ calcPeatland <- function(subtype = "degraded", cells = "lpjcell") { gpd <- readSource("GPD", convert = TRUE) - potPeatArea <- readSource("Leifeld2018", convert = "onlycorrect") + potPeatArea <- readSource("Leifeld2018", convert = "onlycorrect") + 10^-10 # Total and drained peatland area peatAreaTotal <- collapseNames(gpd[, , "PeatAreaTotal"]) diff --git a/README.md b/README.md index 6a81f1d9..92aa21dc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # madrat based MAgPIE Input Data Library -R package **mrmagpie**, version **1.51.5** +R package **mrmagpie**, version **1.51.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.51.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 , R package version 1.51.6, . 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.51.5}, + note = {R package version 1.51.6}, url = {https://github.com/pik-piam/mrmagpie}, doi = {10.5281/zenodo.4319612}, }