bugfix

pik-piam · Jun 8, 2024 · 3b794de · 3b794de
1 parent adf7c44
commit 3b794de
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '2226784'
+ValidationKey: '2246666'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

diff --git a/CITATION.cff b/CITATION.cff
@@ -2,7 +2,7 @@ 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.2
+version: 1.1.3
 date-released: '2024-06-08'
 abstract: One-paragraph description of this awesome package.
 authors:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: mrlandcore
 Title: One-line description of this awesome package
-Version: 1.1.2
+Version: 1.1.3
 Date: 2024-06-08
 Authors@R:c(
     person("Felicitas", "Beier", , "[email protected]", role = c("aut", "cre")),

diff --git a/R/calcMulticroppingSuitability.R b/R/calcMulticroppingSuitability.R
@@ -125,7 +125,7 @@ calcMulticroppingSuitability <- function(selectyears, lpjml, climatetype,
   if (any(suitMC < 0)) {
     stop("calcMulticroppingSuitability produced negative values")
   }
-  if (any(suitMC != 1 && suitMC != 0)) {
+  if (!all(suitMC %in% c(0, 1))) {
     stop("Problem in calcMulticroppingSuitability: Value should be 0 or 1!")
   }
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # One-line description of this awesome package
 
-R package **mrlandcore**, version **1.1.2**
+R package **mrlandcore**, version **1.1.3**
 
 [![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@pik-potsda
 
 To cite package **mrlandcore** in publications use:
 
-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.2, <https://github.com/pik-piam/mrlandcore>.
+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.3, <https://github.com/pik-piam/mrlandcore>.
 
 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.2},
+  note = {R package version 1.1.3},
   url = {https://github.com/pik-piam/mrlandcore},
 }
 ```