bugfix

pik-piam · Aug 11, 2023 · c8ab15b · c8ab15b
1 parent 962f7e9
commit c8ab15b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.buildlibrary b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '26648380'
+ValidationKey: '26667960'
 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: 'mrmagpie: madrat based MAgPIE Input Data Library'
-version: 1.36.1
+version: 1.36.2
 date-released: '2023-08-11'
 abstract: Provides functions for MAgPIE country and cellular input data generation.
 authors:

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: mrmagpie
 Title: madrat based MAgPIE Input Data Library
-Version: 1.36.1
+Version: 1.36.2
 Date: 2023-08-11
 Authors@R: c(
     person("Kristine", "Karstens", , "[email protected]", role = c("aut", "cre")),

diff --git a/R/convertGPD2022.R b/R/convertGPD2022.R
@@ -32,8 +32,8 @@ convertGPD2022 <- function(x) {
   # do the disaggregation into cropland and grassland
   ag2 <- toolAggregate(ag, map, from = "from", to = "to", dim = 3, weight = w)
   # add the disaggregated categories to the existing categories
-  out[, , "crop"] <- setNames(x[, , "croplandDD", ], "crop") + ag2[, , "crop"]
-  out[, , "past"] <- setNames(x[, , "grasslandDD", ], "past") + ag2[, , "past"]
+  out[, , "crop"] <- setNames(x[, , "croplandDD"], "crop") + ag2[, , "crop"]
+  out[, , "past"] <- setNames(x[, , "grasslandDD"], "past") + ag2[, , "past"]
 
   ## Merge deeply drained (DD) and shallow drained (SD) peatlands used for forestry
   out[, , "forestry"] <- dimSums(x[, , c("forestryDD", "forestrySD")], dim = 3)

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # madrat based MAgPIE Input Data Library
 
-R package **mrmagpie**, version **1.36.1**
+R package **mrmagpie**, version **1.36.2**
 
 [![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, v. Jeetze P, Mishra A, Humpenoeder F, Führlich 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.36.1, <https://github.com/pik-piam/mrmagpie>.
+Karstens K, Dietrich J, Chen D, Windisch M, Alves M, Beier F, v. Jeetze P, Mishra A, Humpenoeder F, Führlich 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.36.2, <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 Patrick {v. Jeetze} and Abhijeet Mishra and Florian Humpenoeder and Pascal Führlich},
   year = {2023},
-  note = {R package version 1.36.1},
+  note = {R package version 1.36.2},
   doi = {10.5281/zenodo.4319612},
   url = {https://github.com/pik-piam/mrmagpie},
 }