From ed4bbb43f2ffe656a5d9daf7052c170cc4cae11a Mon Sep 17 00:00:00 2001 From: johannah-pik <89136160+johannah-pik@users.noreply.github.com> Date: Mon, 9 Oct 2023 16:44:33 +0200 Subject: [PATCH] exclude DEU from IEA harmonization --- .buildlibrary | 2 +- .pre-commit-config.yaml | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 4 ++-- R/IEAharmonization.R | 3 ++- README.md | 6 +++--- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index b22de4aa..3c488fab 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '2158310' +ValidationKey: '2179929' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5d2e4ca9..7a47c414 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: v0.3.2.9019 + rev: v0.3.2.9021 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index 9d174e1f..38f3ffd0 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: 1.1.0 -date-released: '2023-09-21' +version: 1.1.1 +date-released: '2023-10-09' 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 74292902..12cff9c6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 1.1.0 +Version: 1.1.1 Authors@R: c( person("Alois", "Dirnaichner", email = "dirnaichner@pik-potsdam.de", role = c("aut", "cre")), person("Marianna", "Rottoli", email = "rottoli@pik-potsdam.de", role = "aut"), @@ -15,7 +15,7 @@ Encoding: UTF-8 LazyData: true RoxygenNote: 7.2.3 VignetteBuilder: knitr -Date: 2023-09-21 +Date: 2023-10-09 Config/testthat/edition: 3 Imports: rmndt, diff --git a/R/IEAharmonization.R b/R/IEAharmonization.R index a21f4992..5742668f 100644 --- a/R/IEAharmonization.R +++ b/R/IEAharmonization.R @@ -109,8 +109,9 @@ toolIEAharmonization <- function(int, demKm, IEA) { tech_output=tech_output[, c("region","technology","vehicle_type", "factor_intensity")] ## harmonize data + # leave out DEU as it was carefully adjusted by Alois to meet Ariadne data merged_intensity <- tech_output[vehicle_intensity, on=c("region", "technology", "vehicle_type")] - merged_intensity[, EJ_Mpkm_final := EJ_Mpkm * factor_intensity] + merged_intensity[!region == "DEU", EJ_Mpkm_final := EJ_Mpkm * factor_intensity] ## if there is no harmonization data, lets use the existing one merged_intensity[is.na(EJ_Mpkm_final), EJ_Mpkm_final := EJ_Mpkm] diff --git a/README.md b/README.md index 0afa6339..f943ab45 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **1.1.0** +R package **edgeTransport**, version **1.1.1** [![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 Alois Dirnaichner . +Dirnaichner A, Rottoli M, Hoppe J (2023). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 1.1.1, . 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 = {Alois Dirnaichner and Marianna Rottoli and Johanna Hoppe}, year = {2023}, - note = {R package version 1.1.0}, + note = {R package version 1.1.1}, url = {https://github.com/pik-piam/edgeTransport}, } ```