Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove inconsistency regarding REMIND/EDGE-T communication of active modes energy service demand #273

Merged
merged 6 commits into from
Sep 10, 2024
Merged

Remove inconsistency regarding REMIND/EDGE-T communication of active modes energy service demand #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bb07039
change mapping
johannah-pik Sep 4, 2024
6315fd2
Delete reportToREMINDesDemandperTech.R
johannah-pik Sep 5, 2024
6c53975
buildlib
johannah-pik Sep 6, 2024
7967bb0
Update DESCRIPTION
johannah-pik Sep 6, 2024
982a911
unit shift
johannah-pik Sep 6, 2024
5433504
exlude uniShift from this branch
johannah-pik Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .buildlibrary
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ValidationKey: '4592640'
ValidationKey: '4793280'
AutocreateReadme: yes
AcceptedWarnings:
- 'Warning: package ''.*'' was built under R version'
Expand Down
4 changes: 2 additions & 2 deletions CITATION.cff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0009-0004-6753-5090")),
Expand All @@ -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,
Expand All @@ -30,7 +30,7 @@ Imports:
gdxrrw,
zoo,
gdxdt,
reporttransport (>= 0.0.10)
reporttransport (>= 0.3.0)
Suggests:
testthat (>= 3.0.0),
knitr,
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -46,7 +46,7 @@ In case of questions / problems please contact Johanna Hoppe <johanna.hoppe@pik-

To cite package **edgeTransport** in publications use:

Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.3.0, <https://github.com/pik-piam/edgeTransport>.
Hoppe J, Dirnaichner A, Rottoli M, Muessel J (2024). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 2.4.0, <https://github.com/pik-piam/edgeTransport>.

A BibTeX entry for LaTeX users is

Expand All @@ -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},
}
```
4 changes: 2 additions & 2 deletions inst/extdata/helpersMappingEdgeTtoREMINDcategories.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading