diff --git a/.buildlibrary b/.buildlibrary index 9a6d470..52aa275 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '12157300' +ValidationKey: '12200448' 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 5a089af..3f3d5ea 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.61.0 -date-released: '2024-07-26' +version: 0.61.1 +date-released: '2024-09-02' abstract: The package provides land related data via the madrat framework. authors: - family-names: Dietrich diff --git a/DESCRIPTION b/DESCRIPTION index 4377888..074f59c 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: mrland Title: MadRaT land data package -Version: 0.61.0 -Date: 2024-07-26 +Version: 0.61.1 +Date: 2024-09-02 Authors@R: c( person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = c("aut", "cre")), person("Abhijeet", "Mishra", role = "aut"), diff --git a/R/calcMulticroppingIntensity.R b/R/calcMulticroppingIntensity.R index 8110ef6..856c1ff 100644 --- a/R/calcMulticroppingIntensity.R +++ b/R/calcMulticroppingIntensity.R @@ -126,16 +126,14 @@ calcMulticroppingIntensity <- function(scenario, selectyears, if (any(is.na(currMC))) { stop("mrland::calcMulticroppingIntensity produced NA values") } - if (any(currMC > 2 || currMC < 1)) { + if (any(currMC > 2 | currMC < 1)) { stop("Problem in mrland::calcMulticroppingIntensity: - Value should be between 1 and 2!") + Value should be between 1 and 2!") } if (any(currMC[, , cropsNoMC] > 1)) { - stop(paste0( - "Problem in mrland::calcMulticroppingIntensity: ", - "Crops that are not suitable for multiple cropping ", - "should not have CI > 1" - )) + stop(paste0("Problem in mrland::calcMulticroppingIntensity: ", + "Crops that are not suitable for multiple cropping ", + "should not have CI > 1")) } ############## diff --git a/README.md b/README.md index a20aed5..91f744b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MadRaT land data package -R package **mrland**, version **0.61.0** +R package **mrland**, version **0.61.1** [![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 , R package version 0.61.0, . +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.61.1, . 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.61.0}, - doi = {10.5281/zenodo.3822083}, + note = {R package version 0.61.1}, url = {https://github.com/pik-piam/mrland}, + doi = {10.5281/zenodo.3822083}, } ```