generalized if condition of historical climatetype in calcGrassGPP (i…

…n case of switching historical baseline in the future)
pik-piam · Sep 25, 2024 · 3cd25f5 · 3cd25f5
1 parent c8f07f8
commit 3cd25f5
Show file tree

Hide file tree

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

diff --git 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.7
-date-released: '2024-09-12'
+version: 1.1.8
+date-released: '2024-09-25'
 abstract: One-paragraph description of this awesome package.
 authors:
 - family-names: Beier

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: mrlandcore
 Title: One-line description of this awesome package
-Version: 1.1.7
-Date: 2024-09-12
+Version: 1.1.8
+Date: 2024-09-25
 Authors@R: c(
     person("Felicitas", "Beier", , "[email protected]", role = c("aut", "cre")),
     person("Kristine", "Karstens", role = "aut"),

diff --git a/R/calcGrassGPP.R b/R/calcGrassGPP.R
@@ -24,7 +24,7 @@
 
 calcGrassGPP <- function(selectyears, lpjml, climatetype, season) {
 
-  if (grepl("GSWP3-W5E5", climatetype)) {
+  if (grepl("historical", climatetype)) {
     stage <- "smoothed"
   } else {
     stage <- "harmonized2020"

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.7**
+R package **mrlandcore**, version **1.1.8**
 
 [![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.7, <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.8, <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.7},
+  note = {R package version 1.1.8},
   url = {https://github.com/pik-piam/mrlandcore},
 }
 ```