From a125a0446692b6cd4bf3dd0eae4a9c578037e606 Mon Sep 17 00:00:00 2001 From: orichters Date: Wed, 19 Jul 2023 15:56:38 +0200 Subject: [PATCH] don't fail color/compareScenConf if config contains outdated switches --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/colorScenConf.R | 2 +- R/compareScenConf.R | 4 ++-- README.md | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index f8a80ce8..1ac11b03 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '217608336' +ValidationKey: '217728081' 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 25451766..c40db85e 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.113.2 -date-released: '2023-07-10' +version: 1.113.3 +date-released: '2023-07-19' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index b02ef999..f292b3ac 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.113.2 -Date: 2023-07-10 +Version: 1.113.3 +Date: 2023-07-19 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 340cc055..a5eab012 100644 --- a/R/colorScenConf.R +++ b/R/colorScenConf.R @@ -58,7 +58,7 @@ colorScenConf <- function(fileList = "", remindPath = ".", expanddata = FALSE) { for (csvFile in fileList) { xlsxFile <- sub(".csv", "_colorful.xlsx", csvFile, fixed = TRUE) cat(paste0("\nStart converting '", csvFile, "' to '..._colorful.xlsx'.\n")) - settings <- readCheckScenarioConfig(csvFile, remindPath = remindPath, fillWithDefault = TRUE) + settings <- readCheckScenarioConfig(csvFile, remindPath = remindPath, fillWithDefault = TRUE, testmode = TRUE) settings <- rbind(rep("unknown", length(names(settings))), settings) for (switchname in intersect(names(cfg$gms), names(settings))) { settings[1, switchname] <- cfg$gms[[switchname]] diff --git a/R/compareScenConf.R b/R/compareScenConf.R index 4764c364..09d0ade3 100644 --- a/R/compareScenConf.R +++ b/R/compareScenConf.R @@ -75,8 +75,8 @@ compareScenConf <- function(fileList = NULL, remindPath = "/p/projects/rd3mod/gi # overwrite readCheckScenarioConfig source(file.path(remindPath, "scripts", "start", "readCheckScenarioConfig.R"), local = TRUE) } - settings1 <- readCheckScenarioConfig(fileList[[1]], remindPath = remindPath, fillWithDefault = TRUE) - settings2 <- readCheckScenarioConfig(fileList[[2]], remindPath = remindPath, fillWithDefault = TRUE) + settings1 <- readCheckScenarioConfig(fileList[[1]], remindPath = remindPath, fillWithDefault = TRUE, testmode = TRUE) + settings2 <- readCheckScenarioConfig(fileList[[2]], remindPath = remindPath, fillWithDefault = TRUE, testmode = TRUE) # for mapping files if (is.null(row.names)) { diff --git a/README.md b/README.md index 84c07ae4..728e2620 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.113.2** +R package **remind2**, version **1.113.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, 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 (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.113.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 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}, year = {2023}, - note = {R package version 1.113.2}, + note = {R package version 1.113.3}, url = {https://github.com/pik-piam/remind2}, } ```