From 3cc1ea7b450cf7d75cf16cfa3d58f668cd25f3d8 Mon Sep 17 00:00:00 2001 From: Felicitas Date: Wed, 25 Sep 2024 16:29:00 +0200 Subject: [PATCH] generalized if condition of historical climatetype in calcYieldsLPJmL (in case of switching historical baseline in the future) --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/calcYieldsLPJmL.R | 2 +- README.md | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 393f8d1..bf25c08 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '12413169' +ValidationKey: '12434402' 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 7e30698..c9a37f3 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: 'mrland: MadRaT land data package' -version: 0.62.1 -date-released: '2024-09-23' +version: 0.62.2 +date-released: '2024-09-25' abstract: The package provides land related data via the madrat framework. authors: - family-names: Dietrich diff --git a/DESCRIPTION b/DESCRIPTION index d789c33..f277ed8 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrland Title: MadRaT land data package -Version: 0.62.1 -Date: 2024-09-23 +Version: 0.62.2 +Date: 2024-09-25 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Abhijeet", "Mishra", role = "aut"), diff --git a/R/calcYieldsLPJmL.R b/R/calcYieldsLPJmL.R index d2f1b98..1ac2d4e 100644 --- a/R/calcYieldsLPJmL.R +++ b/R/calcYieldsLPJmL.R @@ -24,7 +24,7 @@ calcYieldsLPJmL <- function(lpjml = "ggcmi_phase3_nchecks_bft_e511ac58", climatetype = "GSWP3-W5E5:historical", cells = "lpjcell") { # Extract argument information - if (grepl("GSWP3-W5E5", climatetype)) { + if (grepl("historical", climatetype)) { stage <- "smoothed" } else { stage <- "harmonized2020" diff --git a/README.md b/README.md index 6fd4cc0..05495bc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRaT land data package -R package **mrland**, version **0.62.1** +R package **mrland**, version **0.62.2** [![CRAN status](https://www.r-pkg.org/badges/version/mrland)](https://cran.r-project.org/package=mrland) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.3822083.svg)](https://doi.org/10.5281/zenodo.3822083) [![R build status](https://github.com/pik-piam/mrland/workflows/check/badge.svg)](https://github.com/pik-piam/mrland/actions) [![codecov](https://codecov.io/gh/pik-piam/mrland/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrland) [![r-universe](https://pik-piam.r-universe.dev/badges/mrland)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Jan Philipp Dietrich . +Dietrich J, Mishra A, Weindl I, Bodirsky B, Wang X, Baumstark L, Kreidenweis U, Klein D, Steinmetz N, Chen D, Humpenoeder F, von Jeetze P, Wirth S, Beier F, Hoetten D, Sauer P (2024). _mrland: MadRaT land data package_. doi:10.5281/zenodo.3822083 , R package version 0.62.2, . A BibTeX entry for LaTeX users is @@ -48,8 +48,8 @@ A BibTeX entry for LaTeX users is title = {mrland: MadRaT land data package}, author = {Jan Philipp Dietrich and Abhijeet Mishra and Isabelle Weindl and Benjamin Leon Bodirsky and Xiaoxi Wang and Lavinia Baumstark and Ulrich Kreidenweis and David Klein and Nele Steinmetz and David Chen and Florian Humpenoeder and Patrick {von Jeetze} and Stephen Wirth and Felicitas Beier and David Hoetten and Pascal Sauer}, year = {2024}, - note = {R package version 0.62.1}, - doi = {10.5281/zenodo.3822083}, + note = {R package version 0.62.2}, url = {https://github.com/pik-piam/mrland}, + doi = {10.5281/zenodo.3822083}, } ```