From 5a6889f622577eabec894106b65ee40bc2a0898f Mon Sep 17 00:00:00 2001 From: David Klein Date: Mon, 19 Feb 2024 15:11:34 +0100 Subject: [PATCH] Bugfix condition: set gdx_refpolicycost only if it is NULL --- .buildlibrary | 3 ++- .github/workflows/check.yaml | 5 +++++ CITATION.cff | 2 +- DESCRIPTION | 2 +- R/convGDX2MIF.R | 2 +- README.md | 6 +++--- man/reportEmiAirPol.Rd | 4 ++-- 7 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index a250fe3d..fc4527de 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '224431972' +ValidationKey: '224451744' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' @@ -14,3 +14,4 @@ AcceptedNotes: - Namespace in Imports field not imported from: htmltools AutocreateReadme: yes allowLinterWarnings: yes +enforceVersionUpdate: no diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index 870f216e..46f518a2 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -49,6 +49,11 @@ jobs: shell: Rscript {0} run: lucode2:::validkey(stopIfInvalid = TRUE) + - name: Verify that lucode2::buildLibrary was successful + if: github.event_name == 'pull_request' + shell: Rscript {0} + run: lucode2:::isVersionUpdated() + - name: Checks shell: Rscript {0} run: | diff --git a/CITATION.cff b/CITATION.cff index 53818310..47d43533 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -2,7 +2,7 @@ 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.135.1 +version: 1.135.2 date-released: '2024-02-19' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index f9fac0ee..5598deaa 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.135.1 +Version: 1.135.2 Date: 2024-02-19 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), diff --git a/R/convGDX2MIF.R b/R/convGDX2MIF.R index c1cdc75e..b6b8c14d 100644 --- a/R/convGDX2MIF.R +++ b/R/convGDX2MIF.R @@ -87,7 +87,7 @@ convGDX2MIF <- function(gdx, gdx_ref = NULL, file = NULL, scenario = "default", output <- mbind(output,reportCrossVariables(gdx,output,regionSubsetList,t)[,t,]) # Report policy costs, if possible and sensible - if (!is.null(gdx_refpolicycost)) { + if (is.null(gdx_refpolicycost)) { gdx_refpolicycost <- gdx message("gdx_refpolicycost not defined, report 0 everywhere.") } diff --git a/README.md b/README.md index 1f439d99..48e0cf58 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.135.1** +R package **remind2**, version **1.135.2** [![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 (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.135.2, . 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}, year = {2024}, - note = {R package version 1.135.1}, + note = {R package version 1.135.2}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/man/reportEmiAirPol.Rd b/man/reportEmiAirPol.Rd index 055b68cf..0864bf1b 100644 --- a/man/reportEmiAirPol.Rd +++ b/man/reportEmiAirPol.Rd @@ -2,7 +2,7 @@ % Please edit documentation in R/reportEmiAirPol.R \name{reportEmiAirPol} \alias{reportEmiAirPol} -\title{Read in GDX and calculate air pollution emissions, used in convGDX2MIF.R for +\title{Read in GDX and calculate air pollution emissions, used in convGDX2MIF.R for the reporting} \usage{ reportEmiAirPol( @@ -25,7 +25,7 @@ t=c(seq(2005,2060,5),seq(2070,2110,10),2130,2150)} MAgPIE object - contains the emission variables } \description{ -Read in air pollution emission information from GDX file, information used in +Read in air pollution emission information from GDX file, information used in convGDX2MIF.R for the reporting } \examples{