From 78966126dd53640e9059f6e70dfd17c154f64a24 Mon Sep 17 00:00:00 2001 From: tabeado Date: Mon, 16 Sep 2024 09:43:25 +0200 Subject: [PATCH 1/2] fix bug when reporting an NPi --- R/reportEmi.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/reportEmi.R b/R/reportEmi.R index 137046a5..6b2cc88a 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -196,7 +196,7 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, v_co2capturevalve <- readGDX(gdx, "v_co2capturevalve", field = "l", restore_zeros = F)[, t, ] # maximum annual CO2 storage potential assumed - max_geolStorage <- readGDX(gdx, "vm_co2CCS", field = "up", restore_zeros = F)[, t, ] # CO2 captured per industry subsector + max_geolStorage <- readGDX(gdx, "vm_co2CCS", field = "up", restore_zeros = F)[, t, "ccsinje.1"] # CO2 captured per industry subsector # CO2 captured per industry subsector # NOTE: The parameter pm_IndstCO2Captured was calculated without taking into From 4be4659c8ed8049129659c3948b21c818dbb9161 Mon Sep 17 00:00:00 2001 From: tabeado Date: Mon, 16 Sep 2024 13:59:23 +0200 Subject: [PATCH 2/2] build library --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index a693933b..e312e039 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '230562992' +ValidationKey: '230652226' 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 e3192fb6..1fe727e0 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.154.2 -date-released: '2024-09-10' +version: 1.154.3 +date-released: '2024-09-16' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 9ecfb7de..32c362bc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.154.2 -Date: 2024-09-10 +Version: 1.154.3 +Date: 2024-09-16 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 c1ea49bb..2dbd8ba6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.154.2** +R package **remind2**, version **1.154.3** [![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, Duerrwaechter J, 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, Weigmann P, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.154.3, . 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 Jakob Duerrwaechter 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 and Pascal Weigmann and Tonn Rüter}, year = {2024}, - note = {R package version 1.154.2}, + note = {R package version 1.154.3}, url = {https://github.com/pik-piam/remind2}, } ```