From 9294b7d3af376c2bc04aa692cb09a6cfa36d1d7b Mon Sep 17 00:00:00 2001 From: orichters Date: Thu, 7 Dec 2023 10:15:07 +0100 Subject: [PATCH] let colorScenConf + compareScenConf read all R start functions from remindmodel --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/colorScenConf.R | 6 +++--- R/compareScenConf.R | 7 +++---- README.md | 6 +++--- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 0bb8be4c..3c2b1f1c 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '221580000' +ValidationKey: '221622198' 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 ac08dfad..1cb22e02 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.125.0 -date-released: '2023-12-05' +version: 1.125.1 +date-released: '2023-12-07' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 317af18c..e6484e41 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.125.0 -Date: 2023-12-05 +Version: 1.125.1 +Date: 2023-12-07 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/R/colorScenConf.R b/R/colorScenConf.R index a5eab012..f6f59a0f 100644 --- a/R/colorScenConf.R +++ b/R/colorScenConf.R @@ -28,9 +28,9 @@ colorScenConf <- function(fileList = "", remindPath = ".", expanddata = FALSE) { comment.char = "", na.strings = "", dec = ".")) } if (expanddata) { - source(file.path(remindPath, "scripts", "start", "path_gdx_list.R"), local = TRUE) - # overwrite readCheckScenarioConfig - source(file.path(remindPath, "scripts", "start", "readCheckScenarioConfig.R"), local = TRUE) + message("Loading R helper functions from remindmodel.") # overwrite readCheckScenarioConfig + remindRscripts <- list.files(file.path(remindPath, "scripts", "start"), pattern = "\\.R$", full.names = TRUE) + invisible(sapply(remindRscripts, source, local = TRUE)) } # enable script to match default data not in gms try(cfg$gms[["output"]] <- paste0(cfg$output, collapse = ",")) diff --git a/R/compareScenConf.R b/R/compareScenConf.R index 09d0ade3..102c7f74 100644 --- a/R/compareScenConf.R +++ b/R/compareScenConf.R @@ -70,10 +70,9 @@ compareScenConf <- function(fileList = NULL, remindPath = "/p/projects/rd3mod/gi comment.char = "#", na.strings = "", dec = ".")) } if (expanddata) { - message("Loading path_gdx_list and readCheckScenarioConfig") - source(file.path(remindPath, "scripts", "start", "path_gdx_list.R"), local = TRUE) - # overwrite readCheckScenarioConfig - source(file.path(remindPath, "scripts", "start", "readCheckScenarioConfig.R"), local = TRUE) + message("Loading R helper functions from remindmodel.") # overwrite readCheckScenarioConfig + remindRscripts <- list.files(file.path(remindPath, "scripts", "start"), pattern = "\\.R$", full.names = TRUE) + invisible(sapply(remindRscripts, source, local = TRUE)) } settings1 <- readCheckScenarioConfig(fileList[[1]], remindPath = remindPath, fillWithDefault = TRUE, testmode = TRUE) settings2 <- readCheckScenarioConfig(fileList[[2]], remindPath = remindPath, fillWithDefault = TRUE, testmode = TRUE) diff --git a/README.md b/README.md index 0c550bbe..f9bfc259 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.125.0** +R package **remind2**, version **1.125.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, Weigmann P (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.125.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 and Pascal Weigmann}, year = {2023}, - note = {R package version 1.125.0}, + note = {R package version 1.125.1}, url = {https://github.com/pik-piam/remind2}, } ```