diff --git a/.buildlibrary b/.buildlibrary index a62fcf30..1377ab4e 100644 --- a/.buildlibrary +++ b/.buildlibrary @@ -1,4 +1,4 @@ -ValidationKey: '222126032' +ValidationKey: '222283680' AcceptedWarnings: - 'Warning: package ''.*'' was built under R version' - 'Warning: namespace ''.*'' is not available and has been replaced' diff --git a/CITATION.cff b/CITATION.cff index 7ede3d9f..6062cbe0 100644 --- a/CITATION.cff +++ b/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.127.2 +version: 1.128.0 date-released: '2023-12-15' abstract: Contains the REMIND-specific routines for data and model output manipulation. authors: diff --git a/DESCRIPTION b/DESCRIPTION index 1d95013b..1a608c01 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: remind2 Title: The REMIND R package (2nd generation) -Version: 1.127.2 +Version: 1.128.0 Date: 2023-12-15 Authors@R: c( person("Renato", "Rodrigues", , "renato.rodrigues@pik-potsdam.de", role = c("aut", "cre")), diff --git a/README.md b/README.md index 5b835287..fade288e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The REMIND R package (2nd generation) -R package **remind2**, version **1.127.2** +R package **remind2**, version **1.128.0** [![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 . +Rodrigues R, Baumstark L, Benke F, Dietrich J, Dirnaichner A, 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 (2023). _remind2: The REMIND R package (2nd generation)_. R package version 1.128.0, . 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 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}, year = {2023}, - note = {R package version 1.127.2}, + note = {R package version 1.128.0}, url = {https://github.com/pik-piam/remind2}, } ``` diff --git a/inst/markdown/compareScenarios2/cs2_01_summary.Rmd b/inst/markdown/compareScenarios2/cs2_01_summary.Rmd index a6188a2e..b5cb78ec 100644 --- a/inst/markdown/compareScenarios2/cs2_01_summary.Rmd +++ b/inst/markdown/compareScenarios2/cs2_01_summary.Rmd @@ -146,39 +146,44 @@ showMultiLinePlotsByVariable(dIea, items, "GDP|PPP pCap", scales = "fixed") ```{r FE by carrier} items <- c( - "FE|Solids", - "FE|Liquids", - "FE|Gases", - "FE|Heat", + "FE|Electricity", "FE|Hydrogen", - "FE|Electricity") -showAreaAndBarPlots(data, items, scales = "fixed") + "FE|Heat", + "FE|Gases", + "FE|Liquids", + "FE|Solids", + NULL +) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ## FE Industry by carrier ```{r FE Industry by carrier} items <- c( - "FE|Industry|Solids", - "FE|Industry|Liquids", - "FE|Industry|Gases", - "FE|Industry|Heat", + "FE|Industry|Electricity", "FE|Industry|Hydrogen", - "FE|Industry|Electricity") -showAreaAndBarPlots(data, items, scales = "fixed") + "FE|Industry|Heat", + "FE|Industry|Gases", + "FE|Industry|Liquids", + "FE|Industry|Solids", + NULL + ) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ## FE Buildings by carrier ```{r FE Buildings by carrier} items <- c( - "FE|Buildings|Solids", - "FE|Buildings|Liquids", - "FE|Buildings|Gases", - "FE|Buildings|Heat", + "FE|Buildings|Electricity", "FE|Buildings|Hydrogen", - "FE|Buildings|Electricity") -showAreaAndBarPlots(data, items, scales = "fixed") + "FE|Buildings|Heat", + "FE|Buildings|Gases", + "FE|Buildings|Liquids", + "FE|Buildings|Solids", + NULL) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ## FE Transport by carrier @@ -187,9 +192,10 @@ showAreaAndBarPlots(data, items, scales = "fixed") items <- c( "FE|Transport|Electricity", "FE|Transport|Hydrogen", + "FE|Transport|Gases", "FE|Transport|Liquids", - "FE|Transport|Gases") -showAreaAndBarPlots(data, items, scales = "fixed") + NULL) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ## FE CDR by carrier @@ -197,11 +203,13 @@ showAreaAndBarPlots(data, items, scales = "fixed") ```{r FE CDR by carrier} items <- c( - "FE|CDR|Liquids", - "FE|CDR|Gases", + "FE|CDR|Electricity", "FE|CDR|Hydrogen", - "FE|CDR|Electricity") -showAreaAndBarPlots(data, items, scales = "fixed") + "FE|CDR|Gases", + "FE|CDR|Liquids", + NULL + ) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ## SE Electricity by carrier @@ -211,24 +219,25 @@ showAreaAndBarPlots(data, items, scales = "fixed") tot <- "SE|Electricity" items <- c( - "SE|Electricity|Coal|w/ CC", - "SE|Electricity|Coal|w/o CC", - "SE|Electricity|Oil", - "SE|Electricity|Gas|w/ CC", - "SE|Electricity|Gas|w/o CC", - "SE|Electricity|Geothermal", - "SE|Electricity|Hydro", - "SE|Electricity|Nuclear", - "SE|Electricity|Biomass|w/ CC", - "SE|Electricity|Biomass|w/o CC", + "SE|Electricity|Net Imports", "SE|Electricity|Solar|CSP", "SE|Electricity|Solar|PV", "SE|Electricity|Wind|Onshore", "SE|Electricity|Wind|Offshore", + "SE|Electricity|Hydro", "SE|Electricity|Hydrogen", - "SE|Electricity|Net Imports") + "SE|Electricity|Nuclear", + "SE|Electricity|Geothermal", + "SE|Electricity|Biomass|w/ CC", + "SE|Electricity|Biomass|w/o CC", + "SE|Electricity|Oil", + "SE|Electricity|Gas|w/ CC", + "SE|Electricity|Gas|w/o CC", + "SE|Electricity|Coal|w/ CC", + "SE|Electricity|Coal|w/o CC", + NULL) -showAreaAndBarPlots(data, items, tot, scales = "fixed") +showAreaAndBarPlots(data, items, orderVars = "user", tot, scales = "fixed") ``` @@ -237,16 +246,18 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") ```{r PE by carrier} items <- c( - "PE|Coal", - "PE|Oil", - "PE|Gas", - "PE|Biomass", - "PE|Nuclear", "PE|Solar", "PE|Wind", - "PE|Hydro", - "PE|Geothermal") -showAreaAndBarPlots(data, items, scales = "fixed") + "PE|Hydro", + "PE|Nuclear", + "PE|Geothermal", + "PE|Biomass", + "PE|Oil", + "PE|Gas", + "PE|Coal", + NULL) + +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` diff --git a/inst/markdown/compareScenarios2/cs2_04_energy_supply.Rmd b/inst/markdown/compareScenarios2/cs2_04_energy_supply.Rmd index eb738324..e33d1550 100644 --- a/inst/markdown/compareScenarios2/cs2_04_energy_supply.Rmd +++ b/inst/markdown/compareScenarios2/cs2_04_energy_supply.Rmd @@ -12,8 +12,9 @@ items <- c( "Energy Investments|Elec|Storage", "Energy Investments|Elec|Solar", "Energy Investments|Elec|Wind", - "Energy Investments|Elec|Geothermal", "Energy Investments|Elec|Hydro", + "Energy Investments|Elec|Nuclear", + "Energy Investments|Elec|Geothermal", "Energy Investments|Elec|Biomass|w/ CC", "Energy Investments|Elec|Biomass|w/o CC", "Energy Investments|Elec|Oil", @@ -21,7 +22,8 @@ items <- c( "Energy Investments|Elec|Gas|w/o CC", "Energy Investments|Elec|Coal|w/ CC", "Energy Investments|Elec|Coal|w/o CC", - "Energy Investments|Elec|Nuclear") + NULL) + showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` @@ -36,6 +38,7 @@ items <- c( else "Cap|Electricity|Wind", "Cap|Electricity|Hydro", + "Cap|Electricity|Nuclear", "Cap|Electricity|Geothermal", "Cap|Electricity|Biomass", "Cap|Electricity|Hydrogen", @@ -44,7 +47,7 @@ items <- c( "Cap|Electricity|Oil|w/o CC", "Cap|Electricity|Coal|w/ CC", "Cap|Electricity|Coal|w/o CC", - "Cap|Electricity|Nuclear" + NULL ) showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` @@ -102,27 +105,29 @@ showLinePlots(data, "Cap|Electricity|Hydrogen") ### PE|Coal ```{r PE|Coal} items <- c( - "PE|Coal|Gases", - "PE|Coal|Liquids", - "PE|Coal|Solids", - "PE|Coal|Heat", + "PE|Coal|Hydrogen", "PE|Coal|Electricity", - "PE|Coal|Hydrogen") -showAreaAndBarPlots(data, items, scales = "fixed") + "PE|Coal|Heat", + "PE|Coal|Gases", + "PE|Coal|Liquids", + "PE|Coal|Solids", + NULL) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ### PE|Gas ```{r PE|Gas} items <- c( - "PE|Gas|Gases", - "PE|Gas|Heat", + "PE|Gas|Hydrogen|w/ CC", + "PE|Gas|Hydrogen|w/o CC", "PE|Gas|Electricity|w/ CC", "PE|Gas|Electricity|w/o CC", + "PE|Gas|Heat", + "PE|Gas|Gases", "PE|Gas|Liquids|w/ CC", "PE|Gas|Liquids|w/o CC", - "PE|Gas|Hydrogen|w/ CC", - "PE|Gas|Hydrogen|w/o CC") -showAreaAndBarPlots(data, items, scales = "fixed") + NULL) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` @@ -130,16 +135,17 @@ showAreaAndBarPlots(data, items, scales = "fixed") ```{r PE|Biomass} items <- c( - "PE|Biomass|Solids", + "PE|Biomass|Hydrogen|w/ CC", + "PE|Biomass|Hydrogen|w/o CC", + "PE|Biomass|Electricity|w/ CC", + "PE|Biomass|Electricity|w/o CC", "PE|Biomass|Heat", + "PE|Biomass|Gases", "PE|Biomass|Liquids|w/ CC", "PE|Biomass|Liquids|w/o CC", - "PE|Biomass|Gases", - "PE|Biomass|Electricity|w/ CC", - "PE|Biomass|Electricity|w/o CC", - "PE|Biomass|Hydrogen|w/ CC", - "PE|Biomass|Hydrogen|w/o CC") -showAreaAndBarPlots(data, items, scales = "fixed") + "PE|Biomass|Solids", + NULL) +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ## Primary Energy line plots @@ -177,24 +183,24 @@ showLinePlots(data, "Res|Extraction|Gas") tot <- "SE|Electricity" items <- c( - "SE|Electricity|Coal|w/ CC", - "SE|Electricity|Coal|w/o CC", - "SE|Electricity|Oil", - "SE|Electricity|Gas|w/ CC", - "SE|Electricity|Gas|w/o CC", - "SE|Electricity|Geothermal", - "SE|Electricity|Hydro", - "SE|Electricity|Nuclear", - "SE|Electricity|Biomass|w/ CC", - "SE|Electricity|Biomass|w/o CC", + "SE|Electricity|Net Imports", "SE|Electricity|Solar|CSP", "SE|Electricity|Solar|PV", "SE|Electricity|Wind|Onshore", "SE|Electricity|Wind|Offshore", + "SE|Electricity|Hydro", "SE|Electricity|Hydrogen", - "SE|Electricity|Net Imports") - -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "SE|Electricity|Nuclear", + "SE|Electricity|Geothermal", + "SE|Electricity|Biomass|w/ CC", + "SE|Electricity|Biomass|w/o CC", + "SE|Electricity|Oil", + "SE|Electricity|Gas|w/ CC", + "SE|Electricity|Gas|w/o CC", + "SE|Electricity|Coal|w/ CC", + "SE|Electricity|Coal|w/o CC", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed") ``` @@ -215,7 +221,7 @@ items <- c( "SE|Input|Electricity|CDR", "SE|Input|Electricity|Self Consumption Energy System") -showAreaAndBarPlots(data, items, tot, scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed") ``` @@ -223,11 +229,12 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") ```{r SE|Heat} tot <- "SE|Heat" items <- c( + "SE|Heat|Electricity|Heat Pump", "SE|Heat|Biomass", - "SE|Heat|Coal", "SE|Heat|Gas", - "SE|Heat|Electricity|Heat Pump") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "SE|Heat|Coal", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed") ``` @@ -237,16 +244,18 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") tot <- "SE|Hydrogen" items <- c( + "SE|Hydrogen|Net Imports", + "SE|Hydrogen|Electricity|VRE Storage Electrolysis", + "SE|Hydrogen|Electricity|Standard Electrolysis", "SE|Hydrogen|Biomass|w/ CC", "SE|Hydrogen|Biomass|w/o CC", - "SE|Hydrogen|Coal|w/ CC", - "SE|Hydrogen|Coal|w/o CC", "SE|Hydrogen|Gas|w/ CC", "SE|Hydrogen|Gas|w/o CC", - "SE|Hydrogen|Electricity|VRE Storage Electrolysis", - "SE|Hydrogen|Electricity|Standard Electrolysis", - "SE|Hydrogen|Net Imports") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "SE|Hydrogen|Coal|w/ CC", + "SE|Hydrogen|Coal|w/o CC", + NULL + ) +showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed") ``` ### SE|Hydrogen - Usage @@ -274,8 +283,8 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") tot <- "SE|Solids" items <- c( + "SE|Solids|Traditional Biomass", "SE|Solids|Biomass", - "SE|Solids|Traditional Biomass", "SE|Solids|Coal") showAreaAndBarPlots(data, items, tot, scales = "fixed") ``` @@ -288,16 +297,18 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") tot <- "SE|Liquids" items <- c( - "SE|Liquids|Fossil|Oil", + "SE|Liquids|Hydrogen", + "SE|Liquids|Hydrogen|Net Imports", "SE|Liquids|Biomass|w/ CC", "SE|Liquids|Biomass|w/o CC", + "SE|Liquids|Fossil|Oil", + "SE|Liquids|Fossil|Gas|w/ CC", + "SE|Liquids|Fossil|Gas|w/o CC", "SE|Liquids|Fossil|Coal|w/ CC", "SE|Liquids|Fossil|Coal|w/o CC", - "SE|Liquids|Fossil|Gas|w/ CC", - "SE|Liquids|Fossil|Gas|w/o CC", - "SE|Liquids|Hydrogen", - "SE|Liquids|Hydrogen|Net Imports") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + NULL) + +showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed") ``` ### SE|Gases @@ -306,13 +317,15 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") tot <- "SE|Gases" items <- c( - "SE|Gases|Fossil|Natural Gas", + "SE|Gases|Hydrogen", "SE|Gases|Biomass|w/ CC", "SE|Gases|Biomass|w/o CC", + "SE|Gases|Fossil|Natural Gas", "SE|Gases|Fossil|Coal|w/ CC", "SE|Gases|Fossil|Coal|w/o CC", - "SE|Gases|Hydrogen") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + NULL) + +showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed") ``` diff --git a/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd b/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd index 9e286eee..346277da 100644 --- a/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd +++ b/inst/markdown/compareScenarios2/cs2_05_energy_demand.Rmd @@ -8,11 +8,13 @@ tot <- "FE" items <- c( "FE|Electricity", - "FE|Gases", + "FE|Hydrogen", "FE|Heat", - "FE|Solids", + "FE|Gases", "FE|Liquids", - "FE|Hydrogen") + "FE|Solids", + NULL +) ``` \newpage @@ -20,8 +22,8 @@ items <- c( #### FE|* Area Plots ```{r FE|* Area Plots} -showAreaAndBarPlots(data, items, tot, scales = "fixed") -showAreaAndBarPlots(data, items, tot, fill = TRUE) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE) ``` #### FE|* Line Plots @@ -45,23 +47,28 @@ showLinePlots(data, "FE|Electricity|Share") tot <- "FE|Buildings" items <- c( "FE|Buildings|Electricity", + "FE|Buildings|Hydrogen", + "FE|Buildings|Heat", "FE|Buildings|Gases", - "FE|Buildings|Heat", - "FE|Buildings|Solids", "FE|Buildings|Liquids", - "FE|Buildings|Hydrogen") + "FE|Buildings|Solids", + NULL +) + items2 <- c( "FE|Buildings|Electricity", - "FE|Buildings|Gases|Fossil", - "FE|Buildings|Gases|Biomass", - "FE|Buildings|Gases|Hydrogen", + "FE|Buildings|Hydrogen", "FE|Buildings|Heat", - "FE|Buildings|Solids|Fossil", - "FE|Buildings|Solids|Biomass", - "FE|Buildings|Liquids|Fossil", + "FE|Buildings|Gases|Hydrogen", + "FE|Buildings|Gases|Biomass", + "FE|Buildings|Gases|Fossil", + "FE|Buildings|Liquids|Hydrogen", "FE|Buildings|Liquids|Biomass", - "FE|Buildings|Liquids|Hydrogen", - "FE|Buildings|Hydrogen") + "FE|Buildings|Liquids|Fossil", + "FE|Buildings|Solids|Biomass", + "FE|Buildings|Solids|Fossil", + NULL +) ``` \newpage @@ -69,8 +76,8 @@ items2 <- c( #### FE|Buildings|* Area Plots ```{r FE|Buildings|* Area Plots} -showAreaAndBarPlots(data, items, tot, scales = "fixed") -showAreaAndBarPlots(data, items, tot, fill = TRUE) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE) showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") ``` @@ -96,23 +103,27 @@ showLinePlots(data, "FE|Buildings|Electricity|Share") tot <- "FE|Industry" items <- c( "FE|Industry|Electricity", + "FE|Industry|Hydrogen", + "FE|Industry|Heat", "FE|Industry|Gases", - "FE|Industry|Heat", - "FE|Industry|Solids", "FE|Industry|Liquids", - "FE|Industry|Hydrogen") + "FE|Industry|Solids", + NULL) + items2 <- c( "FE|Industry|Electricity", - "FE|Industry|Gases|Fossil", - "FE|Industry|Gases|Biomass", - "FE|Industry|Gases|Hydrogen", + "FE|Industry|Hydrogen", "FE|Industry|Heat", - "FE|Industry|Solids|Fossil", - "FE|Industry|Solids|Biomass", - "FE|Industry|Liquids|Fossil", + "FE|Industry|Gases|Hydrogen", + "FE|Industry|Gases|Biomass", + "FE|Industry|Gases|Fossil", + "FE|Industry|Liquids|Hydrogen", "FE|Industry|Liquids|Biomass", - "FE|Industry|Liquids|Hydrogen", - "FE|Industry|Hydrogen") + "FE|Industry|Liquids|Fossil", + "FE|Industry|Solids|Biomass", + "FE|Industry|Solids|Fossil", + NULL) + ``` \newpage @@ -120,8 +131,8 @@ items2 <- c( #### FE|Industry|* Area Plots ```{r FE|Industry|* Area Plots} -showAreaAndBarPlots(data, items, tot, scales = "fixed") -showAreaAndBarPlots(data, items, tot, fill = TRUE) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE) showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") ``` @@ -143,25 +154,28 @@ showLinePlots(data, "FE|Industry|Electricity|Share") ```{r FE mix Steel} tot <- "FE|Industry|Steel" items <- c( - "FE|Industry|Steel|Solids", - "FE|Industry|Steel|Liquids", - "FE|Industry|Steel|Gases", - "FE|Industry|Steel|Hydrogen", - "FE|Industry|Steel|Primary|Electricity", - "FE|Industry|Steel|Secondary|Electricity") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "FE|Industry|Steel|Secondary|Electricity", + "FE|Industry|Steel|Primary|Electricity", + "FE|Industry|Steel|Hydrogen", + "FE|Industry|Steel|Gases", + "FE|Industry|Steel|Liquids", + "FE|Industry|Steel|Solids", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### FE mix Cement ```{r FE mix Cement} tot <- "FE|Industry|Cement" items <- c( - "FE|Industry|Cement|Solids", - "FE|Industry|Cement|Liquids", + "FE|Industry|Cement|Electricity", + "FE|Industry|Cement|Hydrogen", "FE|Industry|Cement|Gases", - "FE|Industry|Cement|Hydrogen", - "FE|Industry|Cement|Electricity") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "FE|Industry|Cement|Liquids", + "FE|Industry|Cement|Solids", + NULL +) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### FE mix Non-metallic minerals @@ -169,24 +183,25 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") tot <- "FE|Industry|Non-metallic minerals" items <- c( "FE|Industry|Electricity|Non-metallic minerals", + "FE|Industry|Hydrogen|Non-metallic minerals", + "FE|Industry|Heat|Non-metallic minerals", "FE|Industry|Gases|Non-metallic minerals", - "FE|Industry|Heat|Non-metallic minerals", - "FE|Industry|Hydrogen|Non-metallic minerals", "FE|Industry|Liquids|Non-metallic minerals", "FE|Industry|Solids|Non-metallic minerals") -showAreaAndBarPlots(data, items, tot, scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### FE mix Chemicals ```{r FE mix Chemicals} tot <- "FE|Industry|Chemicals" items <- c( + "FE|Industry|Chemicals|Electricity|Mechanical work and low-temperature heat", + "FE|Industry|Chemicals|Electricity|High-temperature heat", + "FE|Industry|Chemicals|Hydrogen", + "FE|Industry|Chemicals|Gases", "FE|Industry|Chemicals|Solids", "FE|Industry|Chemicals|Liquids", - "FE|Industry|Chemicals|Gases", - "FE|Industry|Chemicals|Hydrogen", - "FE|Industry|Chemicals|Electricity|Mechanical work and low-temperature heat", - "FE|Industry|Chemicals|Electricity|High-temperature heat") + NULL) showAreaAndBarPlots(data, items, tot, scales = "fixed") ``` @@ -194,14 +209,15 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") ```{r FE mix Other Industry} tot <- "FE|Industry|Other Industry" items <- c( - "FE|Industry|Other Industry|Solids", - "FE|Industry|Other Industry|Liquids", - "FE|Industry|Other Industry|Gases", - "FE|Industry|Other Industry|Hydrogen", - "FE|Industry|Other Industry|Heat", "FE|Industry|Other Industry|Electricity|Mechanical work and low-temperature heat", - "FE|Industry|Other Industry|Electricity|High-temperature heat") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "FE|Industry|Other Industry|Electricity|High-temperature heat", + "FE|Industry|Other Industry|Hydrogen", + "FE|Industry|Other Industry|Heat", + "FE|Industry|Other Industry|Gases", + "FE|Industry|Other Industry|Liquids", + "FE|Industry|Other Industry|Solids", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### FE|Industry|* line plots @@ -277,16 +293,21 @@ showLinePlots(data, 'FE|Industry|Specific Energy Consumption|Other Industry') tot <- "FE|Transport" items <- c( "FE|Transport|Electricity", + "FE|Transport|Hydrogen", "FE|Transport|Gases", "FE|Transport|Liquids", - "FE|Transport|Hydrogen") + NULL +) + items2 <- c( "FE|Transport|Electricity", + "FE|Transport|Hydrogen", "FE|Transport|Gases", "FE|Transport|Liquids|Biomass", "FE|Transport|Liquids|Fossil", "FE|Transport|Liquids|Hydrogen", - "FE|Transport|Hydrogen") + NULL +) ``` \newpage @@ -294,9 +315,9 @@ items2 <- c( #### FE|Transport|* Area Plots -- with Bunkers ```{r FE|Transport|* Area Plots -- with Bunkers} -showAreaAndBarPlots(data, items, tot, scales = "fixed") -showAreaAndBarPlots(data, items2, tot, scales = "fixed") -showAreaAndBarPlots(data, items, tot, fill = TRUE) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE) +showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") ``` #### FE|Transport|* Line Plots -- with Bunkers @@ -319,16 +340,20 @@ showLinePlots(data, "FE|Transport|Electricity|Share") tot <- "FE|Transport|w/o Bunkers" items <- c( "FE|Transport|w/o Bunkers|Electricity", + "FE|Transport|w/o Bunkers|Hydrogen", "FE|Transport|w/o Bunkers|Gases", "FE|Transport|w/o Bunkers|Liquids", - "FE|Transport|w/o Bunkers|Hydrogen") + NULL +) items2 <- c( "FE|Transport|w/o Bunkers|Electricity", + "FE|Transport|w/o Bunkers|Hydrogen", "FE|Transport|w/o Bunkers|Gases", "FE|Transport|w/o Bunkers|Liquids|Biomass", "FE|Transport|w/o Bunkers|Liquids|Fossil", "FE|Transport|w/o Bunkers|Liquids|Hydrogen", - "FE|Transport|w/o Bunkers|Hydrogen") + NULL +) ``` \newpage @@ -336,9 +361,9 @@ items2 <- c( #### FE|Transport|* Area Plots -- w/o Bunkers ```{r FE|Transport|* Area Plots -- w/o Bunkers} -showAreaAndBarPlots(data, items, tot, scales = "fixed") -showAreaAndBarPlots(data, items2, tot, scales = "fixed") -showAreaAndBarPlots(data, items, tot, fill = TRUE) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE) +showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed") ``` #### FE|Transport|* Line Plots -- w/o Bunkers @@ -354,15 +379,17 @@ walk(items, showLinePlots, data = data) ```{r Transport per type} tot <- "FE|Transport" items <- c( - "FE|Transport|LDV|Liquids", - "FE|Transport|LDV|Gases", "FE|Transport|LDV|Electricity", "FE|Transport|LDV|Hydrogen", - "FE|Transport|non-LDV|Liquids", - "FE|Transport|non-LDV|Gases", + "FE|Transport|LDV|Gases", + "FE|Transport|LDV|Liquids", "FE|Transport|non-LDV|Electricity", - "FE|Transport|non-LDV|Hydrogen") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "FE|Transport|non-LDV|Hydrogen", + "FE|Transport|non-LDV|Gases", + "FE|Transport|non-LDV|Liquids", + NULL +) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### Bunkers @@ -372,5 +399,5 @@ tot <- "FE|Transport" items <- c( "FE|Transport|Bunkers", "FE|Transport|w/o Bunkers") -showAreaAndBarPlots(data, items, tot, scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` diff --git a/inst/markdown/compareScenarios2/cs2_06_energy_services.Rmd b/inst/markdown/compareScenarios2/cs2_06_energy_services.Rmd index 5e8a0d4e..0a1cca27 100644 --- a/inst/markdown/compareScenarios2/cs2_06_energy_services.Rmd +++ b/inst/markdown/compareScenarios2/cs2_06_energy_services.Rmd @@ -5,14 +5,15 @@ ```{r FE demand from buildings by carriers} tot <- "FE|Buildings" items <- c( - "FE|Buildings|non-Heating|Electricity|Conventional", - "FE|Buildings|Heating|Solids", - "FE|Buildings|Heating|Liquids", - "FE|Buildings|Heating|Gases", - "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|Electricity|Heat pump", - "FE|Buildings|Heating|Hydrogen") + "FE|Buildings|Heating|Hydrogen", + "FE|Buildings|Heating|Gases", + "FE|Buildings|Heating|Liquids", + "FE|Buildings|Heating|Solids", + NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` @@ -20,14 +21,15 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ```{r UE demand from buildings by carriers} tot <- "UE|Buildings" items <- c( - "UE|Buildings|non-Heating|Electricity|Conventional", - "UE|Buildings|Heating|Solids", - "UE|Buildings|Heating|Liquids", - "UE|Buildings|Heating|Gases", - "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|Electricity|Heat pump", - "UE|Buildings|Heating|Hydrogen") + "UE|Buildings|Heating|Hydrogen", + "UE|Buildings|Heating|Gases", + "UE|Buildings|Heating|Liquids", + "UE|Buildings|Heating|Solids", + NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` @@ -35,13 +37,14 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ```{r FE demand from buildings for heating by carriers} tot <- "FE|Buildings|Heating" items <- c( - "FE|Buildings|Heating|Solids", - "FE|Buildings|Heating|Liquids", - "FE|Buildings|Heating|Gases", - "FE|Buildings|Heating|District Heating", + "FE|Buildings|Heating|Electricity|Heat pump", + "FE|Buildings|Heating|District Heating", "FE|Buildings|Heating|Electricity|Resistance", - "FE|Buildings|Heating|Electricity|Heat pump", - "FE|Buildings|Heating|Hydrogen") + "FE|Buildings|Heating|Hydrogen", + "FE|Buildings|Heating|Gases", + "FE|Buildings|Heating|Liquids", + "FE|Buildings|Heating|Solids", + NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` @@ -49,13 +52,14 @@ showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ```{r UE demand from buildings for heating by carriers} tot <- "UE|Buildings|Heating" items <- c( - "UE|Buildings|Heating|Solids", - "UE|Buildings|Heating|Liquids", - "UE|Buildings|Heating|Gases", - "UE|Buildings|Heating|District Heating", + "UE|Buildings|Heating|Electricity|Heat pump", + "UE|Buildings|Heating|District Heating", "UE|Buildings|Heating|Electricity|Resistance", - "UE|Buildings|Heating|Electricity|Heat pump", - "UE|Buildings|Heating|Hydrogen") + "UE|Buildings|Heating|Hydrogen", + "UE|Buildings|Heating|Gases", + "UE|Buildings|Heating|Liquids", + "UE|Buildings|Heating|Solids", + NULL) showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` @@ -93,7 +97,7 @@ items <- c( "ES|Transport|Pass|Road|LDV|Gases pCap", "ES|Transport|Pass|Road|LDV|Hybrid Electric pCap", "ES|Transport|Pass|Road|LDV|Liquids pCap") -showAreaAndBarPlots(data, items, scales = "fixed") +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ### Energy Services for Freight Transport per Capita - LinePlot @@ -111,19 +115,20 @@ items <- c( "ES|Transport|Freight|Road|FCEV pCap", "ES|Transport|Freight|Road|Gases pCap", "ES|Transport|Freight|Road|Liquids pCap") -showAreaAndBarPlots(data, items, scales = "fixed") +showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed") ``` ### LDV Vehicles Stock - EDGE-T ```{r LDV Vehicles Stock - EDGE-T} tot <- "Stock|Transport|LDV" items <- c( - "Stock|Transport|LDV|Liquids", "Stock|Transport|LDV|BEV", + "Stock|Transport|LDV|Hybrid Electric", "Stock|Transport|LDV|FCEV", - "Stock|Transport|LDV|Hybrid Electric", - "Stock|Transport|LDV|NG") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "Stock|Transport|LDV|NG", + "Stock|Transport|LDV|Liquids", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### LDV Vehicles Stock - TransportComplex @@ -133,19 +138,21 @@ items <- c( "Est EV LDV Stock", "Est H2 LDV Stock", "Est ICE LDV Stock") -showAreaAndBarPlots(data, items, tot, scales = "fixed") +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### LDV Vehicles Sales - EDGE-T ```{r LDV Vehicles Sales - EDGE-T} tot <- "Sales|Transport|LDV" items <- c( - "Sales|Transport|LDV|Liquids", - "Sales|Transport|LDV|BEV", - "Sales|Transport|LDV|FCEV", + "Sales|Transport|LDV|BEV", "Sales|Transport|LDV|Hybrid Electric", - "Sales|Transport|LDV|NG") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "Sales|Transport|LDV|FCEV", + "Sales|Transport|LDV|NG", + "Sales|Transport|LDV|Liquids", + NULL +) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### LDV Vehicles Sales - TransportComplex @@ -162,44 +169,48 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed") ```{r Truck Stock} tot <- "Stock|Transport|Truck" items <- c( - "Stock|Transport|Truck|Liquids", - "Stock|Transport|Truck|Electric", + "Stock|Transport|Truck|Electric", "Stock|Transport|Truck|FCEV", - "Stock|Transport|Truck|NG") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "Stock|Transport|Truck|NG", + "Stock|Transport|Truck|Liquids", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### Truck Sales - EDGE-T ```{r Truck Sales} tot <- "Sales|Transport|Truck" items <- c( - "Sales|Transport|Truck|Liquids", - "Sales|Transport|Truck|Electric", + "Sales|Transport|Truck|Electric", "Sales|Transport|Truck|FCEV", - "Sales|Transport|Truck|NG") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "Sales|Transport|Truck|NG", + "Sales|Transport|Truck|Liquids", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### Bus Stock - EDGE-T ```{r Bus Stock} tot <- "Stock|Transport|Bus" items <- c( - "Stock|Transport|Bus|Liquids", "Stock|Transport|Bus|Electric", "Stock|Transport|Bus|FCEV", - "Stock|Transport|Bus|NG") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "Stock|Transport|Bus|NG", + "Stock|Transport|Bus|Liquids", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### Bus Sales - EDGE-T ```{r Bus Sales} tot <- "Sales|Transport|Bus" items <- c( - "Sales|Transport|Bus|Liquids", - "Sales|Transport|Bus|Electric", + "Sales|Transport|Bus|Electric", "Sales|Transport|Bus|FCEV", - "Sales|Transport|Bus|NG") -showAreaAndBarPlots(data, items, tot, scales = "fixed") + "Sales|Transport|Bus|NG", + "Sales|Transport|Bus|Liquids", + NULL) +showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed") ``` ### non-LDV Vehicles Stock - TransportComplex