Skip to content

Commit

Permalink
bugfix emission reporting sum
Browse files Browse the repository at this point in the history
  • Loading branch information
@flohump
flohump committed Nov 15, 2024
1 parent d0f0e0e commit 4e7c1b2
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '43108191'
ValidationKey: '43130384'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -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", , "[email protected]", role = c("aut", "cre")),
person("Florian", "Humpenoeder", , "[email protected]", role = "aut"),
Expand Down
12 changes: 6 additions & 6 deletions R/reportEmissions.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)"),
Expand Down Expand Up @@ -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)"),
Expand Down Expand Up @@ -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)"),
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -39,7 +39,7 @@ In case of questions / problems please contact Benjamin Leon Bodirsky <bodirsky@

To cite package **magpie4** in publications use:

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 <https://doi.org/10.5281/zenodo.1158582>, R package version 2.15.1, <https://github.com/pik-piam/magpie4>.
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 <https://doi.org/10.5281/zenodo.1158582>, R package version 2.15.2, <https://github.com/pik-piam/magpie4>.

A BibTeX entry for LaTeX users is

Expand All @@ -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},
}
Expand Down

0 comments on commit 4e7c1b2

Please sign in to comment.