From 14b4a84eb05a46f744af007b9a8b870e92367e16 Mon Sep 17 00:00:00 2001
From: florianh <humpenoeder@pik-potsdam.de>
Date: Thu, 4 Jul 2024 10:06:52 +0200
Subject: [PATCH] bugfix type

---
 .buildlibrary   | 2 +-
 CITATION.cff    | 4 ++--
 DESCRIPTION     | 4 ++--
 R/readGPM2.R    | 8 ++++----
 README.md       | 6 +++---
 man/readGPM2.Rd | 4 ++--
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.buildlibrary b/.buildlibrary
index f0610e53..52f9bddb 100644
--- a/.buildlibrary
+++ b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '30119291'
+ValidationKey: '30140712'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package .* was built under R version'
diff --git a/CITATION.cff b/CITATION.cff
index 7489b858..0828b5b5 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: 'mrmagpie: madrat based MAgPIE Input Data Library'
-version: 1.51.3
-date-released: '2024-07-03'
+version: 1.51.4
+date-released: '2024-07-04'
 abstract: Provides functions for MAgPIE country and cellular input data generation.
 authors:
 - family-names: Karstens
diff --git a/DESCRIPTION b/DESCRIPTION
index 229985d5..d2534735 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: mrmagpie
 Title: madrat based MAgPIE Input Data Library
-Version: 1.51.3
-Date: 2024-07-03
+Version: 1.51.4
+Date: 2024-07-04
 Authors@R: c(
     person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")),
     person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"),
diff --git a/R/readGPM2.R b/R/readGPM2.R
index d7344aa7..44c03a26 100644
--- a/R/readGPM2.R
+++ b/R/readGPM2.R
@@ -1,6 +1,6 @@
 #' @title readGPM2
 #' @description read peatland area from GPM2
-#' @param type resolution ("1km" or "500m")
+#' @param subtype resolution ("1km" or "500m")
 #' @return List of magpie objects with results on cellular level, weight, unit and description.
 #' @author Florian Humpenoeder
 #' @examples
@@ -9,13 +9,13 @@
 #' }
 #' @importFrom magclass as.magpie
 #' @importFrom mstools toolGetMappingCoord2Country
-readGPM2 <- function(type = "1km") {
+readGPM2 <- function(subtype = "1km") {
   previousOptions <- terra::terraOptions(print = FALSE)
   terra::terraOptions(tempdir = withr::local_tempdir(tmpdir = getConfig("tmpfolder")),
                       todisk = FALSE, memfrac = 0.5)
   withr::defer(do.call(terra::terraOptions, previousOptions))
 
-  if (type == "1km") {
+  if (subtype == "1km") {
     # read-in file
     r <- terra::rast("peatMAY22_1x1_mw_RUS30.tif")
 
@@ -35,7 +35,7 @@ readGPM2 <- function(type = "1km") {
     # on the cluster (method = "sum" is the problem)
     r3 <- terra::aggregate(a, fact = 48, fun = "sum", na.rm = TRUE)
 
-  } else if (type == "500m") {
+  } else if (subtype == "500m") {
     # read-in file
     r <- terra::vrt(list.files("500m", full.names = TRUE, pattern = ".tif$"), "500m/GPM2.0_500m.vrt", overwrite = TRUE)
     crs(r) <- "+proj=moll"
diff --git a/README.md b/README.md
index 17e44894..4f1208ea 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # madrat based MAgPIE Input Data Library
 
-R package **mrmagpie**, version **1.51.3**
+R package **mrmagpie**, version **1.51.4**
 
 [![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,7 +39,7 @@ 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, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2024). _mrmagpie: madrat based MAgPIE Input Data Library_. doi:10.5281/zenodo.4319612 <https://doi.org/10.5281/zenodo.4319612>, R package version 1.51.3, <https://github.com/pik-piam/mrmagpie>.
+Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, Köberle A, v. Jeetze P, Mishra A, Humpenoeder F, Sauer P (2024). _mrmagpie: madrat based MAgPIE Input Data Library_. doi:10.5281/zenodo.4319612 <https://doi.org/10.5281/zenodo.4319612>, R package version 1.51.4, <https://github.com/pik-piam/mrmagpie>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is
   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 Alexandre Köberle and Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Sauer},
   year = {2024},
-  note = {R package version 1.51.3},
+  note = {R package version 1.51.4},
   url = {https://github.com/pik-piam/mrmagpie},
   doi = {10.5281/zenodo.4319612},
 }
diff --git a/man/readGPM2.Rd b/man/readGPM2.Rd
index ee685b64..3986d576 100644
--- a/man/readGPM2.Rd
+++ b/man/readGPM2.Rd
@@ -4,10 +4,10 @@
 \alias{readGPM2}
 \title{readGPM2}
 \usage{
-readGPM2(type = "1km")
+readGPM2(subtype = "1km")
 }
 \arguments{
-\item{type}{resolution ("1km" or "500m")}
+\item{subtype}{resolution ("1km" or "500m")}
 }
 \value{
 List of magpie objects with results on cellular level, weight, unit and description.