diff --git a/.buildlibrary b/.buildlibrary index 414a053..2a452dc 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '5669056' +ValidationKey: '5689656' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 0a0aa30..429999c 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: 'edgeTransport: Prepare EDGE Transport Data for the REMIND model' -version: 2.8.3 -date-released: '2024-11-05' +version: 2.8.4 +date-released: '2024-11-07' abstract: EDGE-T is a fork of the GCAM transport module https://jgcri.github.io/gcam-doc/energy.html#transportation with a high level of detail in its representation of technological and modal options. It is a partial equilibrium model with a nested multinomial logit structure and diff --git a/DESCRIPTION b/DESCRIPTION index 3b2f133..2bd6ac7 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.8.3 +Version: 2.8.4 Authors@R: c( person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0009-0004-6753-5090")), @@ -19,7 +19,7 @@ Encoding: UTF-8 LazyData: true RoxygenNote: 7.3.2 VignetteBuilder: knitr -Date: 2024-11-05 +Date: 2024-11-07 Config/testthat/edition: 3 Imports: rmndt, diff --git a/R/toolEdgeTransportSA.R b/R/toolEdgeTransportSA.R index 34495a4..034828f 100644 --- a/R/toolEdgeTransportSA.R +++ b/R/toolEdgeTransportSA.R @@ -47,7 +47,7 @@ toolEdgeTransportSA <- function(SSPscen, ######################################################## if (is.null(outputFolder) & isStored) stop("Please provide an outputfolder to store your results") if (is.null(gdxPath)) {gdxPath <- file.path(getConfig("sourcefolder"), - "REMINDinputForTransportStandalone", "v1.0", "fulldata.gdx")} + "REMINDinputForTransportStandalone", "v1.2", "fulldata.gdx")} if (!file.exists(gdxPath)) stop("Please provide valid path to REMIND fulldata.gdx as input for fuel costs") inputs <- toolLoadInputs(SSPscen, transportPolScen, demScen, gdxPath, hybridElecShare) diff --git a/R/toolLoadREMINDfuelCosts.R b/R/toolLoadREMINDfuelCosts.R index 4636961..206e2f8 100644 --- a/R/toolLoadREMINDfuelCosts.R +++ b/R/toolLoadREMINDfuelCosts.R @@ -11,7 +11,7 @@ #' @importFrom gdx readGDX #' @importFrom magclass lowpass #' @importFrom magrittr `%>%` -#' @export +#' @export toolLoadREMINDfuelCosts <- function(gdxPath, hybridElecShare, helpers){ value <- unit <- variable <- `Hybrid electric` <- fuel <- NULL @@ -24,13 +24,6 @@ toolLoadREMINDfuelCosts <- function(gdxPath, hybridElecShare, helpers){ # load prices from REMIND gdx fuelCosts <- readGDX(gdxPath, "pm_FEPrice", format = "first_found", restore_zeros = FALSE)[,, "trans.ES", pmatch = TRUE] - fuelCosts <- GDPuc::toolConvertGDP( - gdp = fuelCosts, - unit_in = "constant 2005 US$MER", - unit_out = "constant 2017 US$MER", - replace_NAs = "with_USA" - ) - ## smooth prices from REMIND gdx (over years) and convert to data.table fuelCosts <- fuelCosts %>% lowpass() %>% magpie2dt() setnames(fuelCosts, c("all_regi", "ttot"), c("region", "period")) diff --git a/README.md b/README.md index 1174f4f..c7677a7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.8.3** +R package **edgeTransport**, version **2.8.4** [![CRAN status](https://www.r-pkg.org/badges/version/edgeTransport)](https://cran.r-project.org/package=edgeTransport) [![R build status](https://github.com/pik-piam/edgeTransport/workflows/check/badge.svg)](https://github.com/pik-piam/edgeTransport/actions) [![codecov](https://codecov.io/gh/pik-piam/edgeTransport/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/edgeTransport) [![r-universe](https://pik-piam.r-universe.dev/badges/edgeTransport)](https://pik-piam.r-universe.dev/builds) @@ -46,7 +46,7 @@ In case of questions / problems please contact Johanna Hoppe . +Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.8.4, . A BibTeX entry for LaTeX users is @@ -55,7 +55,7 @@ A BibTeX entry for LaTeX users is title = {edgeTransport: Prepare EDGE Transport Data for the REMIND model}, author = {Johanna Hoppe and Alois Dirnaichner and Marianna Rottoli and Jarusch Muessel}, year = {2024}, - note = {R package version 2.8.3}, + note = {R package version 2.8.4}, url = {https://github.com/pik-piam/edgeTransport}, } ```