diff --git a/.buildlibrary b/.buildlibrary index 7907d05..d2b619e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '2186690' +ValidationKey: '2206902' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index d8d9964..76df298 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: 'mrlandcore: One-line description of this awesome package' -version: 1.1.0 -date-released: '2024-06-05' +version: 1.1.1 +date-released: '2024-06-08' abstract: One-paragraph description of this awesome package. authors: - family-names: Beier @@ -36,5 +36,6 @@ authors: - family-names: Kreidenweis given-names: Ulrich license: LGPL-3.0 +keywords: ~ repository-code: https://github.com/pik-piam/mrlandcore diff --git a/DESCRIPTION b/DESCRIPTION index f63d43a..0a625e1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrlandcore Title: One-line description of this awesome package -Version: 1.1.0 -Date: 2024-06-05 +Version: 1.1.1 +Date: 2024-06-08 Authors@R:c( person("Felicitas", "Beier", , "beier@pik-potsdam.de", role = c("aut", "cre")), person("Kristine", "Karstens", role = "aut"), diff --git a/R/calcGrowingPeriodMonths.R b/R/calcGrowingPeriodMonths.R index b606239..3aabe92 100644 --- a/R/calcGrowingPeriodMonths.R +++ b/R/calcGrowingPeriodMonths.R @@ -65,7 +65,7 @@ calcGrowingPeriodMonths <- function(selectyears, lpjml, climatetype, if (any(grper < 0)) { stop("mrland::calcGrowingPeriodMonths produced negative values") } - if (any(grper != 1 && grper != 0)) { + if (any(grper != 1) && any(grper != 0)) { stop("Problem in mrland::calcGrowingPeriodMonths: Value should be 0 or 1!") } diff --git a/README.md b/README.md index 522a3d5..1e8aaed 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # One-line description of this awesome package -R package **mrlandcore**, version **1.1.0** +R package **mrlandcore**, version **1.1.1** [![CRAN status](https://www.r-pkg.org/badges/version/mrlandcore)](https://cran.r-project.org/package=mrlandcore) [![R build status](https://github.com/pik-piam/mrlandcore/workflows/check/badge.svg)](https://github.com/pik-piam/mrlandcore/actions) [![codecov](https://codecov.io/gh/pik-piam/mrlandcore/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrlandcore) [![r-universe](https://pik-piam.r-universe.dev/badges/mrlandcore)](https://pik-piam.r-universe.dev/builds) @@ -38,7 +38,7 @@ In case of questions / problems please contact Felicitas Beier . +Beier F, Karstens K, Alves M, Philipp Dietrich J, Leon Bodirsky B, Hoetten D, Humpenoeder F, Heinke J, v. Jeetze P, Mishra A, Beier F, Wirth S, Chen D, Kreidenweis U (2024). _mrlandcore: One-line description of this awesome package_. R package version 1.1.1, . A BibTeX entry for LaTeX users is @@ -47,7 +47,7 @@ A BibTeX entry for LaTeX users is title = {mrlandcore: One-line description of this awesome package}, author = {Felicitas Beier and Kristine Karstens and Marcos Alves and Jan {Philipp Dietrich} and Benjamin {Leon Bodirsky} and David Hoetten and Florian Humpenoeder and Jens Heinke and Patrick {v. Jeetze} and Abhijeet Mishra and Felcitas Beier and Stephen Wirth and David Chen and Ulrich Kreidenweis}, year = {2024}, - note = {R package version 1.1.0}, + note = {R package version 1.1.1}, url = {https://github.com/pik-piam/mrlandcore}, } ```