From 0e01164c786f063fca9d64511786d0a177774424 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Wed, 26 Jun 2024 14:50:52 +0200 Subject: [PATCH 1/2] adjust to deprecated read.gdx(factors = ) --- R/calc_CES_marginals.R | 11 +++++------ R/get_total_efficiencies.R | 4 ++-- R/reportDIETER.R | 8 ++++---- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/R/calc_CES_marginals.R b/R/calc_CES_marginals.R index dcba045c..c2ccc234 100644 --- a/R/calc_CES_marginals.R +++ b/R/calc_CES_marginals.R @@ -36,16 +36,16 @@ calc_CES_marginals <- function(gdxName, id = 'file') { .calc_CES_marginals <- function(gdxName, id) { # ---- read required items from gdx ---- - pm_cesdata <- read.gdx(gdxName, 'pm_cesdata', factors = FALSE, + pm_cesdata <- read.gdx(gdxName, 'pm_cesdata', colNames = c('t', 'regi', 'pf', 'param', 'value')) - vm_effGr <- read.gdx(gdxName, 'vm_effGr', factors = FALSE, + vm_effGr <- read.gdx(gdxName, 'vm_effGr', colNames = c('t', 'regi', 'pf', 'effGr')) - vm_cesIO <- read.gdx(gdxName, 'vm_cesIO', factors = FALSE, + vm_cesIO <- read.gdx(gdxName, 'vm_cesIO', colNames = c('t', 'regi', 'pf', 'value')) - cesOut2cesIn <- read.gdx(gdxName, 'cesOut2cesIn', factors = FALSE, + cesOut2cesIn <- read.gdx(gdxName, 'cesOut2cesIn', colNames = c('pf.out', 'pf.in')) # ---- calculate marginals ---- @@ -138,8 +138,7 @@ calc_CES_marginals <- function(gdxName, id = 'file') { if (id) { r <- r %>% mutate(!!sym('scenario') := read.gdx(gdxName, 'c_expname', - colNames = 'c_expname', - factors = FALSE) %>% + colNames = 'c_expname') %>% pull('c_expname')) } diff --git a/R/get_total_efficiencies.R b/R/get_total_efficiencies.R index 73618ce6..6de71350 100644 --- a/R/get_total_efficiencies.R +++ b/R/get_total_efficiencies.R @@ -16,10 +16,10 @@ #' @export get_total_efficiencies <- function(gdxName) { - pm_cesdata <- read.gdx(gdxName, 'pm_cesdata', factors = FALSE, + pm_cesdata <- read.gdx(gdxName, 'pm_cesdata', colNames = c('t', 'regi', 'pf', 'param', 'value')) - pf_mapping <- read.gdx(gdxName, 'cesOut2cesIn', factors = FALSE, + pf_mapping <- read.gdx(gdxName, 'cesOut2cesIn', colNames = c('pf.out', 'pf.in')) full_join( diff --git a/R/reportDIETER.R b/R/reportDIETER.R index 9ba40571..70846a13 100644 --- a/R/reportDIETER.R +++ b/R/reportDIETER.R @@ -28,7 +28,7 @@ reportDIETER <- function(dieterDatafile = "report_DIETER.gdx", outputDir = ".") gdxToQuitteHourly <- function(gdxfile) { file <- datapath(fname = gdxfile) outHourly <- NULL - repHrs <- read.gdx(gdxName = file, requestList.name = "report_hours", factors = FALSE, squeeze = FALSE) + repHrs <- read.gdx(gdxName = file, requestList.name = "report_hours", squeeze = FALSE) names(repHrs) <- c("gdxfile", "model", "year", "country", "variable", "hour", "value") @@ -49,7 +49,7 @@ reportDIETER <- function(dieterDatafile = "report_DIETER.gdx", outputDir = ".") .data$Year, .data$Period, .data$Tech, .data$Value, .data$Hour) ################################################################### - repTechHrs <- read.gdx(gdxName = file, requestList.name = "report_tech_hours", factors = FALSE, squeeze = FALSE) + repTechHrs <- read.gdx(gdxName = file, requestList.name = "report_tech_hours", squeeze = FALSE) names(repTechHrs) <- c("gdxfile", "model", "year", "country", "variable", "tech", "hour", "value") @@ -96,7 +96,7 @@ reportDIETER <- function(dieterDatafile = "report_DIETER.gdx", outputDir = ".") file1 <- datapath(fname = gdxfile) outAnnual <- NULL ############################################################################################### - reportAnnual <- read.gdx(gdxName = file1, requestList.name = "report", factors = FALSE, squeeze = FALSE) + reportAnnual <- read.gdx(gdxName = file1, requestList.name = "report", squeeze = FALSE) names(reportAnnual) <- c("gdxfile", "model", "year", "country", "variable", "value") out <- reportAnnual %>% @@ -110,7 +110,7 @@ reportDIETER <- function(dieterDatafile = "report_DIETER.gdx", outputDir = ".") .data$Year, .data$Period, .data$Tech, .data$Value) ################################################################# - repTech <- read.gdx(gdxName = file1, requestList.name = "report_tech", factors = FALSE, squeeze = FALSE) + repTech <- read.gdx(gdxName = file1, requestList.name = "report_tech", squeeze = FALSE) names(repTech) <- c("gdxfile", "model", "year", "country", "variable", "tech", "value") From aa1239bb7fa43e79adbde0988c770b3447cd7f0a Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Tue, 2 Jul 2024 12:26:59 +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 e776d206..2bbc3dcf 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '228011775' +ValidationKey: '228122760' 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 430d5077..1bd806e8 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.145.5 -date-released: '2024-07-01' +version: 1.146.0 +date-released: '2024-07-02' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 41db1900..efbb8d21 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.145.5 -Date: 2024-07-01 +Version: 1.146.0 +Date: 2024-07-02 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 bc7f9e57..ea1c942a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.145.5** +R package **remind2**, version **1.146.0** [![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.146.0, . 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.145.5}, + note = {R package version 1.146.0}, url = {https://github.com/pik-piam/remind2}, } ```