From dce563a06231849af65ccaef90a5d5d8b7e23e61 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Thu, 7 May 2026 14:01:58 +0200 Subject: [PATCH 1/3] adjust gdx variable in reportFE --- R/reportFE.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/reportFE.R b/R/reportFE.R index 4185dc23..91e16a15 100644 --- a/R/reportFE.R +++ b/R/reportFE.R @@ -613,9 +613,9 @@ reportFE <- function(gdx, regionSubsetList = NULL, # estimated here assuming the FE-UE efficiency of the basline (from EDGE-B) p36_uedemand_build <- readGDX(gdx, "p36_uedemand_build", react = "silent")[, t, ] if (!is.null(p36_uedemand_build)) { - pm_fedemand <- readGDX(gdx, "pm_fedemand")[, t, ] + pm_fedemandBuild <- readGDX(gdx, "pm_fedemandBuild")[, t, ] feUeEff_build <- p36_uedemand_build[,, names(carrierBuild)] / - pm_fedemand[,, names(carrierBuild)] + pm_fedemandBuild[,, names(carrierBuild)] feUeEff_build[is.na(feUeEff_build) | is.infinite(feUeEff_build)] <- 1 # assume efficiency for all gases also for H2 feUeEff_build[,, "feh2b"] <- setNames(feUeEff_build[,, "fegab"], "feh2b") From 231837af3c5079b3ecd912c99451171bf581f8d3 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Mon, 1 Jun 2026 09:05:50 +0200 Subject: [PATCH 2/3] add backwards compatibility --- R/reportFE.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/reportFE.R b/R/reportFE.R index e701a6eb..6e1c9bed 100644 --- a/R/reportFE.R +++ b/R/reportFE.R @@ -612,7 +612,7 @@ reportFE <- function(gdx, regionSubsetList = NULL, # estimated here assuming the FE-UE efficiency of the basline (from EDGE-B) p36_uedemand_build <- readGDX(gdx, "p36_uedemand_build", react = "silent")[, t, ] if (!is.null(p36_uedemand_build)) { - pm_fedemandBuild <- readGDX(gdx, "pm_fedemandBuild")[, t, ] + pm_fedemandBuild <- readGDX(gdx, name = c("pm_fedemandBuild", "pm_fedemand"))[, t, ] feUeEff_build <- p36_uedemand_build[, , names(carrierBuild)] / pm_fedemandBuild[, , names(carrierBuild)] feUeEff_build[is.na(feUeEff_build) | is.infinite(feUeEff_build)] <- 1 From a3980ee006cdd809d7159a52b81eb0d5e38d6fed Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Mon, 1 Jun 2026 09:22:56 +0200 Subject: [PATCH 3/3] increment version --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index a3b7dfab..1c3deb67 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4367200' +ValidationKey: '4388865' AcceptedWarnings: - .*following variables are expected in the piamInterfaces.* - Summation checks have revealed some gaps.* diff --git a/CITATION.cff b/CITATION.cff index 3fe82dad..46d6022a 100755 --- 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: 2.1.2 -date-released: '2026-05-27' +version: 2.1.3 +date-released: '2026-06-01' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 151b9304..c69b62f5 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 2.1.2 -Date: 2026-05-27 +Version: 2.1.3 +Date: 2026-06-01 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 3008ee9d..835bf6a2 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **2.1.2** +R package **remind2**, version **2.1.3** [![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, Bantje D, Dietrich J, Dirnaichner A, Dorndorf T, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Lécuyer F, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Rüter T, Salzwedel R, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P (2026). "remind2: The REMIND R package (2nd generation)." Version: 2.1.3, . A BibTeX entry for LaTeX users is @@ -57,9 +57,9 @@ A BibTeX entry for LaTeX users is @Misc{, title = {remind2: The REMIND R package (2nd generation)}, author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and David Bantje and Jan Philipp Dietrich and Alois Dirnaichner and Tabea Dorndorf 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 Fabrice Lécuyer 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 Tonn Rüter and Robert Salzwedel 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}, - date = {2026-05-27}, + date = {2026-06-01}, year = {2026}, url = {https://github.com/pik-piam/remind2}, - note = {Version: 2.1.2}, + note = {Version: 2.1.3}, } ```