diff --git a/.buildlibrary b/.buildlibrary index b3baa4d2..f8a80ce8 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '217533133' +ValidationKey: '217608336' 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 4a8f01e9..25451766 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.113.1 -date-released: '2023-07-05' +version: 1.113.2 +date-released: '2023-07-10' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 24374810..b02ef999 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.113.1 -Date: 2023-07-05 +Version: 1.113.2 +Date: 2023-07-10 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 24aaaa07..1858b1c7 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -2289,6 +2289,7 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, t = c(seq(200 "Emi|CO2|Energy|+|Demand (Mt CO2/yr)", "Emi|CO2|Energy|Demand|+|Transport (Mt CO2/yr)", "Emi|CO2|++|Outside ETS and ESR (Mt CO2/yr)", + "Emi|CO2|w/o Land-Use Change (Mt CO2/yr)", # Gross CO2 Emissions "Emi|CO2|Gross (Mt CO2/yr)", @@ -2330,6 +2331,18 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, t = c(seq(200 emi.vars.wBunkers <- c(emi.vars.wBunkers, "Emi|GHG|LULUCF national accounting (Mt CO2eq/yr)", "Emi|CO2|LULUCF national accounting (Mt CO2/yr)" ) + + # add bunker correction for emissions variables with LULUCF national accounting and w/o non-energy use + if ("FE|Non-energy Use|Industry (EJ/yr)" %in% getNames(output) && + "FE|Non-energy Use|Industry|+|Liquids (EJ/yr)" %in% getNames(output) && + "FE|Non-energy Use|Industry|+|Gases (EJ/yr)" %in% getNames(output) && + "FE|Non-energy Use|Industry|+|Solids (EJ/yr)" %in% getNames(output)) { + + emi.vars.wBunkers <- c(emi.vars.wBunkers, + "Emi|GHG|w/o Non-energy Use|LULUCF national accounting (Mt CO2eq/yr)", + "Emi|CO2|w/o Non-energy Use|LULUCF national accounting (Mt CO2/yr)" ) + + } } # variable names for emission variables with bunkers, insert w/ Bunkers diff --git a/README.md b/README.md index 5a330831..84c07ae4 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.113.1** +R package **remind2**, version **1.113.2** [![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.113.2, . 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.113.1}, + note = {R package version 1.113.2}, url = {https://github.com/pik-piam/remind2}, } ```