diff --git a/.buildlibrary b/.buildlibrary index fbb2165..cfe63df 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4592640' +ValidationKey: '4793280' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 546b774..8206c8b 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.3.0 -date-released: '2024-09-02' +version: 2.4.0 +date-released: '2024-09-06' 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 f0e38d5..520695f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.3.0 +Version: 2.4.0 Authors@R: c( person("Johanna", "Hoppe", , "johanna.hoppe@pik-potsdam.de", role = c("aut", "cre"), comment = c(ORCID = "0009-0004-6753-5090")), @@ -18,7 +18,7 @@ Encoding: UTF-8 LazyData: true RoxygenNote: 7.3.2 VignetteBuilder: knitr -Date: 2024-09-02 +Date: 2024-09-06 Config/testthat/edition: 3 Imports: rmndt, @@ -30,7 +30,7 @@ Imports: gdxrrw, zoo, gdxdt, - reporttransport (>= 0.0.10) + reporttransport (>= 0.3.0) Suggests: testthat (>= 3.0.0), knitr, diff --git a/README.md b/README.md index c9ac18d..254da22 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.3.0** +R package **edgeTransport**, version **2.4.0** [![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.4.0, . 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.3.0}, + note = {R package version 2.4.0}, url = {https://github.com/pik-piam/edgeTransport}, } ``` diff --git a/inst/extdata/helpersMappingEdgeTtoREMINDcategories.csv b/inst/extdata/helpersMappingEdgeTtoREMINDcategories.csv index 853ef96..5614195 100644 --- a/inst/extdata/helpersMappingEdgeTtoREMINDcategories.csv +++ b/inst/extdata/helpersMappingEdgeTtoREMINDcategories.csv @@ -41,8 +41,8 @@ Bus;Gases;fegat;te_esgat_pass_sm;entrp_pass_sm HSR;Electric;feelt;te_eselt_pass_sm;entrp_pass_sm Passenger Rail;Electric;feelt;te_eselt_pass_sm;entrp_pass_sm Passenger Rail;Liquids;fedie;te_esdie_pass_sm;entrp_pass_sm -Walk;Walk_tmp_technology;NA;NA;NA -Cycle;Cycle_tmp_technology;NA;NA;NA +Walk;Walk_tmp_technology;NA;NA;entrp_pass_sm +Cycle;Cycle_tmp_technology;NA;NA;entrp_pass_sm Bus;BEV;feelt;te_eselt_pass_sm;entrp_pass_sm Bus;FCEV;feh2t;te_esh2t_pass_sm;entrp_pass_sm Truck (0-3_5t);Liquids;fedie;te_esdie_frgt_sm;entrp_frgt_sm