diff --git a/.buildlibrary b/.buildlibrary index a7f36750..057b28ff 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '218545744' +ValidationKey: '218747160' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 691f62d3..dcef3e3d 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: 'remind2: The REMIND R package (2nd generation)' -version: 1.115.2 -date-released: '2023-08-28' +version: 1.116.0 +date-released: '2023-09-01' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index fceff2df..af6c9f2b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.115.2 -Date: 2023-08-28 +Version: 1.116.0 +Date: 2023-09-01 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/R/reportEmi.R b/R/reportEmi.R index 6a0627b7..04d61b11 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -262,8 +262,7 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, t = c(seq(200 as.magpie(spatial = 2, temporal = 1, data = ncol(.)) %>% ifelse(is.finite(.), ., 0) # replace NaN by 0 - rm(vm_emiIndCCS_tibble, subsector_emissions, subsector_total_emissions, - pm_emifac_tibble) + rm(vm_emiIndCCS_tibble, subsector_total_emissions, pm_emifac_tibble) # utility functions ---- # Convert a mixer table into a list that can be passed to mselect() to @@ -672,6 +671,49 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, t = c(seq(200 x[['variable']]) }) %>% mbind()) + + # Baseline emission before CCS, corresponds to energy carbon content + out <- mbind( + # energy emissions + subsector_emissions %>% + mutate( + secInd37 = case_when( + 'cement' == .data$secInd37 ~ 'Cement', + 'chemicals' == .data$secInd37 ~ 'Chemicals', + 'steel' == .data$secInd37 ~ 'Steel', + 'otherInd' == .data$secInd37 ~ 'Other Industry', + TRUE ~ NA_character_), + fety = case_when( + 'fesos' == .data$fety ~ 'Solids', + 'fehos' == .data$fety ~ 'Liquids', + 'fegas' == .data$fety ~ 'Gases', + TRUE ~ NA_character_), + origin = case_when( + grepl('fos$', .data$sety) ~ 'Fossil', + grepl('bio$', .data$sety) ~ 'Biomass', + grepl('syn$', .data$sety) ~ 'Hydrogen', + TRUE ~ NA_character_)) %>% + assert(not_na, everything()) %>% + group_by(.data$t, .data$regi, .data$secInd37, .data$fety, + .data$origin) %>% + summarise(value = sum(.data$subsector_emissions) + * as.numeric(GtC_2_MtCO2), + .groups = 'drop') %>% + mutate(d3 = paste0('Emi|CO2|pre-CCS|Energy|Demand|Industry|', + .data$secInd37, '|', .data$fety, '|', .data$origin, + ' (Mt CO2/yr)')) %>% + select('t', 'regi', 'd3', 'value') %>% + as.magpie(spatial = 2, temporal = 1, datacol = ncol(.)) %>% + `getSets<-`(fulldim = FALSE, value = getSets(out)), + + # process emissions + readGDX(gdx, 'vm_macBaseInd', field = 'l', restore_zeros = FALSE) %>% + `[`(,,'co2cement_process.cement') %>% + `*`(as.numeric(GtC_2_MtCO2)) %>% + `getSets<-`(fulldim = FALSE, value = getSets(out)) %>% + `getNames<-`(value = 'Emi|CO2|pre-CCS|Industrial Processes|Cement'), + + out) } else { # if o37_demFeIndSub not existing in GDX, calculate reporting parameter here, note: works for industry fixed_shares only diff --git a/README.md b/README.md index 6eed16a0..f60fb841 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.115.2** +R package **remind2**, version **1.116.0** [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2) [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds) @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.116.0, . A BibTeX entry for LaTeX users is @@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort}, year = {2023}, - note = {R package version 1.115.2}, + note = {R package version 1.116.0}, url = {https://github.com/pik-piam/remind2}, } ```