From d42734c7002be1255849bd5c73d4db49fee0fbd4 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:37:57 +0100 Subject: [PATCH 1/2] bugfix load gdx path --- R/reportEdgeTransport.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/reportEdgeTransport.R b/R/reportEdgeTransport.R index daf4390..a85080e 100644 --- a/R/reportEdgeTransport.R +++ b/R/reportEdgeTransport.R @@ -97,7 +97,7 @@ reportEdgeTransport <- function(folderPath = file.path(".", "EDGE-T"), data = NU if (is.null(data$scenarioName)) data$scenarioName <- paste0(data$transportPolScen, " ", data$SSPscen) if (is.null(data$modelName)) data$modelName <- "EDGE-T" - if (is.null(data$gdxPath)) { + if (is.null(data$gdxPath) & isTransportExtendedReported) { gdxPath <- list.files(path = folderPath, pattern = "\\.gdx$", full.names = TRUE) # Check if any files were found if (length(gdxPath) > 1) { From c508d47c63a5000dec0a52ae90427f75d779c5f2 Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Mon, 4 Nov 2024 15:42:37 +0100 Subject: [PATCH 2/2] buildlib --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- README.md | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 8128f65..2899af0 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '1201560' +ValidationKey: '1221891' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index e0a85ef..8dead3a 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: 'reporttransport: Reporting package for edgeTransport' -version: 0.6.0 -date-released: '2024-10-30' +version: 0.6.1 +date-released: '2024-11-04' abstract: This package contains edgeTransport-specific routines to report model results. The main functionality is to generate transport reporting variables in MIF format from a given edgeTransport model run folder or REMIND input data. diff --git a/DESCRIPTION b/DESCRIPTION index 904708a..578884b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: reporttransport Title: Reporting package for edgeTransport -Version: 0.6.0 -Date: 2024-10-30 +Version: 0.6.1 +Date: 2024-11-04 Authors@R: person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre")) Description: This package contains edgeTransport-specific routines to diff --git a/README.md b/README.md index a3cb277..3eeac3a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Reporting package for edgeTransport -R package **reporttransport**, version **0.6.0** +R package **reporttransport**, version **0.6.1** [![CRAN status](https://www.r-pkg.org/badges/version/reporttransport)](https://cran.r-project.org/package=reporttransport) [![R build status](https://github.com/pik-piam/reporttransport/workflows/check/badge.svg)](https://github.com/pik-piam/reporttransport/actions) [![codecov](https://codecov.io/gh/pik-piam/reporttransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/reporttransport) [![r-universe](https://pik-piam.r-universe.dev/badges/reporttransport)](https://pik-piam.r-universe.dev/builds) @@ -41,7 +41,7 @@ In case of questions / problems please contact Johanna Hoppe . +Hoppe J (2024). _reporttransport: Reporting package for edgeTransport_. R package version 0.6.1, . A BibTeX entry for LaTeX users is @@ -50,7 +50,7 @@ A BibTeX entry for LaTeX users is title = {reporttransport: Reporting package for edgeTransport}, author = {Johanna Hoppe}, year = {2024}, - note = {R package version 0.6.0}, + note = {R package version 0.6.1}, url = {https://github.com/pik-piam/reporttransport}, } ```