merge

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '27339910'
+ValidationKey: '27381835'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

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: 'mrmagpie: madrat based MAgPIE Input Data Library'
-version: 1.39.0
-date-released: '2023-11-08'
+version: 1.39.1
+date-released: '2023-11-24'
 abstract: Provides functions for MAgPIE country and cellular input data generation.
 authors:
 - family-names: Karstens
@@ -18,6 +18,8 @@ authors:
   given-names: Michael
 - family-names: Alves
   given-names: Marcos
+- family-names: Köberle
+  given-names: Alexandre
 - family-names: Beier
   given-names: Felicitas
   email: [email protected]

DESCRIPTION

@@ -1,15 +1,16 @@
 Type: Package
 Package: mrmagpie
 Title: madrat based MAgPIE Input Data Library
-Version: 1.39.0
-Date: 2023-11-08
+Version: 1.39.1
+Date: 2023-11-24
 Authors@R: c(
     person("Kristine", "Karstens", , "[email protected]", role = c("aut", "cre")),
     person("Jan Philipp", "Dietrich", , "[email protected]", role = "aut"),
     person("David", "Chen", role = "aut"),
     person("Michael", "Windisch", role = "aut"),
     person("Marcos", "Alves", role = "aut"),
     person("Felicitas", "Beier", , "[email protected]", role = "aut"),
+    person("Alexandre", "Köberle", , "[email protected]", role = "aut"),
     person("Patrick", "v. Jeetze", , "[email protected]", role = "aut"),
     person("Abhijeet", "Mishra", , "[email protected]", role = "aut"),
     person("Florian", "Humpenoeder", , "[email protected]", role = "aut"),

R/calcPastureSuit.R

@@ -8,7 +8,7 @@
 #'              Options: "magpiecell" (59199), "lpjcell" (67420)
 #'
 #' @return List of magpie object with results on cluster level
-#' @author Marcos Alves, Kristine Karstens
+#' @author Marcos Alves, Kristine Karstens, Alexandre Köberle
 #' @examples
 #' \dontrun{
 #' calcOutput("PastureSuit")

README.md

@@ -1,6 +1,6 @@
 # madrat based MAgPIE Input Data Library
 
-R package **mrmagpie**, version **1.39.0**
+R package **mrmagpie**, version **1.39.1**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/mrmagpie)](https://cran.r-project.org/package=mrmagpie) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4319612.svg)](https://doi.org/10.5281/zenodo.4319612) [![R build status](https://github.com/pik-piam/mrmagpie/workflows/check/badge.svg)](https://github.com/pik-piam/mrmagpie/actions) [![codecov](https://codecov.io/gh/pik-piam/mrmagpie/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/mrmagpie) [![r-universe](https://pik-piam.r-universe.dev/badges/mrmagpie)](https://pik-piam.r-universe.dev/builds)
 
@@ -39,16 +39,16 @@ In case of questions / problems please contact Kristine Karstens <karstens@pik-p
 
 To cite package **mrmagpie** in publications use:
 
-Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2023). _mrmagpie: madrat based MAgPIE Input Data Library_. doi:10.5281/zenodo.4319612 <https://doi.org/10.5281/zenodo.4319612>, R package version 1.39.0, <https://github.com/pik-piam/mrmagpie>.
+Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Koeberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2023). _mrmagpie: madrat based MAgPIE Input Data Library_. doi: 10.5281/zenodo.4319612 (URL: https://doi.org/10.5281/zenodo.4319612), R package version 1.39.1, <URL: https://github.com/pik-piam/mrmagpie>.
 
 A BibTeX entry for LaTeX users is
 
  ```latex
 @Manual{,
   title = {mrmagpie: madrat based MAgPIE Input Data Library},
-  author = {Kristine Karstens and Jan Philipp Dietrich and David Chen and Michael Windisch and Marcos Alves and Felicitas Beier and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer},
+  author = {Kristine Karstens and Jan Philipp Dietrich and David Chen and Michael Windisch and Marcos Alves and Felicitas Beier and Alexandre Koeberle and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer},
   year = {2023},
-  note = {R package version 1.39.0},
+  note = {R package version 1.39.1},
   doi = {10.5281/zenodo.4319612},
   url = {https://github.com/pik-piam/mrmagpie},
 }