Merge pull request #452 from fbenke-pik/iea_ev

fix unit conversions in IEA EV outlook

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '34065430'
+ValidationKey: '34074080'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'

CITATION.cff

@@ -3,7 +3,7 @@ message: If you use this software, please cite it using the metadata from this f
 type: software
 title: 'mrremind: MadRat REMIND Input Data Package'
 version: 0.173.0
-date-released: '2023-11-30'
+date-released: '2023-12-05'
 abstract: The mrremind packages contains data preprocessing for the REMIND model.
 authors:
 - family-names: Baumstark

DESCRIPTION

@@ -2,7 +2,7 @@ Type: Package
 Package: mrremind
 Title: MadRat REMIND Input Data Package
 Version: 0.173.0
-Date: 2023-11-30
+Date: 2023-12-05
 Authors@R: c(
     person("Lavinia", "Baumstark", , "lavinia@pik-potsdam.de", role = c("aut", "cre")),
     person("Renato", "Rodrigues", role = "aut"),

R/calcGlobalEnergyMonitor.R

@@ -11,6 +11,9 @@ calcGlobalEnergyMonitor <- function() {
 
   x <- readSource("GlobalEnergyMonitor")
 
+  # set 0s in other CHA countries than China to approximate CHA as China
+  x[c("HKG", "MAC", "TWN"), , ] <- 0
+
   return(list(
     x = x,
     weight = NULL,

R/calcIEA_EVOutlook.R

@@ -27,7 +27,7 @@ calcIEA_EVOutlook <- function() {
       !!sym("scenario") == "Projection-STEPS" ~ "IEA EV Outlook STEPS"
     ))
 
-  mapping <- toolGetMapping("Mapping_IEA_EV_Outlook.csv", type = "reportingVariables", where = "mappingfolder") %>%
+  mapping <- toolGetMapping("Mapping_IEA_EV_Outlook.csv", type = "reportingVariables", where = "mrremind") %>%
     filter(!is.na(!!sym("REMIND_Variable")), !!sym("REMIND_Variable") != "") %>%
     mutate(!!sym("REMIND") := paste0(!!sym("REMIND_Variable"), " (", !!sym("REMIND_Unit"), ")")) %>%
     select("variable" = "Variable", "REMIND", "Factor")
@@ -49,7 +49,7 @@ calcIEA_EVOutlook <- function() {
     toolCountryFill(fill = NA, verbosity = 2)
 
   # set 0s in other CHA countries than China to approximate CHA as China
-  x[c("HKG", "MAC", "TWN"),,] <- 0
+  x[c("HKG", "MAC", "TWN"), , ] <- 0
 
   return(list(
     x = x,

README.md

@@ -39,7 +39,7 @@ In case of questions / problems please contact Lavinia Baumstark <lavinia@pik-po
 
 To cite package **mrremind** in publications use:
 
-Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.173.0, <URL: https://github.com/pik-piam/mrremind>.
+Baumstark L, Rodrigues R, Levesque A, Oeser J, Bertram C, Mouratiadou I, Malik A, Schreyer F, Soergel B, Rottoli M, Mishra A, Dirnaichner A, Pehl M, Giannousakis A, Klein D, Strefler J, Feldhaus L, Brecha R, Rauner S, Dietrich J, Bi S, Benke F, Weigmann P, Richters O, Hasse R, Fuchs S, Mandaroux R (2023). _mrremind: MadRat REMIND Input Data Package_. R package version 0.173.0, <https://github.com/pik-piam/mrremind>.
 
 A BibTeX entry for LaTeX users is
 

inst/extdata/reportingVariables/Mapping_IEA_EV_Outlook.csv

@@ -0,0 +1,55 @@
+Variable;Unit;REMIND_Variable;REMIND_Unit;Comment;Factor
+Electricity demand|Buses|BEV;GWh;FE|Transport|Pass|Road|Bus|Electricity;EJ/yr;;0.0000036
+Electricity demand|Buses|PHEV;GWh;;;;
+Electricity demand|Cars|BEV;GWh;FE|Transport|Pass|Road|LDV|Electricity;EJ/yr;Contains PHEV, but should be small;0.0000036
+Electricity demand|Cars|PHEV;GWh;;;;
+Electricity demand|Trucks|BEV;GWh;FE|Transport|Freight|Road|Electricity;EJ/yr;Contains light trucks, see below;0.0000036
+Electricity demand|Trucks|PHEV;GWh;;;;
+Electricity demand|Vans|BEV;GWh;FE|Transport|Freight|Road|Truck (0-3$dot$5t)|Electricity;EJ/yr;;0.0000036
+Electricity demand|Vans|PHEV;GWh;;;;
+EV chargers|Publicly available fast;no;;;;
+EV chargers|Publicly available slow;no;;;;
+EV sales share|Buses|EV;percent;;;;
+EV sales share|Cars|EV;percent;;;;
+EV sales share|Trucks|EV;percent;;;;
+EV sales share|Vans|EV;percent;;;;
+EV sales|Buses|BEV;no;Sales|Transport|Bus|Electric;Million vehicles;;1.00E-06
+EV sales|Buses|PHEV;no;;;;
+EV sales|Buses|FCEV;no;Sales|Transport|Bus|FCEV;Million vehicles;;1.00E-06
+EV sales|Cars|BEV;no;;;;
+EV sales|Cars|PHEV;no;;;;
+EV sales|Cars|FCEV;no;;;;
+EV sales|Trucks|BEV;no;;;;
+EV sales|Trucks|FCEV;no;;;;
+EV sales|Trucks|PHEV;no;;;;
+EV sales|Vans|BEV;no;;;;
+EV sales|Vans|PHEV;no;;;;
+EV sales|Vans|FCEV;no;;;;
+EV stock share|Buses|EV;percent;;;;
+EV stock share|Cars|EV;percent;;;;
+EV stock share|Trucks|EV;percent;;;;
+EV stock share|Vans|EV;percent;;;;
+EV stock|Buses|BEV;no;Stock|Transport|Bus|Electric;Million vehicles;;1.00E-06
+EV stock|Buses|PHEV;no;;;;
+EV stock|Buses|FCEV;no;Stock|Transport|Bus|FCEV;Million vehicles;;1.00E-06
+EV stock|Cars|BEV;no;;;;
+EV stock|Cars|PHEV;no;;;;
+EV stock|Cars|FCEV;no;;;;
+EV stock|Trucks|BEV;no;;;;
+EV stock|Trucks|FCEV;no;;;;
+EV stock|Trucks|PHEV;no;;;;
+EV stock|Vans|BEV;no;;;;
+EV stock|Vans|PHEV;no;;;;
+EV stock|Vans|FCEV;no;;;;
+Oil displacement|Buses|EV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Buses|BEV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Buses|PHEV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Cars|EV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Cars|BEV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Cars|PHEV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Trucks|EV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Trucks|BEV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Trucks|PHEV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Vans|EV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Vans|BEV;Milion liters of gasoline equivalent;;;;
+Oil displacement|Vans|PHEV;Milion liters of gasoline equivalent;;;;