diff --git a/.buildlibrary b/.buildlibrary index f137990..4023158 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '43108191' +ValidationKey: '43130384' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 01c31bb..5940fc4 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: 'magpie4: MAgPIE outputs R package for MAgPIE version 4.x' -version: 2.15.1 -date-released: '2024-11-14' +version: 2.15.2 +date-released: '2024-11-15' abstract: Common output routines for extracting results from the MAgPIE framework (versions 4.x). authors: diff --git a/DESCRIPTION b/DESCRIPTION index 7fb621b..7c70d71 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: magpie4 Title: MAgPIE outputs R package for MAgPIE version 4.x -Version: 2.15.1 -Date: 2024-11-14 +Version: 2.15.2 +Date: 2024-11-15 Authors@R: c( person("Benjamin Leon", "Bodirsky", , "bodirsky@pik-potsdam.de", role = c("aut", "cre")), person("Florian", "Humpenoeder", , "humpenoeder@pik-potsdam.de", role = "aut"), diff --git a/R/reportEmissions.R b/R/reportEmissions.R index f2a7837..fddfb45 100644 --- a/R/reportEmissions.R +++ b/R/reportEmissions.R @@ -229,8 +229,8 @@ reportEmissions <- function(gdx, storageWood = TRUE) { # Regrowth setNames(dimSums(regrowth, dim = 3), "Emissions|CO2|Land|Land-use Change|+|Regrowth (Mt CO2/yr)"), setNames(regrowth[, , "forestry_aff"], "Emissions|CO2|Land|Land-use Change|Regrowth|+|CO2-price AR (Mt CO2/yr)"), - setNames(regrowth_aff[, , "aff_natveg"], "Emissions|CO2|Land|Land-use Change|Regrowth|+|CO2-price AR|Natural Forest (Mt CO2/yr)"), - setNames(regrowth_aff[, , "aff_plant"], "Emissions|CO2|Land|Land-use Change|Regrowth|+|CO2-price AR|Plantation (Mt CO2/yr)"), + setNames(regrowth_aff[, , "aff_natveg"], "Emissions|CO2|Land|Land-use Change|Regrowth|CO2-price AR|+|Natural Forest (Mt CO2/yr)"), + setNames(regrowth_aff[, , "aff_plant"], "Emissions|CO2|Land|Land-use Change|Regrowth|CO2-price AR|+|Plantation (Mt CO2/yr)"), setNames(regrowth[, , "forestry_ndc"], "Emissions|CO2|Land|Land-use Change|Regrowth|+|NPI_NDC AR (Mt CO2/yr)"), setNames(regrowth[, , "forestry_plant"], "Emissions|CO2|Land|Land-use Change|Regrowth|+|Timber Plantations (Mt CO2/yr)"), setNames(regrowth[, , "crop_treecover"], "Emissions|CO2|Land|Land-use Change|Regrowth|+|Cropland Tree Cover (Mt CO2/yr)"), @@ -332,8 +332,8 @@ reportEmissions <- function(gdx, storageWood = TRUE) { # Regrowth setNames(dimSums(regrowth, dim = 3), "Emissions|CO2|Land RAW|Land-use Change|+|Regrowth (Mt CO2/yr)"), setNames(regrowth[, , "forestry_aff"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|CO2-price AR (Mt CO2/yr)"), - setNames(regrowth_aff[, , "aff_natveg"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|CO2-price AR|Natural Forest (Mt CO2/yr)"), - setNames(regrowth_aff[, , "aff_plant"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|CO2-price AR|Plantation (Mt CO2/yr)"), + setNames(regrowth_aff[, , "aff_natveg"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|CO2-price AR|+|Natural Forest (Mt CO2/yr)"), + setNames(regrowth_aff[, , "aff_plant"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|CO2-price AR|+|Plantation (Mt CO2/yr)"), setNames(regrowth[, , "forestry_ndc"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|NPI_NDC AR (Mt CO2/yr)"), setNames(regrowth[, , "forestry_plant"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|Timber Plantations (Mt CO2/yr)"), setNames(regrowth[, , "crop_treecover"], "Emissions|CO2|Land RAW|Land-use Change|Regrowth|+|Cropland Tree Cover (Mt CO2/yr)"), @@ -434,8 +434,8 @@ reportEmissions <- function(gdx, storageWood = TRUE) { # Regrowth setNames(dimSums(regrowth, dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|+|Regrowth (Gt CO2)"), setNames(regrowth[, , "forestry_aff"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|+|CO2-price AR (Mt CO2/yr)"), - setNames(regrowth_aff[, , "aff_natveg"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|+|CO2-price AR|Natural Forest (Mt CO2/yr)"), - setNames(regrowth_aff[, , "aff_plant"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|+|CO2-price AR|Plantation (Mt CO2/yr)"), + setNames(regrowth_aff[, , "aff_natveg"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|CO2-price AR|+|Natural Forest (Mt CO2/yr)"), + setNames(regrowth_aff[, , "aff_plant"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|CO2-price AR|+|Plantation (Mt CO2/yr)"), setNames(regrowth[, , "forestry_ndc"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|+|NPI_NDC AR (Gt CO2)"), setNames(regrowth[, , "forestry_plant"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|+|Timber Plantations (Gt CO2)"), setNames(regrowth[, , "crop_treecover"], "Emissions|CO2|Land|Cumulative|Land-use Change|Regrowth|+|Cropland Tree Cover (Gt CO2)"), diff --git a/README.md b/README.md index 2ee23d2..da66178 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # MAgPIE outputs R package for MAgPIE version 4.x -R package **magpie4**, version **2.15.1** +R package **magpie4**, version **2.15.2** [![CRAN status](https://www.r-pkg.org/badges/version/magpie4)](https://cran.r-project.org/package=magpie4) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.1158582.svg)](https://doi.org/10.5281/zenodo.1158582) [![R build status](https://github.com/pik-piam/magpie4/workflows/check/badge.svg)](https://github.com/pik-piam/magpie4/actions) [![codecov](https://codecov.io/gh/pik-piam/magpie4/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/magpie4) [![r-universe](https://pik-piam.r-universe.dev/badges/magpie4)](https://pik-piam.r-universe.dev/builds) @@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky , R package version 2.15.1, . +Bodirsky B, Humpenoeder F, Dietrich J, Stevanovic M, Weindl I, Karstens K, Wang X, Mishra A, Beier F, Breier J, Yalew A, Chen D, Biewald A, Wirth S, von Jeetze P, Leip D, Crawford M, Alves M (2024). _magpie4: MAgPIE outputs R package for MAgPIE version 4.x_. doi:10.5281/zenodo.1158582 , R package version 2.15.2, . A BibTeX entry for LaTeX users is @@ -48,7 +48,7 @@ A BibTeX entry for LaTeX users is title = {magpie4: MAgPIE outputs R package for MAgPIE version 4.x}, author = {Benjamin Leon Bodirsky and Florian Humpenoeder and Jan Philipp Dietrich and Miodrag Stevanovic and Isabelle Weindl and Kristine Karstens and Xiaoxi Wang and Abhijeet Mishra and Felicitas Beier and Jannes Breier and Amsalu Woldie Yalew and David Chen and Anne Biewald and Stephen Wirth and Patrick {von Jeetze} and Debbora Leip and Michael Crawford and Marcos Alves}, year = {2024}, - note = {R package version 2.15.1}, + note = {R package version 2.15.2}, url = {https://github.com/pik-piam/magpie4}, doi = {10.5281/zenodo.1158582}, }