Merge pull request #238 from johannah-pik/Update_NAV

Correct NAVIGATE scenarios

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '2757020'
+ValidationKey: '2777982'
 AutocreateReadme: yes
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'

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.4.0
-date-released: '2023-12-02'
+version: 1.4.1
+date-released: '2023-12-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

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: edgeTransport
 Title: Prepare EDGE Transport Data for the REMIND model
-Version: 1.4.0
+Version: 1.4.1
 Authors@R: c(
     person("Alois", "Dirnaichner", email = "[email protected]", role = c("aut", "cre")),
     person("Marianna", "Rottoli", email = "[email protected]", role = "aut"),
@@ -15,7 +15,7 @@ Encoding: UTF-8
 LazyData: true
 RoxygenNote: 7.2.3
 VignetteBuilder: knitr
-Date: 2023-12-02
+Date: 2023-12-11
 Config/testthat/edition: 3
 Imports:
     rmndt,

R/incotrend.R

@@ -294,7 +294,7 @@ Hybrid Electric,Liquids")
       FVtarget_tb[, value := ifelse(year==2035,0.3*value[year==2015],value),by = c("region","technology")]
       FVtarget_tb[, value := ifelse(year==2040,0.2*value[year==2015],value),by = c("region","technology")]
       FVtarget_tb[, value := ifelse(year==2045,0.1*value[year==2015],value),by = c("region","technology")]
-      FVtarget_tb[year>=2045, value := 0.05]
+      FVtarget_tb[year>=2045, value := value * 0.05]
 
       FVtarget=rbind(FVtarget_all,FVtarget_tb)
 

README.md

@@ -1,6 +1,6 @@
 # Prepare EDGE Transport Data for the REMIND model
 
-R package **edgeTransport**, version **1.4.0**
+R package **edgeTransport**, version **1.4.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@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.4.0, <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.4.1, <https://github.com/pik-piam/edgeTransport>.
 
 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.4.0},
+  note = {R package version 1.4.1},
   url = {https://github.com/pik-piam/edgeTransport},
 }
 ```

inst/extdata/edget-mitigation.csv

@@ -2239,42 +2239,42 @@ SSP2EU,NAV_act,rich,S3,Passenger Rail,,,,1.6,2040,10
 SSP2EU,NAV_act,rich,S3,Walk,,,,1.7,2040,10
 SSP2EU,NAV_act,rich,S3,trn_freight_road,,,,0.9,2040,10
 SSP2EU,NAV_act,rich,S3,trn_pass_road,,,,0.7,2040,10
-SSP2EU,NAV_all,poor,FV,,,Aviation,Electric,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,Aviation,Hydrogen,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,Aviation,Liquids,1,2050,10
+SSP2EU,NAV_all,poor,FV,,,Aviation,Electric,1,2045,10
+SSP2EU,NAV_all,poor,FV,,,Aviation,Hydrogen,10,2045,10
+SSP2EU,NAV_all,poor,FV,,,Aviation,Liquids,0.1,2045,10
 SSP2EU,NAV_all,poor,FV,,,Bus,Electric,7,2025,10
 SSP2EU,NAV_all,poor,FV,,,Bus,Hydrogen,5,2025,10
 SSP2EU,NAV_all,poor,FV,,,Bus,Liquids,0.01,2025,10
-SSP2EU,NAV_all,poor,FV,,,LDV|2W,Electric,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,LDV|2W,Hydrogen,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,LDV|2W,Liquids,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,Rail,Electric,2,2050,10
-SSP2EU,NAV_all,poor,FV,,,Rail,Hydrogen,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,Rail,Liquids,1,2050,10
+SSP2EU,NAV_all,poor,FV,,,LDV|2W,Electric,4,2030,10
+SSP2EU,NAV_all,poor,FV,,,LDV|2W,Hydrogen,1,2030,10
+SSP2EU,NAV_all,poor,FV,,,LDV|2W,Liquids,0.05,2030,10
+SSP2EU,NAV_all,poor,FV,,,Rail,Electric,2,2040,10
+SSP2EU,NAV_all,poor,FV,,,Rail,Hydrogen,2,2040,10
+SSP2EU,NAV_all,poor,FV,,,Rail,Liquids,0.1,2040,10
 SSP2EU,NAV_all,poor,FV,,,Ship,Electric,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,Ship,Hydrogen,1,2050,10
-SSP2EU,NAV_all,poor,FV,,,Ship,Liquids,1,2050,10
+SSP2EU,NAV_all,poor,FV,,,Ship,Hydrogen,10,2050,10
+SSP2EU,NAV_all,poor,FV,,,Ship,Liquids,0.1,2050,10
 SSP2EU,NAV_all,poor,FV,,,Truck|heavy,Electric,1.5,2025,10
 SSP2EU,NAV_all,poor,FV,,,Truck|heavy,Hydrogen,9,2025,10
 SSP2EU,NAV_all,poor,FV,,,Truck|heavy,Liquids,0.01,2025,10
 SSP2EU,NAV_all,poor,FV,,,Truck|light,Electric,4,2025,10
 SSP2EU,NAV_all,poor,FV,,,Truck|light,Hydrogen,4,2025,10
 SSP2EU,NAV_all,poor,FV,,,Truck|light,Liquids,0.01,2025,10
-SSP2EU,NAV_all,rich,FV,,,Aviation,Electric,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,Aviation,Hydrogen,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,Aviation,Liquids,1,2050,10
+SSP2EU,NAV_all,rich,FV,,,Aviation,Electric,1,2045,10
+SSP2EU,NAV_all,rich,FV,,,Aviation,Hydrogen,10,2045,10
+SSP2EU,NAV_all,rich,FV,,,Aviation,Liquids,0.1,2045,10
 SSP2EU,NAV_all,rich,FV,,,Bus,Electric,9,2025,10
 SSP2EU,NAV_all,rich,FV,,,Bus,Hydrogen,6,2025,10
 SSP2EU,NAV_all,rich,FV,,,Bus,Liquids,0.01,2025,10
-SSP2EU,NAV_all,rich,FV,,,LDV|2W,Electric,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,LDV|2W,Hydrogen,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,LDV|2W,Liquids,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,Rail,Electric,2,2050,10
-SSP2EU,NAV_all,rich,FV,,,Rail,Hydrogen,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,Rail,Liquids,1,2050,10
+SSP2EU,NAV_all,rich,FV,,,LDV|2W,Electric,4,2030,10
+SSP2EU,NAV_all,rich,FV,,,LDV|2W,Hydrogen,1,2030,10
+SSP2EU,NAV_all,rich,FV,,,LDV|2W,Liquids,0.05,2030,10
+SSP2EU,NAV_all,rich,FV,,,Rail,Electric,2,2040,10
+SSP2EU,NAV_all,rich,FV,,,Rail,Hydrogen,2,2040,10
+SSP2EU,NAV_all,rich,FV,,,Rail,Liquids,0.1,2040,10
 SSP2EU,NAV_all,rich,FV,,,Ship,Electric,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,Ship,Hydrogen,1,2050,10
-SSP2EU,NAV_all,rich,FV,,,Ship,Liquids,1,2050,10
+SSP2EU,NAV_all,rich,FV,,,Ship,Hydrogen,10,2050,10
+SSP2EU,NAV_all,rich,FV,,,Ship,Liquids,0.1,2050,10
 SSP2EU,NAV_all,rich,FV,,,Truck|heavy,Electric,4,2025,10
 SSP2EU,NAV_all,rich,FV,,,Truck|heavy,Hydrogen,9,2025,10
 SSP2EU,NAV_all,rich,FV,,,Truck|heavy,Liquids,0.01,2025,10
@@ -2325,42 +2325,42 @@ SSP2EU,NAV_all,rich,S3,Passenger Rail,,,,1.6,2040,10
 SSP2EU,NAV_all,rich,S3,Walk,,,,1.7,2040,10
 SSP2EU,NAV_all,rich,S3,trn_freight_road,,,,0.9,2040,10
 SSP2EU,NAV_all,rich,S3,trn_pass_road,,,,0.7,2040,10
-SSP2EU,NAV_ele,poor,FV,,,Aviation,Electric,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,Aviation,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,Aviation,Liquids,1,2050,10
+SSP2EU,NAV_ele,poor,FV,,,Aviation,Electric,1,2045,10
+SSP2EU,NAV_ele,poor,FV,,,Aviation,Hydrogen,10,2045,10
+SSP2EU,NAV_ele,poor,FV,,,Aviation,Liquids,0.1,2045,10
 SSP2EU,NAV_ele,poor,FV,,,Bus,Electric,7,2025,10
 SSP2EU,NAV_ele,poor,FV,,,Bus,Hydrogen,5,2025,10
 SSP2EU,NAV_ele,poor,FV,,,Bus,Liquids,0.01,2025,10
-SSP2EU,NAV_ele,poor,FV,,,LDV|2W,Electric,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,LDV|2W,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,LDV|2W,Liquids,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,Rail,Electric,2,2050,10
-SSP2EU,NAV_ele,poor,FV,,,Rail,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,Rail,Liquids,1,2050,10
+SSP2EU,NAV_ele,poor,FV,,,LDV|2W,Electric,4,2030,10
+SSP2EU,NAV_ele,poor,FV,,,LDV|2W,Hydrogen,1,2030,10
+SSP2EU,NAV_ele,poor,FV,,,LDV|2W,Liquids,0.05,2030,10
+SSP2EU,NAV_ele,poor,FV,,,Rail,Electric,2,2040,10
+SSP2EU,NAV_ele,poor,FV,,,Rail,Hydrogen,2,2040,10
+SSP2EU,NAV_ele,poor,FV,,,Rail,Liquids,0.1,2040,10
 SSP2EU,NAV_ele,poor,FV,,,Ship,Electric,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,Ship,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,poor,FV,,,Ship,Liquids,1,2050,10
+SSP2EU,NAV_ele,poor,FV,,,Ship,Hydrogen,10,2050,10
+SSP2EU,NAV_ele,poor,FV,,,Ship,Liquids,0.1,2050,10
 SSP2EU,NAV_ele,poor,FV,,,Truck|heavy,Electric,1.5,2025,10
 SSP2EU,NAV_ele,poor,FV,,,Truck|heavy,Hydrogen,9,2025,10
 SSP2EU,NAV_ele,poor,FV,,,Truck|heavy,Liquids,0.01,2025,10
 SSP2EU,NAV_ele,poor,FV,,,Truck|light,Electric,4,2025,10
 SSP2EU,NAV_ele,poor,FV,,,Truck|light,Hydrogen,4,2025,10
 SSP2EU,NAV_ele,poor,FV,,,Truck|light,Liquids,0.01,2025,10
-SSP2EU,NAV_ele,rich,FV,,,Aviation,Electric,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,Aviation,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,Aviation,Liquids,1,2050,10
+SSP2EU,NAV_ele,rich,FV,,,Aviation,Electric,1,2045,10
+SSP2EU,NAV_ele,rich,FV,,,Aviation,Hydrogen,10,2045,10
+SSP2EU,NAV_ele,rich,FV,,,Aviation,Liquids,0.1,2045,10
 SSP2EU,NAV_ele,rich,FV,,,Bus,Electric,9,2025,10
 SSP2EU,NAV_ele,rich,FV,,,Bus,Hydrogen,6,2025,10
 SSP2EU,NAV_ele,rich,FV,,,Bus,Liquids,0.01,2025,10
-SSP2EU,NAV_ele,rich,FV,,,LDV|2W,Electric,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,LDV|2W,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,LDV|2W,Liquids,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,Rail,Electric,2,2050,10
-SSP2EU,NAV_ele,rich,FV,,,Rail,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,Rail,Liquids,1,2050,10
+SSP2EU,NAV_ele,rich,FV,,,LDV|2W,Electric,4,2030,10
+SSP2EU,NAV_ele,rich,FV,,,LDV|2W,Hydrogen,1,2030,10
+SSP2EU,NAV_ele,rich,FV,,,LDV|2W,Liquids,0.05,2030,10
+SSP2EU,NAV_ele,rich,FV,,,Rail,Electric,2,2040,10
+SSP2EU,NAV_ele,rich,FV,,,Rail,Hydrogen,2,2040,10
+SSP2EU,NAV_ele,rich,FV,,,Rail,Liquids,0.1,2040,10
 SSP2EU,NAV_ele,rich,FV,,,Ship,Electric,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,Ship,Hydrogen,1,2050,10
-SSP2EU,NAV_ele,rich,FV,,,Ship,Liquids,1,2050,10
+SSP2EU,NAV_ele,rich,FV,,,Ship,Hydrogen,10,2050,10
+SSP2EU,NAV_ele,rich,FV,,,Ship,Liquids,0.1,2050,10
 SSP2EU,NAV_ele,rich,FV,,,Truck|heavy,Electric,4,2025,10
 SSP2EU,NAV_ele,rich,FV,,,Truck|heavy,Hydrogen,9,2025,10
 SSP2EU,NAV_ele,rich,FV,,,Truck|heavy,Liquids,0.01,2025,10