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

Camp scenarios #230

Merged
merged 15 commits into from
Nov 2, 2023
Merged

Camp scenarios #230

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bfe65eb
addCampScenNames
jmuessel Aug 21, 2023
3ac0f0b
Update 2050 targets for load factor
jmuessel Sep 13, 2023
5d2c6d3
BuildLibrary
jmuessel Sep 13, 2023
af5dfb1
; 2 ,
jmuessel Oct 10, 2023
00aa221
Merge branch 'master' of https://github.com/pik-piam/edgeTransport in…
jmuessel Oct 10, 2023
eb0c396
buildLIbrary
jmuessel Oct 10, 2023
691358f
change in mitigation.csv
jmuessel Oct 13, 2023
0eb2a7a
;2,
jmuessel Oct 13, 2023
9d80a59
;2,
jmuessel Oct 13, 2023
65b5244
delete lowDem
jmuessel Oct 13, 2023
8e4c101
include ICE ban in lscWeak and lscStrong scenarios
jmuessel Oct 17, 2023
5d2de42
Merge branch 'master' of https://github.com/pik-piam/edgeTransport in…
jmuessel Nov 2, 2023
11b5b09
update mitigation.csv and introduce ICE ban
jmuessel Nov 2, 2023
7dbc236
buildLIbrary
jmuessel Nov 2, 2023
e15f672
;2,
jmuessel Nov 2, 2023
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: '2179929'
ValidationKey: '2356800'
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: 1.1.1
date-released: '2023-10-09'
version: 1.2.0
date-released: '2023-10-10'
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
4 changes: 2 additions & 2 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: 1.1.1
Version: 1.2.0
Authors@R: c(
person("Alois", "Dirnaichner", email = "[email protected]", role = c("aut", "cre")),
person("Marianna", "Rottoli", email = "[email protected]", role = "aut"),
Expand All @@ -15,7 +15,7 @@ Encoding: UTF-8
LazyData: true
RoxygenNote: 7.2.3
VignetteBuilder: knitr
Date: 2023-10-09
Date: 2023-10-10
Config/testthat/edition: 3
Imports:
rmndt,
Expand Down
12 changes: 10 additions & 2 deletions R/mergeDat.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,20 @@ toolMergeDat <- function(UCD_output, EU_data, PSI_costs, GDP_MER, altCosts, CHN_
target_year = 2060
}

#if or condition syntax


if (!is.null(Dem_Scen)){
if (Dem_Scen == "SSP2EU_lowdem"){
if (Dem_Scen == "SSP2EU_lowdem" | Dem_Scen == "SSP2EU_demRedStrong") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be removed, when we dont have the loeDem scenario anymore

target_LF = 0.4
target_year = 2050}
}


if (!is.null(Dem_Scen)){
if (Dem_Scen == "SSP2EU_demRedWeak") {
target_LF = 0.2
target_year = 2050}
}

LF[
subsector_L1 == "trn_pass_road_LDV_4W" &
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 **1.1.1**
R package **edgeTransport**, version **1.2.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 Alois Dirnaichner <dirnaichner@pi

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

Dirnaichner A, Rottoli M, Hoppe J (2023). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 1.1.1, <https://github.com/pik-piam/edgeTransport>.
Dirnaichner A, Rottoli M, Hoppe J (2023). _edgeTransport: Prepare EDGE Transport Data for the REMIND model_. R package version 1.2.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 = {Alois Dirnaichner and Marianna Rottoli and Johanna Hoppe},
year = {2023},
note = {R package version 1.1.1},
note = {R package version 1.2.0},
url = {https://github.com/pik-piam/edgeTransport},
}
```
Loading