diff --git a/.buildlibrary b/.buildlibrary index 3506974a..a2714e09 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '232382800' +ValidationKey: '232507242' AcceptedWarnings: - .*following variables are expected in the piamInterfaces.* - Summation checks have revealed some gaps.* diff --git a/CITATION.cff b/CITATION.cff index 3ef0a951..f8090c7c 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.160.0 -date-released: '2024-11-06' +version: 1.160.1 +date-released: '2024-11-15' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 3ea0774b..be60c2d6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.160.0 -Date: 2024-11-06 +Version: 1.160.1 +Date: 2024-11-15 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 b859cf84..cfac7fef 100644 --- a/R/reportEmi.R +++ b/R/reportEmi.R @@ -150,7 +150,7 @@ reportEmi <- function(gdx, output = NULL, regionSubsetList = NULL, ### Carbon management variables # total captured CO2 - vm_co2capture <- readGDX(gdx, "vm_co2capture", field = "l", restore_zeros = F)[, t, ] + vm_co2capture <- readGDX(gdx, c("vm_co2capture","v_co2capture"), field = "l", restore_zeros = F)[, t, ] vm_emiCdr_co2 <- readGDX(gdx, "vm_emiCdr", field = "l", restore_zeros = F)[, t, "co2"] vm_emiCdrTeDetail <- readGDX(gdx, c("vm_emiCdrTeDetail","v33_emi"), field = "l", restore_zeros = F, react = "silent")[, t, ] diff --git a/R/reportLCOE.R b/R/reportLCOE.R index e4fcad90..45b89230 100644 --- a/R/reportLCOE.R +++ b/R/reportLCOE.R @@ -51,7 +51,7 @@ reportLCOE <- function(gdx, output.type = "both") { vm_capFac <- readGDX(gdx, "vm_capFac", field = "l", restore_zeros = FALSE) qm_balcapture <- readGDX(gdx, "q_balcapture", field = "m", restore_zeros = FALSE) vm_co2CCS <- readGDX(gdx, "vm_co2CCS", field = "l", restore_zeros = FALSE) - vm_co2capture <- readGDX(gdx, "vm_co2capture", field = "l", restore_zeros = FALSE) + vm_co2capture <- readGDX(gdx, c("vm_co2capture","v_co2capture"), field = "l", restore_zeros = FALSE) pm_emifac <- readGDX(gdx, "pm_emiFac", field = "l", restore_zeros = FALSE) v32_storloss <- readGDX(gdx, "v32_storloss", field = "l") @@ -1215,7 +1215,7 @@ reportLCOE <- function(gdx, output.type = "both") { ### 13. calculate share stored carbon from capture carbon vm_co2CCS <- readGDX(gdx, "vm_co2CCS", field = "l", restore_zeros = FALSE) - vm_co2capture <- readGDX(gdx, "vm_co2capture", field = "l", restore_zeros = FALSE) + vm_co2capture <- readGDX(gdx, c("vm_co2capture","v_co2capture"), field = "l", restore_zeros = FALSE) if (getSets(vm_co2capture)[[3]] == "emiAll") { sel_vm_co2capture_cco2 <- mselect(vm_co2capture, emiAll = "cco2") @@ -1294,7 +1294,7 @@ reportLCOE <- function(gdx, output.type = "both") { # for now take the storage share of the construction year of plant, it will not change much over time # (if CCS, then no CCU and v_capturevalve is mostly small) vm_co2CCS <- readGDX(gdx, "vm_co2CCS", field = "l", restore_zeros = FALSE) - vm_co2capture <- readGDX(gdx, "vm_co2capture", field = "l", restore_zeros = FALSE) + vm_co2capture <- readGDX(gdx, c("vm_co2capture","v_co2capture"), field = "l", restore_zeros = FALSE) # calculate stored CO2 per output of capture technology (GtC/TWa) diff --git a/README.md b/README.md index f1e85368..247be3e3 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.160.0** +R package **remind2**, version **1.160.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, 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.160.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 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.160.0}, + note = {R package version 1.160.1}, url = {https://github.com/pik-piam/remind2}, } ```