From cb4e4beaf0ded0fcdc0fd9821228a11903637f91 Mon Sep 17 00:00:00 2001 From: Kristine Karstens Date: Fri, 2 Feb 2024 16:11:20 +0100 Subject: [PATCH] bugfix residue set names --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/calcCarbonResidues.R | 2 +- README.md | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index c355751..c228547 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4187636' +ValidationKey: '4207815' 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 e795a15..05260ea 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: 'mrsoil: MadRat Soil Organic Carbon Budget Library' -version: 2.1.2 -date-released: '2024-01-31' +version: 2.1.3 +date-released: '2024-02-02' abstract: This packages provides functions for soil organic carbon budget for mineral soils using the steady-state method (Tier 2) of the 2019 Refinement to the 2006 IPP Guidelines for National Greenhouse Gas Inventories. diff --git a/DESCRIPTION b/DESCRIPTION index fc5ad3f..67566b0 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: mrsoil Type: Package Title: MadRat Soil Organic Carbon Budget Library -Version: 2.1.2 -Date: 2024-01-31 +Version: 2.1.3 +Date: 2024-02-02 Authors@R: c(person("Kristine", "Karstens", email = "karstens@pik-potsdam.de", role = c("aut","cre")), person("Jan Philipp", "Dietrich", email = "dietrich@pik-potsdam.de", role = "aut")) Description: This packages provides functions for soil organic carbon budget for mineral soils using the steady-state method (Tier 2) of the 2019 Refinement to the 2006 IPP Guidelines for National Greenhouse Gas Inventories. diff --git a/R/calcCarbonResidues.R b/R/calcCarbonResidues.R index 74e01bc..4d11e63 100644 --- a/R/calcCarbonResidues.R +++ b/R/calcCarbonResidues.R @@ -39,7 +39,7 @@ calcCarbonResidues <- function() { attributes <- c("c", "LC", "NC") names <- as.vector(outer(unique(kcr2kres$kres), attributes, paste, sep = ".")) out <- new.magpie(getCells(residueRecycling), getYears(residueRecycling), names, fill = 0) - getSets(out)[3] <- c("inputs", "attributes") + getSets(out, fulldim = FALSE)[3] <- "inputs.attributes" out[, , "c"] <- residueRecycling out[, , c("LC", "NC")] <- param diff --git a/README.md b/README.md index aed815f..2541eb8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat Soil Organic Carbon Budget Library -R package **mrsoil**, version **2.1.2** +R package **mrsoil**, version **2.1.3** [![CRAN status](https://www.r-pkg.org/badges/version/mrsoil)](https://cran.r-project.org/package=mrsoil) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4317933.svg)](https://doi.org/10.5281/zenodo.4317933) [![R build status](https://github.com/pik-piam/mrsoil/workflows/check/badge.svg)](https://github.com/pik-piam/mrsoil/actions) [![codecov](https://codecov.io/gh/pik-piam/mrsoil/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrsoil) [![r-universe](https://pik-piam.r-universe.dev/badges/mrsoil)](https://pik-piam.r-universe.dev/builds) @@ -38,7 +38,7 @@ In case of questions / problems please contact Kristine Karstens , R package version 2.1.2, . +Karstens K, Dietrich J (2024). _mrsoil: MadRat Soil Organic Carbon Budget Library_. doi:10.5281/zenodo.4317933 , R package version 2.1.3, . A BibTeX entry for LaTeX users is @@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is title = {mrsoil: MadRat Soil Organic Carbon Budget Library}, author = {Kristine Karstens and Jan Philipp Dietrich}, year = {2024}, - note = {R package version 2.1.2}, + note = {R package version 2.1.3}, doi = {10.5281/zenodo.4317933}, url = {https://github.com/pik-piam/mrsoil}, }