Skip to content

Commit

Permalink
bugfix reportEmissions
Browse files Browse the repository at this point in the history
  • Loading branch information
@flohump
flohump committed Jun 27, 2024
1 parent 7777c96 commit 0431f6c
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 31 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: '5134458'
ValidationKey: '5154359'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: 'magpie4: MAgPIE outputs R package for MAgPIE version 4.x'
version: 2.5.8
version: 2.5.9
date-released: '2024-06-27'
abstract: Common output routines for extracting results from the MAgPIE framework
(versions 4.x).
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: magpie4
Title: MAgPIE outputs R package for MAgPIE version 4.x
Version: 2.5.8
Version: 2.5.9
Date: 2024-06-27
Authors@R: c(
person("Benjamin Leon", "Bodirsky", , "[email protected]", role = c("aut", "cre")),
Expand Down
50 changes: 25 additions & 25 deletions R/reportEmissions.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,10 @@ reportEmissions <- function(gdx, storageWood = TRUE) {
setNames(peatland, "Emissions|CO2|Land|Cumulative|Land-use Change|+|Peatland (Gt CO2)"),

# SOM
setNames(dimSums(som, dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|+|SOM (Mt CO2/yr)"),
setNames(dimSums(som, dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|+|SOM (Gt CO2)"),

# residual
setNames(dimSums(residual, dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|+|Residual (Mt CO2/yr)"),
setNames(dimSums(residual, dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|+|Residual (Gt CO2)"),

# Carbon pools
setNames(totalPools, paste0("Emissions|CO2|Land|Cumulative|++|", getNames(totalPools), " (Gt CO2)")),
Expand All @@ -345,37 +345,37 @@ reportEmissions <- function(gdx, storageWood = TRUE) {
))

# Only attempt to append wood-related reports if the forestry module was activated
if (!is.null(cumulativeCO2$wood)) {
if (!is.null(cumulativeCO2$harvest)) {

emissionsReport <- with(cumulativeCO2, mbind(
emissionsReport,

setNames(dimSums(harvest, dim = 3) + storage, "Emissions|CO2|Land|Cumulative|Land-use Change|+|Timber (Mt CO2/yr)"),
setNames(dimSums(harvest, dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|+|Wood Harvest (Mt CO2/yr)"),
setNames(harvest[, , "forestry_plant"], "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Timber Plantations (Mt CO2/yr)"),
setNames(harvest[, , "primforest"], "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Primary Forest (Mt CO2/yr)"),
setNames(harvest[, , "secdforest"], "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Secondary Forest (Mt CO2/yr)"),
setNames(dimSums(harvest[, , otherSet], dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Other Land (Mt CO2/yr)"),
setNames(storage, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|+|Storage (Mt CO2/yr)"), # carbon stored in wood products + release from wood products
setNames(emisWoodNet, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|+|Industrial roundwood (Mt CO2/yr)"), # carbon stored in Industrial roundwood + release from Industrial roundwood
setNames(emisWoodInflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Industrial roundwood|Inflow (Mt CO2/yr)"), # carbon stored in Industrial roundwood
setNames(emisWoodOutflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Industrial roundwood|Outflow (Mt CO2/yr)"), # slow release from Industrial roundwood
setNames(emisBuildingNet, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|+|Buildings (Mt CO2/yr)"), # carbon stored in wood buildings + release from wood buildings
setNames(emisBuildingInflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Buildings|Inflow (Mt CO2/yr)"), # carbon stored in wood buildings
setNames(emisBuildingOutflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Buildings|Outflow (Mt CO2/yr)") # slow release from wood buildings
setNames(dimSums(harvest, dim = 3) + storage, "Emissions|CO2|Land|Cumulative|Land-use Change|+|Timber (Gt CO2)"),
setNames(dimSums(harvest, dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|+|Wood Harvest (Gt CO2)"),
setNames(harvest[, , "forestry_plant"], "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Timber Plantations (Gt CO2)"),
setNames(harvest[, , "primforest"], "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Primary Forest (Gt CO2)"),
setNames(harvest[, , "secdforest"], "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Secondary Forest (Gt CO2)"),
setNames(dimSums(harvest[, , otherSet], dim = 3), "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Wood Harvest|+|Other Land (Gt CO2)"),
setNames(storage, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|+|Storage (Gt CO2)"), # carbon stored in wood products + release from wood products
setNames(emisWoodNet, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|+|Industrial roundwood (Gt CO2)"), # carbon stored in Industrial roundwood + release from Industrial roundwood
setNames(emisWoodInflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Industrial roundwood|Inflow (Gt CO2)"), # carbon stored in Industrial roundwood
setNames(emisWoodOutflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Industrial roundwood|Outflow (Gt CO2)"), # slow release from Industrial roundwood
setNames(emisBuildingNet, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|+|Buildings (Gt CO2)"), # carbon stored in wood buildings + release from wood buildings
setNames(emisBuildingInflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Buildings|Inflow (Gt CO2)"), # carbon stored in wood buildings
setNames(emisBuildingOutflow, "Emissions|CO2|Land|Cumulative|Land-use Change|Timber|Storage|Buildings|Outflow (Gt CO2)") # slow release from wood buildings
))

}

checkEmis <- emissionsReport[, , "Emissions|CO2|Land|Cumulative|+|Land-use Change (Mt CO2/yr)"] -
dimSums(emissionsReport[, , c("Emissions|CO2|Land|Cumulative|Land-use Change|+|Deforestation (Mt CO2/yr)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Forest degradation (Mt CO2/yr)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Other land conversion (Mt CO2/yr)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Regrowth (Mt CO2/yr)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Peatland (Mt CO2/yr)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|SOM (Mt CO2/yr)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Residual (Mt CO2/yr)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Timber (Mt CO2/yr)")], dim = 3)
checkEmis <- emissionsReport[, , "Emissions|CO2|Land|Cumulative|+|Land-use Change (Gt CO2)"] -
dimSums(emissionsReport[, , c("Emissions|CO2|Land|Cumulative|Land-use Change|+|Deforestation (Gt CO2)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Forest degradation (Gt CO2)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Other land conversion (Gt CO2)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Regrowth (Gt CO2)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Peatland (Gt CO2)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|SOM (Gt CO2)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Residual (Gt CO2)",
"Emissions|CO2|Land|Cumulative|Land-use Change|+|Timber (Gt CO2)")], dim = 3)

if (any(abs(checkEmis) > 1e-03, na.rm = TRUE)) {
warning("CO2 emission sub-categories do not add up to total")
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.5.8**
R package **magpie4**, version **2.5.9**

[![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.5.8, <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.5.9, <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.5.8},
note = {R package version 2.5.9},
url = {https://github.com/pik-piam/magpie4},
doi = {10.5281/zenodo.1158582},
}
Expand Down

0 comments on commit 0431f6c

Please sign in to comment.