delte non-ldv plots

.buildlibrary

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

CITATION.cff

@@ -2,7 +2,7 @@ cff-version: 1.2.0
 message: If you use this software, please cite it using the metadata from this file.
 type: software
 title: 'remind2: The REMIND R package (2nd generation)'
-version: 1.147.1
+version: 1.147.2
 date-released: '2024-07-18'
 abstract: Contains the REMIND-specific routines for data and model output manipulation.
 authors:

DESCRIPTION

@@ -1,7 +1,7 @@
 Type: Package
 Package: remind2
 Title: The REMIND R package (2nd generation)
-Version: 1.147.1
+Version: 1.147.2
 Date: 2024-07-18
 Authors@R: c(
     person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")),

README.md

@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.147.1**
+R package **remind2**, version **1.147.2**
 
 [![CRAN status](https://www.r-pkg.org/badges/version/remind2)](https://cran.r-project.org/package=remind2)  [![R build status](https://github.com/pik-piam/remind2/workflows/check/badge.svg)](https://github.com/pik-piam/remind2/actions) [![codecov](https://codecov.io/gh/pik-piam/remind2/branch/master/graph/badge.svg)](https://app.codecov.io/gh/pik-piam/remind2) [![r-universe](https://pik-piam.r-universe.dev/badges/remind2)](https://pik-piam.r-universe.dev/builds)
 
@@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues <renato.rodrigue
 
 To cite package **remind2** in publications use:
 
-Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.147.1, <URL: https://github.com/pik-piam/remind2>.
+Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, Duerrwaechter J, Führlich P, Giannousakis A, Hasse R, Hilaire J, Klein D, Koch J, Kowalczyk K, Levesque A, Malik A, Merfort A, Merfort L, Morena-Leiva S, Pehl M, Pietzcker R, Rauner S, Richters O, Rottoli M, Schötz C, Schreyer F, Siala K, Sörgel B, Spahr M, Strefler J, Verpoort P, Weigmann P, Rüter T (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.147.2, <https://github.com/pik-piam/remind2>.
 
 A BibTeX entry for LaTeX users is
 
@@ -58,7 +58,7 @@ A BibTeX entry for LaTeX users is
   title = {remind2: The REMIND R package (2nd generation)},
   author = {Renato Rodrigues and Lavinia Baumstark and Falk Benke and Jan Philipp Dietrich and Alois Dirnaichner and Jakob Duerrwaechter and Pascal Führlich and Anastasis Giannousakis and Robin Hasse and Jérome Hilaire and David Klein and Johannes Koch and Katarzyna Kowalczyk and Antoine Levesque and Aman Malik and Anne Merfort and Leon Merfort and Simón Morena-Leiva and Michaja Pehl and Robert Pietzcker and Sebastian Rauner and Oliver Richters and Marianna Rottoli and Christof Schötz and Felix Schreyer and Kais Siala and Björn Sörgel and Mike Spahr and Jessica Strefler and Philipp Verpoort and Pascal Weigmann and Tonn Rüter},
   year = {2024},
-  note = {R package version 1.147.1},
+  note = {R package version 1.147.2},
   url = {https://github.com/pik-piam/remind2},
 }
 ```

inst/compareScenarios/cs_05_energy_demand.Rmd

@@ -492,9 +492,9 @@ items_synliq <- c(
   "FE|Transport|Pass|Road|Bus|Liquids|Hydrogen",
   "FE|Transport|Freight|Rail|Liquids|Hydrogen",
   "FE|Transport|Pass|Rail|Liquids|Hydrogen",
-  "FE|Transport|Pass|Aviation|Domestic|Liquids|Hydrogen",
-  "FE|Transport|Pass|Aviation|International|Liquids|Hydrogen",
-  "FE|Transport|Freight|International Shipping|Liquids|Hydrogen",
+  "FE|Transport|Pass|Domestic Aviation|Liquids|Hydrogen",
+  "FE|Transport|Bunkers|Pass|International Aviation|Liquids|Hydrogen",
+  "FE|Transport|Bunkers|Freight|International Shipping|Liquids|Hydrogen",
   NULL
 )
 
@@ -511,9 +511,9 @@ items_bioliq <- c(
   "FE|Transport|Pass|Road|Bus|Liquids|Biomass",
   "FE|Transport|Freight|Rail|Liquids|Biomass",
   "FE|Transport|Pass|Rail|Liquids|Biomass",
-  "FE|Transport|Pass|Aviation|Domestic|Liquids|Biomass",
-  "FE|Transport|Pass|Aviation|International|Liquids|Biomass",
-  "FE|Transport|Freight|International Shipping|Liquids|Biomass",
+  "FE|Transport|Pass|Domestic Aviation|Liquids|Biomass",
+  "FE|Transport|Bunkers|Pass|International Aviation|Liquids|Biomass",
+  "FE|Transport|Bunkers|Freight|International Shipping|Liquids|Biomass",
   NULL
 )
 
@@ -623,10 +623,6 @@ items <- c(
   "FE|Transport|LDV|Hydrogen",
   "FE|Transport|LDV|Gases",
   "FE|Transport|LDV|Liquids",
-  "FE|Transport|non-LDV|Electricity",
-  "FE|Transport|non-LDV|Hydrogen",
-  "FE|Transport|non-LDV|Gases",  
-  "FE|Transport|non-LDV|Liquids",
   NULL
 )
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")

inst/compareScenarios/cs_06_energy_services.Rmd

@@ -179,7 +179,7 @@ items <- c(
   "ES|Transport|Pass|Road|LDV|BEV",
   "ES|Transport|Pass|Road|LDV|FCEV",
   "ES|Transport|Pass|Road|LDV|Gases",
-  "ES|Transport|Pass|Road|LDV|Hybrid Electric",
+  "ES|Transport|Pass|Road|LDV|Hybrid electric",
   "ES|Transport|Pass|Road|LDV|Liquids")
 showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 ```
@@ -190,7 +190,7 @@ items <- c(
   "ES|Transport|Pass|Road|LDV|BEV pCap",
   "ES|Transport|Pass|Road|LDV|FCEV pCap",
   "ES|Transport|Pass|Road|LDV|Gases pCap",
-  "ES|Transport|Pass|Road|LDV|Hybrid Electric pCap",
+  "ES|Transport|Pass|Road|LDV|Hybrid electric pCap",
   "ES|Transport|Pass|Road|LDV|Liquids pCap")
 showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 ```
@@ -223,7 +223,7 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 ### ES Freight Road by tech - perCap - Bar
 ```{r ES Freight Road by tech - perCap - Bar}
 items <- c(
-  "ES|Transport|Freight|Road|Electric pCap",
+  "ES|Transport|Freight|Road|BEV pCap",
   "ES|Transport|Freight|Road|FCEV pCap",
   "ES|Transport|Freight|Road|Gases pCap",
   "ES|Transport|Freight|Road|Liquids pCap")
@@ -232,13 +232,13 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 
 ### LDV Vehicles Stock - EDGE-T
 ```{r LDV Vehicles Stock - EDGE-T}
-tot <- "Stock|Transport|LDV"
+tot <- "Stock|Transport|Pass|Road|LDV"
 items <- c(
-  "Stock|Transport|LDV|BEV",
-  "Stock|Transport|LDV|Hybrid Electric",  
-  "Stock|Transport|LDV|FCEV",
-  "Stock|Transport|LDV|NG",
-  "Stock|Transport|LDV|Liquids",
+  "Stock|Transport|Pass|Road|LDV|BEV",
+  "Stock|Transport|Pass|Road|LDV|Hybrid electric",  
+  "Stock|Transport|Pass|Road|LDV|FCEV",
+  "Stock|Transport|Pass|Road|LDV|Gases",
+  "Stock|Transport|Pass|Road|LDV|Liquids",
   NULL)
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
@@ -248,9 +248,9 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 tot <- "Stock|Transport|LDV pCap"
 items <- c(
   "Stock|Transport|LDV|BEV pCap",
-  "Stock|Transport|LDV|Hybrid Electric pCap",  
+  "Stock|Transport|LDV|Hybrid electric pCap",  
   "Stock|Transport|LDV|FCEV pCap",
-  "Stock|Transport|LDV|NG pCap",
+  "Stock|Transport|LDV|Gases pCap",
   "Stock|Transport|LDV|Liquids pCap",
   NULL)
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
@@ -268,13 +268,13 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 
 ### LDV Vehicles Sales - EDGE-T
 ```{r LDV Vehicles Sales - EDGE-T}
-tot <- "Sales|Transport|LDV"
+tot <- "Sales|Transport|Pass|Road|LDV"
 items <- c(
-  "Sales|Transport|LDV|BEV",  
-  "Sales|Transport|LDV|Hybrid Electric",
-  "Sales|Transport|LDV|FCEV",  
-  "Sales|Transport|LDV|NG",
-  "Sales|Transport|LDV|Liquids",
+  "Sales|Transport|Pass|Road|LDV|BEV",  
+  "Sales|Transport|Pass|Road|LDV|Hybrid electric",
+  "Sales|Transport|Pass|Road|LDV|FCEV",  
+  "Sales|Transport|Pass|Road|LDV|Gases",
+  "Sales|Transport|Pass|Road|LDV|Liquids",
   NULL
 )
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
@@ -292,48 +292,48 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed")
 
 ### Truck Stock - EDGE-T
 ```{r Truck Stock}
-tot <- "Stock|Transport|Truck"
+tot <- "Stock|Transport|Freight|Road"
 items <- c(
-  "Stock|Transport|Truck|Electric",  
-  "Stock|Transport|Truck|FCEV",
-  "Stock|Transport|Truck|NG",
-  "Stock|Transport|Truck|Liquids",
+  "Stock|Transport|Freight|Road|Electric",  
+  "Stock|Transport|Freight|Road|FCEV",
+  "Stock|Transport|Freight|Road|Gases",
+  "Stock|Transport|Freight|Road|Liquids",
   NULL)
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
 ### Truck Sales - EDGE-T
 ```{r Truck Sales}
-tot <- "Sales|Transport|Truck"
+tot <- "Sales|Transport|Freight|Road"
 items <- c(
-  "Sales|Transport|Truck|Electric",  
-  "Sales|Transport|Truck|FCEV",
-  "Sales|Transport|Truck|NG",
-  "Sales|Transport|Truck|Liquids",
+  "Sales|Transport|Freight|Road|Electric",  
+  "Sales|Transport|Freight|Road|FCEV",
+  "Sales|Transport|Freight|Road|Gases",
+  "Sales|Transport|Freight|Road|Liquids",
   NULL)
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
 ### Bus Stock - EDGE-T
 ```{r Bus Stock}
-tot <- "Stock|Transport|Bus"
+tot <- "Stock|Transport|Pass|Road|Bus"
 items <- c(
-  "Stock|Transport|Bus|Electric",
-  "Stock|Transport|Bus|FCEV",
-  "Stock|Transport|Bus|NG",
-  "Stock|Transport|Bus|Liquids",
+  "Stock|Transport|Pass|Road|Bus|Electric",
+  "Stock|Transport|Pass|Road|Bus|FCEV",
+  "Stock|Transport|Pass|Road|Bus|Gases",
+  "Stock|Transport|Pass|Road|Bus|Liquids",
   NULL)
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
 ### Bus Sales - EDGE-T
 ```{r Bus Sales}
-tot <- "Sales|Transport|Bus"
+tot <- "Sales|Transport|Pass|Road|Bus"
 items <- c(
-  "Sales|Transport|Bus|Electric",  
-  "Sales|Transport|Bus|FCEV",
-  "Sales|Transport|Bus|NG",
-  "Sales|Transport|Bus|Liquids",
+  "Sales|Transport|Pass|Road|Bus|Electric",  
+  "Sales|Transport|Pass|Road|Bus|FCEV",
+  "Sales|Transport|Pass|Road|Bus|Gases",
+  "Sales|Transport|Pass|Road|Bus|Liquids",
   NULL)
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```

inst/compareScenarios/preprocessing.R

@@ -54,19 +54,19 @@ pCapVariables <- tribble(
   "ES|Transport|Pass|Road|LDV|BEV", "k pkm/yr/pCap", 1e6,
   "ES|Transport|Pass|Road|LDV|FCEV", "k pkm/yr/pCap", 1e6,
   "ES|Transport|Pass|Road|LDV|Gases", "k pkm/yr/pCap", 1e6,
-  "ES|Transport|Pass|Road|LDV|Hybrid Electric", "k pkm/yr/pCap", 1e6,
+  "ES|Transport|Pass|Road|LDV|Hybrid electric", "k pkm/yr/pCap", 1e6,
   "ES|Transport|Pass|Road|LDV|Liquids", "k pkm/yr/pCap", 1e6,
   "ES|Transport|Freight", "k tkm/yr/pCap", 1e6,
-  "ES|Transport|Freight|Road|Electric", "k tkm/yr/pCap", 1e6,
+  "ES|Transport|Freight|Road|BEV", "k tkm/yr/pCap", 1e6,
   "ES|Transport|Freight|Road|FCEV", "k tkm/yr/pCap", 1e6,
   "ES|Transport|Freight|Road|Gases", "k tkm/yr/pCap", 1e6,
   "ES|Transport|Freight|Road|Liquids", "k tkm/yr/pCap", 1e6,
-  "Stock|Transport|LDV", "cars per 1000 people", 1e9,
-  "Stock|Transport|LDV|BEV", "cars per 1000 people", 1e9,
-  "Stock|Transport|LDV|Hybrid Electric", "cars per 1000 people", 1e9,
-  "Stock|Transport|LDV|FCEV", "cars per 1000 people", 1e9,
-  "Stock|Transport|LDV|NG", "cars per 1000 people", 1e9,
-  "Stock|Transport|LDV|Liquids", "cars per 1000 people", 1e9,
+  "Stock|Transport|Road|LDV", "cars per 1000 people", 1e9,
+  "Stock|Transport|Road|LDV|BEV", "cars per 1000 people", 1e9,
+  "Stock|Transport|Road|LDV|Hybrid electric", "cars per 1000 people", 1e9,
+  "Stock|Transport|Road|LDV|FCEV", "cars per 1000 people", 1e9,
+  "Stock|Transport|Road|LDV|Gases", "cars per 1000 people", 1e9,
+  "Stock|Transport|Road|LDV|Liquids", "cars per 1000 people", 1e9,
   "Emi|GHG", "t CO2eq/yr/pCap", 1e6,
   "Emi|GHG|Gross|Energy|Supply|Electricity", "t CO2eq/yr/pCap", 1e6,
   "Emi|GHG|Gross|Energy|Supply|Non-electric", "t CO2eq/yr/pCap", 1e6,