From 794865db9fc9d29fb5ddf59cbfa8e073ab5fad57 Mon Sep 17 00:00:00 2001 From: jmuessel <54351036+jmuessel@users.noreply.github.com> Date: Wed, 11 Sep 2024 11:42:20 +0200 Subject: [PATCH] BEVPhaseIn SSP2 (#276) * update SSP2 * Remove dependency for backward compatibility * buildlib --------- Co-authored-by: johannah-pik <89136160+johannah-pik@users.noreply.github.com> --- .buildlibrary | 2 +- CITATION.cff | 4 ++-- DESCRIPTION | 6 ++--- README.md | 6 ++--- inst/extdata/scenParIncoCost.csv | 38 ++++++++++++++++---------------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index cfe63df..5c4dd70 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '4793280' +ValidationKey: '4994250' AutocreateReadme: yes AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' diff --git a/CITATION.cff b/CITATION.cff index 8206c8b..f1b23a3 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.4.0 -date-released: '2024-09-06' +version: 2.5.0 +date-released: '2024-09-11' 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 520695f..c4f40f1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: edgeTransport Title: Prepare EDGE Transport Data for the REMIND model -Version: 2.4.0 +Version: 2.5.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-06 +Date: 2024-09-11 Config/testthat/edition: 3 Imports: rmndt, @@ -30,7 +30,7 @@ Imports: gdxrrw, zoo, gdxdt, - reporttransport (>= 0.3.0) + reporttransport (>= 0.0.13) Suggests: testthat (>= 3.0.0), knitr, diff --git a/README.md b/README.md index 254da22..0af791e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Prepare EDGE Transport Data for the REMIND model -R package **edgeTransport**, version **2.4.0** +R package **edgeTransport**, version **2.5.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.5.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.4.0}, + note = {R package version 2.5.0}, url = {https://github.com/pik-piam/edgeTransport}, } ``` diff --git a/inst/extdata/scenParIncoCost.csv b/inst/extdata/scenParIncoCost.csv index 2158e3c..8168044 100644 --- a/inst/extdata/scenParIncoCost.csv +++ b/inst/extdata/scenParIncoCost.csv @@ -169,37 +169,37 @@ SSP2;HydrHype4;LDV|4W;Liquids;targetYear;2027 SSP2;HydrHype4;LDV|4W;Liquids;targetValue;0.2 SSP2;HydrHype4;LDV|4W;Hybrid electric;ratioPHEV;0.5 SSP2;Mix1;LDV|4W;BEV;startYear;2025 -SSP2;Mix1;LDV|4W;BEV;startValue;0.5 +SSP2;Mix1;LDV|4W;BEV;startValue;1.2 SSP2;Mix1;LDV|4W;BEV;targetYear;2035 SSP2;Mix1;LDV|4W;BEV;targetValue;0 -SSP2;Mix1;LDV|4W;Liquids;startYear;2020 -SSP2;Mix1;LDV|4W;Liquids;targetYear;2027 +SSP2;Mix1;LDV|4W;Liquids;startYear;2022 +SSP2;Mix1;LDV|4W;Liquids;targetYear;2030 SSP2;Mix1;LDV|4W;Liquids;targetValue;0 SSP2;Mix1;LDV|4W;Hybrid electric;ratioPHEV;0.5 SSP2;Mix2;LDV|4W;BEV;startYear;2025 -SSP2;Mix2;LDV|4W;BEV;startValue;0.5 +SSP2;Mix2;LDV|4W;BEV;startValue;0.8 SSP2;Mix2;LDV|4W;BEV;targetYear;2035 SSP2;Mix2;LDV|4W;BEV;targetValue;0.15 -SSP2;Mix2;LDV|4W;Liquids;startYear;2020 -SSP2;Mix2;LDV|4W;Liquids;targetYear;2027 -SSP2;Mix2;LDV|4W;Liquids;targetValue;0.05 +SSP2;Mix2;LDV|4W;Liquids;startYear;2022 +SSP2;Mix2;LDV|4W;Liquids;targetYear;2030 +SSP2;Mix2;LDV|4W;Liquids;targetValue;0.1 SSP2;Mix2;LDV|4W;Hybrid electric;ratioPHEV;0.5 SSP2;Mix3;LDV|4W;BEV;startYear;2025 -SSP2;Mix3;LDV|4W;BEV;startValue;0.5 +SSP2;Mix3;LDV|4W;BEV;startValue;0.4 SSP2;Mix3;LDV|4W;BEV;targetYear;2035 -SSP2;Mix3;LDV|4W;BEV;targetValue;0.1 -SSP2;Mix3;LDV|4W;Liquids;startYear;2020 -SSP2;Mix3;LDV|4W;Liquids;targetYear;2045 -SSP2;Mix3;LDV|4W;Liquids;targetValue;1 -SSP2;Mix3;LDV|4W;Hybrid electric;ratioPHEV;0.5 +SSP2;Mix3;LDV|4W;BEV;targetValue;0 +SSP2;Mix3;LDV|4W;Liquids;startYear;2022 +SSP2;Mix3;LDV|4W;Liquids;targetYear;2055 +SSP2;Mix3;LDV|4W;Liquids;targetValue;0.5 +SSP2;Mix3;LDV|4W;Hybrid electric;ratioPHEV;1 SSP2;Mix4;LDV|4W;BEV;startYear;2025 -SSP2;Mix4;LDV|4W;BEV;startValue;0.5 -SSP2;Mix4;LDV|4W;BEV;targetYear;2035 +SSP2;Mix4;LDV|4W;BEV;startValue;0.1 +SSP2;Mix4;LDV|4W;BEV;targetYear;2045 SSP2;Mix4;LDV|4W;BEV;targetValue;0 -SSP2;Mix4;LDV|4W;Liquids;startYear;2020 -SSP2;Mix4;LDV|4W;Liquids;targetYear;2040 -SSP2;Mix4;LDV|4W;Liquids;targetValue;1.2 -SSP2;Mix4;LDV|4W;Hybrid electric;ratioPHEV;0.5 +SSP2;Mix4;LDV|4W;Liquids;startYear;2022 +SSP2;Mix4;LDV|4W;Liquids;targetYear;2055 +SSP2;Mix4;LDV|4W;Liquids;targetValue;0.8 +SSP2;Mix4;LDV|4W;Hybrid electric;ratioPHEV;1.5 SSP2EU;CAMP_lscStrong;LDV|4W;BEV;startYear;2025 SSP2EU;CAMP_lscStrong;LDV|4W;BEV;startValue;0.5 SSP2EU;CAMP_lscStrong;LDV|4W;BEV;targetYear;2030