diff --git a/.buildlibrary b/.buildlibrary index 295cc21..d44f9e1 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4634370' +ValidationKey: '4674852' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 62f13da..7ccf77e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: 7910e0323d7213f34275a7a562b9ef0fde8ce1b9 # frozen: v0.4.2 + rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index 3d8ead8..bba5e3d 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.3.3 -date-released: '2024-06-16' +version: 2.3.4 +date-released: '2024-09-12' 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 1307215..8cf1d37 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Package: mrsoil Type: Package Title: MadRat Soil Organic Carbon Budget Library -Version: 2.3.3 -Date: 2024-06-16 +Version: 2.3.4 +Date: 2024-09-12 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. @@ -25,10 +25,8 @@ URL: https://github.com/pik-piam/mrsoil, https://doi.org/10.5281/zenodo.4317933 BugReports: https://github.com/pik-piam/mrsoil/issues Encoding: UTF-8 LazyData: no -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 Suggests: - knitr, rmarkdown, ggplot2, covr -VignetteBuilder: knitr diff --git a/R/calcTempEffectDecomposition.R b/R/calcTempEffectDecomposition.R index 1dd4f80..f743409 100644 --- a/R/calcTempEffectDecomposition.R +++ b/R/calcTempEffectDecomposition.R @@ -28,7 +28,7 @@ calcTempEffectDecomposition <- function(lpjmlNatveg = "LPJmL4_for_MAgPIE_44ac93d paramTopt <- param[, , "topt"] paramTa <- param[, , "ta"] paramTb <- param[, , "tb"] - cellTemp <- calcOutput("LPJmLClimateInput", climatetype = climatetype, + cellTemp <- calcOutput("LPJmLClimateInput_new", climatetype = climatetype, variable = "temperature:monthlyMean", stage = stage, lpjmlVersion = lpjmlNatveg, diff --git a/R/calcWaterEffectDecomposition.R b/R/calcWaterEffectDecomposition.R index f44d161..a070b05 100644 --- a/R/calcWaterEffectDecomposition.R +++ b/R/calcWaterEffectDecomposition.R @@ -36,7 +36,7 @@ calcWaterEffectDecomposition <- function(irrigation = "mixedirrig", paramWslope <- setYears(param[, , "wfacpar2"], NULL) paramWslope2 <- setYears(param[, , "wfacpar3"], NULL) - cellPrep <- calcOutput("LPJmLClimateInput", climatetype = climatetype, + cellPrep <- calcOutput("LPJmLClimateInput_new", climatetype = climatetype, variable = "precipitation:monthlySum", stage = stage, lpjmlVersion = lpjmlNatveg, diff --git a/README.md b/README.md index 0a70b53..2701ab0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRat Soil Organic Carbon Budget Library -R package **mrsoil**, version **2.3.3** +R package **mrsoil**, version **2.3.4** [![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.3.3, . +Karstens K, Dietrich J (2024). _mrsoil: MadRat Soil Organic Carbon Budget Library_. doi:10.5281/zenodo.4317933 , R package version 2.3.4, . A BibTeX entry for LaTeX users is @@ -47,8 +47,8 @@ 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.3.3}, - doi = {10.5281/zenodo.4317933}, + note = {R package version 2.3.4}, url = {https://github.com/pik-piam/mrsoil}, + doi = {10.5281/zenodo.4317933}, } ```