From 3dcf706aca64d94f80308bc82ecea8afb08e78e6 Mon Sep 17 00:00:00 2001 From: Falk Benke Date: Fri, 21 Jun 2024 11:23:58 +0200 Subject: [PATCH] bring back more strict range check in convGDX2MIF --- .buildlibrary | 3 +-- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/convGDX2MIF.R | 2 +- README.md | 6 +++--- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index b64d718a..6160cfe9 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '227587360' +ValidationKey: '227618695' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' @@ -6,7 +6,6 @@ AcceptedWarnings: - .*following variables are expected in the piamInterfaces.* - Summation checks have revealed some gaps.* - .*to check if summation groups add up.* -- .* Negative numbers in weight. Dangerous, was it really intended?.* AcceptedNotes: - All declared Imports should be used. - Imports includes .* non-default packages. diff --git a/CITATION.cff b/CITATION.cff index c4e07d4a..0e9ca10b 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.144.0 -date-released: '2024-06-20' +version: 1.144.1 +date-released: '2024-06-21' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 4717e70f..22ab71b1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.144.0 -Date: 2024-06-20 +Version: 1.144.1 +Date: 2024-06-21 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/R/convGDX2MIF.R b/R/convGDX2MIF.R index cbfa0aa1..c043c245 100644 --- a/R/convGDX2MIF.R +++ b/R/convGDX2MIF.R @@ -176,7 +176,7 @@ convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default", "^Emi\\|CO2\\|Energy\\|Demand\\|Industry\\|.*Fossil \\(Mt CO2/yr\\)$", low = 0), list("Share.*\\((%|Percent)\\)$", low = 0, up = 100)), - reaction = 'warning') + reaction = 'stop') # write or return output ---- if (!is.null(file)) { diff --git a/README.md b/README.md index 847ff729..4c38ba8c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.144.0** +R package **remind2**, version **1.144.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.144.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.144.0}, + note = {R package version 1.144.1}, url = {https://github.com/pik-piam/remind2}, } ```