From 5736e50479633265587678612d3571d7ec53f733 Mon Sep 17 00:00:00 2001 From: ahagen Date: Wed, 4 Dec 2024 17:06:14 +0100 Subject: [PATCH 1/2] Adjust EDGE-T variable names --- .buildlibrary | 2 +- .pre-commit-config.yaml | 4 +- CITATION.cff | 4 +- DESCRIPTION | 4 +- README.md | 8 +- .../cs_06_energy_services.Rmd | 164 +++++++----------- inst/compareScenarios/preprocessing.R | 12 +- 7 files changed, 79 insertions(+), 119 deletions(-) diff --git a/.buildlibrary b/.buildlibrary index 5f8607c8..91c9f3fc 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '232674959' +ValidationKey: '232787844' AcceptedWarnings: - .*following variables are expected in the piamInterfaces.* - Summation checks have revealed some gaps.* diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 7ccf77e0..7dcd45b7 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ exclude: '^tests/testthat/_snaps/.*$' repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: 2c9f875913ee60ca25ce70243dc24d5b6415598c # frozen: v4.6.0 + rev: cef0300fd0fc4d2a87a85fa2093c6b283ea36f4b # frozen: v5.0.0 hooks: - id: check-case-conflict - id: check-json @@ -15,7 +15,7 @@ repos: - id: mixed-line-ending - repo: https://github.com/lorenzwalthert/precommit - rev: bae853d82da476eee0e0a57960ee6b741a3b3fb7 # frozen: v0.4.3 + rev: 3b70240796cdccbe1474b0176560281aaded97e6 # frozen: v0.4.3.9003 hooks: - id: parsable-R - id: deps-in-desc diff --git a/CITATION.cff b/CITATION.cff index fdecced0..26455bd5 100644 --- a/CITATION.cff +++ b/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: 'remind2: The REMIND R package (2nd generation)' -version: 1.160.3 -date-released: '2024-11-26' +version: 1.160.4 +date-released: '2024-12-04' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: - family-names: Rodrigues diff --git a/DESCRIPTION b/DESCRIPTION index 7343e797..8301eca5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,8 +1,8 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.160.3 -Date: 2024-11-26 +Version: 1.160.4 +Date: 2024-12-04 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), person("Lavinia", "Baumstark", role = "aut"), diff --git a/README.md b/README.md index 7f7c1236..e2ef279f 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.160.3** +R package **remind2**, version **1.160.4** -[![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) +[![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) ## Purpose and Functionality @@ -49,7 +49,7 @@ In case of questions / problems please contact Renato Rodrigues . +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.160.4, . 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.160.3}, + note = {R package version 1.160.4}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/inst/compareScenarios/cs_06_energy_services.Rmd b/inst/compareScenarios/cs_06_energy_services.Rmd index 2f6a0ba0..428f5819 100644 --- a/inst/compareScenarios/cs_06_energy_services.Rmd +++ b/inst/compareScenarios/cs_06_energy_services.Rmd @@ -5,11 +5,11 @@ ```{r FE demand from buildings by carriers} tot <- "FE|Buildings" items <- c( - "FE|Buildings|non-Heating|Electricity|Conventional", - "FE|Buildings|Heating|Electricity|Heat pump", - "FE|Buildings|Heating|District Heating", + "FE|Buildings|non-Heating|Electricity|Conventional", + "FE|Buildings|Heating|Electricity|Heat pump", + "FE|Buildings|Heating|District Heating", "FE|Buildings|Heating|Electricity|Resistance", - "FE|Buildings|Heating|Hydrogen", + "FE|Buildings|Heating|Hydrogen", "FE|Buildings|Heating|Gases", "FE|Buildings|Heating|Liquids", "FE|Buildings|Heating|Solids", @@ -22,11 +22,11 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") if ("FE|Buildings|non-Heating|Electricity|Conventional pCap" %in% data[["variable"]]) { tot <- "FE|Buildings pCap" items <- c( - "FE|Buildings|non-Heating|Electricity|Conventional pCap", - "FE|Buildings|Heating|Electricity|Heat pump pCap", - "FE|Buildings|Heating|District Heating pCap", + "FE|Buildings|non-Heating|Electricity|Conventional pCap", + "FE|Buildings|Heating|Electricity|Heat pump pCap", + "FE|Buildings|Heating|District Heating pCap", "FE|Buildings|Heating|Electricity|Resistance pCap", - "FE|Buildings|Heating|Hydrogen pCap", + "FE|Buildings|Heating|Hydrogen pCap", "FE|Buildings|Heating|Gases pCap", "FE|Buildings|Heating|Liquids pCap", "FE|Buildings|Heating|Solids pCap", @@ -39,11 +39,11 @@ if ("FE|Buildings|non-Heating|Electricity|Conventional pCap" %in% data[["variabl ```{r UE demand from buildings by carriers} tot <- "UE|Buildings" items <- c( - "UE|Buildings|non-Heating|Electricity|Conventional", - "UE|Buildings|Heating|Electricity|Heat pump", - "UE|Buildings|Heating|District Heating", + "UE|Buildings|non-Heating|Electricity|Conventional", + "UE|Buildings|Heating|Electricity|Heat pump", + "UE|Buildings|Heating|District Heating", "UE|Buildings|Heating|Electricity|Resistance", - "UE|Buildings|Heating|Hydrogen", + "UE|Buildings|Heating|Hydrogen", "UE|Buildings|Heating|Gases", "UE|Buildings|Heating|Liquids", "UE|Buildings|Heating|Solids", @@ -56,11 +56,11 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") if ("UE|Buildings|non-Heating|Electricity|Conventional pCap" %in% data[["variable"]]) { tot <- "UE|Buildings pCap" items <- c( - "UE|Buildings|non-Heating|Electricity|Conventional pCap", - "UE|Buildings|Heating|Electricity|Heat pump pCap", - "UE|Buildings|Heating|District Heating pCap", + "UE|Buildings|non-Heating|Electricity|Conventional pCap", + "UE|Buildings|Heating|Electricity|Heat pump pCap", + "UE|Buildings|Heating|District Heating pCap", "UE|Buildings|Heating|Electricity|Resistance pCap", - "UE|Buildings|Heating|Hydrogen pCap", + "UE|Buildings|Heating|Hydrogen pCap", "UE|Buildings|Heating|Gases pCap", "UE|Buildings|Heating|Liquids pCap", "UE|Buildings|Heating|Solids pCap", @@ -73,10 +73,10 @@ if ("UE|Buildings|non-Heating|Electricity|Conventional pCap" %in% data[["variabl ```{r FE demand from buildings for heating by carriers} tot <- "FE|Buildings|Heating" items <- c( - "FE|Buildings|Heating|Electricity|Heat pump", - "FE|Buildings|Heating|District Heating", + "FE|Buildings|Heating|Electricity|Heat pump", + "FE|Buildings|Heating|District Heating", "FE|Buildings|Heating|Electricity|Resistance", - "FE|Buildings|Heating|Hydrogen", + "FE|Buildings|Heating|Hydrogen", "FE|Buildings|Heating|Gases", "FE|Buildings|Heating|Liquids", "FE|Buildings|Heating|Solids", @@ -89,10 +89,10 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") if ("FE|Buildings|Heating|Electricity|Heat pump pCap" %in% data[["variable"]]) { tot <- "FE|Buildings|Heating pCap" items <- c( - "FE|Buildings|Heating|Electricity|Heat pump pCap", - "FE|Buildings|Heating|District Heating pCap", + "FE|Buildings|Heating|Electricity|Heat pump pCap", + "FE|Buildings|Heating|District Heating pCap", "FE|Buildings|Heating|Electricity|Resistance pCap", - "FE|Buildings|Heating|Hydrogen pCap", + "FE|Buildings|Heating|Hydrogen pCap", "FE|Buildings|Heating|Gases pCap", "FE|Buildings|Heating|Liquids pCap", "FE|Buildings|Heating|Solids pCap", @@ -105,10 +105,10 @@ if ("FE|Buildings|Heating|Electricity|Heat pump pCap" %in% data[["variable"]]) { ```{r UE demand from buildings for heating by carriers} tot <- "UE|Buildings|Heating" items <- c( - "UE|Buildings|Heating|Electricity|Heat pump", - "UE|Buildings|Heating|District Heating", + "UE|Buildings|Heating|Electricity|Heat pump", + "UE|Buildings|Heating|District Heating", "UE|Buildings|Heating|Electricity|Resistance", - "UE|Buildings|Heating|Hydrogen", + "UE|Buildings|Heating|Hydrogen", "UE|Buildings|Heating|Gases", "UE|Buildings|Heating|Liquids", "UE|Buildings|Heating|Solids", @@ -121,10 +121,10 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") if ("UE|Buildings|Heating|Electricity|Heat pump pCap" %in% data[["variable"]]) { tot <- "UE|Buildings|Heating pCap" items <- c( - "UE|Buildings|Heating|Electricity|Heat pump pCap", - "UE|Buildings|Heating|District Heating pCap", + "UE|Buildings|Heating|Electricity|Heat pump pCap", + "UE|Buildings|Heating|District Heating pCap", "UE|Buildings|Heating|Electricity|Resistance pCap", - "UE|Buildings|Heating|Hydrogen pCap", + "UE|Buildings|Heating|Hydrogen pCap", "UE|Buildings|Heating|Gases pCap", "UE|Buildings|Heating|Liquids pCap", "UE|Buildings|Heating|Solids pCap", @@ -158,17 +158,17 @@ showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap") ```{r ES Pass - Line} items <- c( "ES|Transport|Pass", - "ES|Transport|Pass|Road|LDV", - "ES|Transport|Pass|non-LDV") + "ES|Transport|Pass|Road|LDV" + ) showMultiLinePlots(data, items) ``` ### ES Pass - perCap - Line ```{r ES Pass - perCap - Line} items <- c( + # problems see last chunk "ES|Transport|Pass pCap", - "ES|Transport|Pass|Road|LDV pCap", - "ES|Transport|Pass|non-LDV pCap") + "ES|Transport|Pass|Road|LDV pCap") showMultiLinePlots(data, items) showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap") ``` @@ -213,7 +213,7 @@ showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap") ### ES Freight Road by tech - Bar ```{r ES Freight Road by tech - Bar} items <- c( - "ES|Transport|Freight|Road|Electric", + "ES|Transport|Freight|Road|BEV", "ES|Transport|Freight|Road|FCEV", "ES|Transport|Freight|Road|Gases", "ES|Transport|Freight|Road|Liquids") @@ -235,7 +235,7 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") tot <- "Stock|Transport|Pass|Road|LDV" items <- c( "Stock|Transport|Pass|Road|LDV|BEV", - "Stock|Transport|Pass|Road|LDV|Hybrid electric", + "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", @@ -245,34 +245,24 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ### LDV Vehicles Stock - perCap - EDGE-T ```{r LDV Vehicles Stock - perCap - EDGE-T} -tot <- "Stock|Transport|LDV pCap" +tot <- "Stock|Transport|Pass|Road|LDV pCap" items <- c( - "Stock|Transport|LDV|BEV pCap", - "Stock|Transport|LDV|Hybrid electric pCap", - "Stock|Transport|LDV|FCEV pCap", - "Stock|Transport|LDV|Gases pCap", - "Stock|Transport|LDV|Liquids pCap", + "Stock|Transport|Pass|Road|LDV|BEV pCap", + "Stock|Transport|Pass|Road|LDV|Hybrid electric pCap", + "Stock|Transport|Pass|Road|LDV|FCEV pCap", + "Stock|Transport|Pass|Road|LDV|Gases pCap", + "Stock|Transport|Pass|Road|LDV|Liquids pCap", NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` -### LDV Vehicles Stock - TransportComplex -```{r LDV Vehicles Stock - TransportComplex} -tot <- "Est LDV Stock" -items <- c( - "Est EV LDV Stock", - "Est H2 LDV Stock", - "Est ICE LDV Stock") -showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") -``` - ### LDV Vehicles Sales - EDGE-T ```{r LDV Vehicles Sales - EDGE-T} tot <- "Sales|Transport|Pass|Road|LDV" items <- c( - "Sales|Transport|Pass|Road|LDV|BEV", + "Sales|Transport|Pass|Road|LDV|BEV", "Sales|Transport|Pass|Road|LDV|Hybrid electric", - "Sales|Transport|Pass|Road|LDV|FCEV", + "Sales|Transport|Pass|Road|LDV|FCEV", "Sales|Transport|Pass|Road|LDV|Gases", "Sales|Transport|Pass|Road|LDV|Liquids", NULL @@ -280,21 +270,11 @@ items <- c( showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` -### LDV Vehicles Sales - TransportComplex -```{r LDV Vehicles Sales - TransportComplex} -tot <- "Est LDV Sales" -items <- c( - "Est EV LDV Sales", - "Est H2 LDV Sales", - "Est ICE LDV Sales") -showAreaAndBarPlots(data, items, tot, scales = "fixed") -``` - ### Truck Stock - EDGE-T ```{r Truck Stock} tot <- "Stock|Transport|Freight|Road" items <- c( - "Stock|Transport|Freight|Road|Electric", + "Stock|Transport|Freight|Road|BEV", "Stock|Transport|Freight|Road|FCEV", "Stock|Transport|Freight|Road|Gases", "Stock|Transport|Freight|Road|Liquids", @@ -306,7 +286,7 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ```{r Truck Sales} tot <- "Sales|Transport|Freight|Road" items <- c( - "Sales|Transport|Freight|Road|Electric", + "Sales|Transport|Freight|Road|BEV", "Sales|Transport|Freight|Road|FCEV", "Sales|Transport|Freight|Road|Gases", "Sales|Transport|Freight|Road|Liquids", @@ -318,7 +298,7 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ```{r Bus Stock} tot <- "Stock|Transport|Pass|Road|Bus" items <- c( - "Stock|Transport|Pass|Road|Bus|Electric", + "Stock|Transport|Pass|Road|Bus|BEV", "Stock|Transport|Pass|Road|Bus|FCEV", "Stock|Transport|Pass|Road|Bus|Gases", "Stock|Transport|Pass|Road|Bus|Liquids", @@ -330,7 +310,7 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ```{r Bus Sales} tot <- "Sales|Transport|Pass|Road|Bus" items <- c( - "Sales|Transport|Pass|Road|Bus|Electric", + "Sales|Transport|Pass|Road|Bus|BEV", "Sales|Transport|Pass|Road|Bus|FCEV", "Sales|Transport|Pass|Road|Bus|Gases", "Sales|Transport|Pass|Road|Bus|Liquids", @@ -338,26 +318,6 @@ items <- c( showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` -### non-LDV Vehicles Stock - TransportComplex -```{r non-LDV Vehicles Stock} -tot <- "Services and Products|Transport|non-LDV|Stock|uedit" -items <- c( - "Services and Products|Transport|non-LDV|Stock|apCarDiT", - "Services and Products|Transport|non-LDV|Stock|apcarDiEffT", - "Services and Products|Transport|non-LDV|Stock|apcarDiEffH2T") -showAreaAndBarPlots(data, items, tot, scales = "fixed") -``` - -### non-LDV Vehicles Sales - TransportComplex -```{r non-LDV Vehicles Sales} -tot <- "Services and Products|Transport|non-LDV|Sales|uedit" -items <- c( - "Services and Products|Transport|non-LDV|Sales|apCarDiT", - "Services and Products|Transport|non-LDV|Sales|apcarDiEffT", - "Services and Products|Transport|non-LDV|Sales|apcarDiEffH2T") -showAreaAndBarPlots(data, items, tot, scales = "fixed") -``` - ## Industry Production ### Subsector Production ```{r plot industry subsector production} @@ -378,11 +338,11 @@ dPlot <- data %>% filter(variable %in% items) %>% mutate(variable = shorten_legend(variable)) %>% order.levels(variable = rev(shorten_legend(items)), - scenario = unique(c('historical', levels(data$scenario)))) + scenario = unique(c("historical", levels(data$scenario)))) # Show at max 5 scenario rows by 7 region column plots for (regions in bin_distribute(getRegs(dPlot), 7)) { - for (scenarios in bin_distribute(setdiff(getScenarios(dPlot), 'historical'), + for (scenarios in bin_distribute(setdiff(getScenarios(dPlot), "historical"), 5)) { suppressWarnings( p <- ggplot_bar_remind_vts( @@ -405,20 +365,20 @@ for (regions in bin_distribute(getRegs(dPlot), 7)) { mapping = aes(x = xpos, y = value)) + geom_step(data = dPlot %>% filter(region %in% regions, - 'historical' == scenario) %>% + "historical" == scenario) %>% complete(nesting(model, region, variable, unit, period, value), scenario = scenarios) %>% - filter('historical' != scenario) %>% + filter("historical" != scenario) %>% group_by(model, scenario, region, unit, period) %>% arrange(model, scenario, region, unit, period, desc(variable)) %>% mutate(value = cumsum(value)) %>% ungroup(), - mapping = aes(x = period, y = value, colour = 'historic', + mapping = aes(x = period, y = value, colour = "historic", group = interaction(region, variable)), - direction = 'vh') + - scale_colour_manual(values = c('historic' = 'black'), + direction = "vh") + + scale_colour_manual(values = c("historic" = "black"), name = NULL) + facet_wrap(~ interaction(region, scenario, sep = " "), nrow = length(scenarios), scales = "free_y") + @@ -436,30 +396,30 @@ p <- ggplot() + filter(2100 >= period) %>% group_by(scenario, region, period) %>% mutate(value = value / sum(value), - variable = paste(variable, 'Share')) %>% + variable = paste(variable, "Share")) %>% ungroup(), mapping = aes(x = period, y = value, colour = scenario, linetype = variable)) + scale_colour_manual( - values = c(gg_colour_hue(setdiff(levels(dPlot$scenario), 'historical')), - c('historical' = 'black')), + values = c(gg_colour_hue(setdiff(levels(dPlot$scenario), "historical")), + c("historical" = "black")), name = NULL) + scale_linetype_discrete(name = NULL, guide = guide_legend(nrow = 2)) + scale_y_continuous(breaks = seq(0, 1, 0.2), minor_breaks = seq(0.1, 0.9, 0.2)) + - facet_wrap(~ region) + + facet_wrap(~region) + labs(x = NULL, y = NULL) + theme_minimal() + - theme(legend.position = 'bottom') + theme(legend.position = "bottom") plot(p) -cat('\n\n') +cat("\n\n") ``` ### Steel mix by route using process-based steel modeling ```{r Steel mix by route} -if ("Production|Industry|Steel|BF-BOF" %in% levels(data$variable)){ # if process-based steel is used +if ("Production|Industry|Steel|BF-BOF" %in% levels(data$variable)) { # if process-based steel is used tot <- "Production|Industry|Steel" items <- c( "Production|Industry|Steel|DRI-NG-EAF-CCS", @@ -473,11 +433,11 @@ if ("Production|Industry|Steel|BF-BOF" %in% levels(data$variable)){ # if process dscens <- data %>% filter(.data$variable %in% items, .data$scenario != "historical") %>% droplevels() %>% - pull('scenario') %>% + pull("scenario") %>% unique() droute <- data %>% filter(.data$scenario %in% dscens) -showAreaAndBarPlots(droute, items, tot, orderVars="user", scales = "fixed") +showAreaAndBarPlots(droute, items, tot, orderVars = "user", scales = "fixed") } ``` diff --git a/inst/compareScenarios/preprocessing.R b/inst/compareScenarios/preprocessing.R index 5b63b0a9..db47d88b 100644 --- a/inst/compareScenarios/preprocessing.R +++ b/inst/compareScenarios/preprocessing.R @@ -61,12 +61,12 @@ pCapVariables <- tribble( "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|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, + "Stock|Transport|Pass|Road|LDV", "cars per 1000 people", 1e9, + "Stock|Transport|Pass|Road|LDV|BEV", "cars per 1000 people", 1e9, + "Stock|Transport|Pass|Road|LDV|Hybrid electric", "cars per 1000 people", 1e9, + "Stock|Transport|Pass|Road|LDV|FCEV", "cars per 1000 people", 1e9, + "Stock|Transport|Pass|Road|LDV|Gases", "cars per 1000 people", 1e9, + "Stock|Transport|Pass|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, From f6f224a32bc5e0f7e4d8be329400b3a1abdf217f Mon Sep 17 00:00:00 2001 From: ahagen Date: Wed, 4 Dec 2024 17:10:23 +0100 Subject: [PATCH 2/2] Removed comment --- inst/compareScenarios/cs_06_energy_services.Rmd | 1 - 1 file changed, 1 deletion(-) diff --git a/inst/compareScenarios/cs_06_energy_services.Rmd b/inst/compareScenarios/cs_06_energy_services.Rmd index 428f5819..a9cb4d76 100644 --- a/inst/compareScenarios/cs_06_energy_services.Rmd +++ b/inst/compareScenarios/cs_06_energy_services.Rmd @@ -166,7 +166,6 @@ showMultiLinePlots(data, items) ### ES Pass - perCap - Line ```{r ES Pass - perCap - Line} items <- c( - # problems see last chunk "ES|Transport|Pass pCap", "ES|Transport|Pass|Road|LDV pCap") showMultiLinePlots(data, items)