From d6318ae2cbd4e56eade97fa29ae63809418a0f24 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Tue, 5 Sep 2023 12:33:16 +0200 Subject: [PATCH 1/2] fix missing Emi|CO2|pre-CCS|Industrial Processes|Cement unit close #448 --- R/reportEmi.R | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/R/reportEmi.R b/R/reportEmi.R index 04d61b11..26374adb 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -711,7 +711,8 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, t = c(seq(200 `[`(,,'co2cement_process.cement') %>% `*`(as.numeric(GtC_2_MtCO2)) %>% `getSets<-`(fulldim = FALSE, value = getSets(out)) %>% - `getNames<-`(value = 'Emi|CO2|pre-CCS|Industrial Processes|Cement'), + `getNames<-`( + value = 'Emi|CO2|pre-CCS|Industrial Processes|Cement (Mt CO2/yr)'), out) } else { From 776801cbc32a7dac623522a1556e17082fe0cff4 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Tue, 5 Sep 2023 12:54:04 +0200 Subject: [PATCH 2/2] lucode hubbub --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 057b28ff..2031abb1 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '218747160' +ValidationKey: '218811405' 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 dcef3e3d..68886a8c 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.116.0 -date-released: '2023-09-01' +version: 1.116.1 +date-released: '2023-09-05' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index af6c9f2b..f44ef961 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.116.0 -Date: 2023-09-01 +Version: 1.116.1 +Date: 2023-09-05 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/README.md b/README.md index f60fb841..39d63ab9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.116.0** +R package **remind2**, version **1.116.1** [![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.1, . 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.116.0}, + note = {R package version 1.116.1}, url = {https://github.com/pik-piam/remind2}, } ```