added iso files for tree cover and peatland

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '29619710'
+ValidationKey: '29653008'
 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.49.0
-date-released: '2024-06-05'
+version: 1.49.1
+date-released: '2024-06-14'
 abstract: Provides functions for MAgPIE country and cellular input data generation.
 authors:
 - family-names: Karstens
@@ -37,6 +37,7 @@ authors:
   given-names: Pascal
   email: pascal.sauer@pik-potsdam.de
 license: LGPL-3.0
+keywords: ~
 repository-code: https://github.com/pik-piam/mrmagpie
 doi: 10.5281/zenodo.4319612
 

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: mrmagpie
 Title: madrat based MAgPIE Input Data Library
-Version: 1.49.0
-Date: 2024-06-05
+Version: 1.49.1
+Date: 2024-06-14
 Authors@R: c(
     person("Kristine", "Karstens", , "karstens@pik-potsdam.de", role = c("aut", "cre")),
     person("Jan Philipp", "Dietrich", , "dietrich@pik-potsdam.de", role = "aut"),

R/fullCELLULARMAGPIE.R

@@ -245,6 +245,9 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "",
   calcOutput("CroplandTreecover",
              aggregate = "cluster", cells = cells,
              round = roundArea, file = paste0("CroplandTreecover_", ctype, ".mz"))
+  calcOutput("CroplandTreecover",
+             aggregate = FALSE, cells = cells, country_level = TRUE,
+             round = roundArea, file = "CroplandTreecover_iso.cs2")
 
   calcOutput("SNVTargetCropland",
              aggregate = FALSE, cells = cells,
@@ -459,6 +462,8 @@ fullCELLULARMAGPIE <- function(rev = numeric_version("0.1"), dev = "",
              file = "f58_peatland_area_0.5.mz")
   calcOutput("Peatland2", aggregate = "cluster", cells = cells, round = roundArea,
              file = paste0("f58_peatland_area_", ctype, ".mz"))
+  calcOutput("Peatland2", aggregate = FALSE, cells = cells, round = roundArea,
+             country_level = TRUE, file = "f58_peatland_area_iso.cs3")
 
   # 59 som
   calcOutput("SOMinitialsiationPools", aggregate = "cluster", round = 6, cells = cells,

README.md

@@ -1,6 +1,6 @@
 # madrat based MAgPIE Input Data Library
 
-R package **mrmagpie**, version **1.49.0**
+R package **mrmagpie**, version **1.49.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,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.49.0, <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.49.1, <https://github.com/pik-piam/mrmagpie>.
 
 A BibTeX entry for LaTeX users is
 
@@ -48,8 +48,8 @@ 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.49.0},
-  doi = {10.5281/zenodo.4319612},
+  note = {R package version 1.49.1},
   url = {https://github.com/pik-piam/mrmagpie},
+  doi = {10.5281/zenodo.4319612},
 }
 ```