Add plots for per capita FE/UE mix in buildings

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '224129262'
+ValidationKey: '224160366'
 AcceptedWarnings:
 - 'Warning: package ''.*'' was built under R version'
 - 'Warning: namespace ''.*'' is not available and has been replaced'
@@ -10,5 +10,6 @@ AcceptedNotes:
 - unable to verify current time
 - checking installed package size
 - Namespace in Imports field not imported from: ‘htmltools’
+- Namespace in Imports field not imported from: htmltools
 AutocreateReadme: yes
 allowLinterWarnings: yes

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.134.2
-date-released: '2024-02-08'
+version: 1.134.3
+date-released: '2024-02-09'
 abstract: Contains the REMIND-specific routines for data and model output manipulation.
 authors:
 - family-names: Rodrigues

DESCRIPTION

@@ -1,8 +1,8 @@
 Type: Package
 Package: remind2
 Title: The REMIND R package (2nd generation)
-Version: 1.134.2
-Date: 2024-02-08
+Version: 1.134.3
+Date: 2024-02-09
 Authors@R: c(
     person("Renato", "Rodrigues", , "[email protected]", role = c("aut", "cre")),
     person("Lavinia", "Baumstark", role = "aut"),

README.md

@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.134.2**
+R package **remind2**, version **1.134.3**
 
 [![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 (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.134.2, <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 (2024). _remind2: The REMIND R package (2nd generation)_. R package version 1.134.3, <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},
   year = {2024},
-  note = {R package version 1.134.2},
+  note = {R package version 1.134.3},
   url = {https://github.com/pik-piam/remind2},
 }
 ```

inst/markdown/compareScenarios2/cs2_06_energy_services.Rmd

@@ -17,6 +17,24 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
+### FE mix per Capita
+```{r per Capita FE demand from buildings by carriers}
+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|Heating|Electricity|Resistance pCap",
+    "FE|Buildings|Heating|Hydrogen pCap",  
+    "FE|Buildings|Heating|Gases pCap",
+    "FE|Buildings|Heating|Liquids pCap",
+    "FE|Buildings|Heating|Solids pCap",
+    NULL)
+  showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+}
+```
+
 ### UE mix
 ```{r UE demand from buildings by carriers}
 tot <- "UE|Buildings"
@@ -33,6 +51,24 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
+### UE mix per Capita
+```{r per Capita UE demand from buildings by carriers}
+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|Heating|Electricity|Resistance pCap",
+    "UE|Buildings|Heating|Hydrogen pCap",  
+    "UE|Buildings|Heating|Gases pCap",
+    "UE|Buildings|Heating|Liquids pCap",
+    "UE|Buildings|Heating|Solids pCap",
+    NULL)
+  showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+}
+```
+
 ### FE heating
 ```{r FE demand from buildings for heating by carriers}
 tot <- "FE|Buildings|Heating"
@@ -48,6 +84,23 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
+### FE heating per capita
+```{r per Capita FE demand from buildings for heating by carriers}
+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|Resistance pCap",
+    "FE|Buildings|Heating|Hydrogen pCap",  
+    "FE|Buildings|Heating|Gases pCap",
+    "FE|Buildings|Heating|Liquids pCap",
+    "FE|Buildings|Heating|Solids pCap",
+    NULL)
+  showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+}
+```
+
 ### UE heating
 ```{r UE demand from buildings for heating by carriers}
 tot <- "UE|Buildings|Heating"
@@ -63,6 +116,23 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
+### UE heating per Capita
+```{r per Capita UE demand from buildings for heating by carriers}
+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|Resistance pCap",
+    "UE|Buildings|Heating|Hydrogen pCap",  
+    "UE|Buildings|Heating|Gases pCap",
+    "UE|Buildings|Heating|Liquids pCap",
+    "UE|Buildings|Heating|Solids pCap",
+    NULL)
+  showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+}
+```
+
 ### Region Intercomparison FE|Buildings
 ```{r FE Buildings Region}
 items <- c(

inst/markdown/compareScenarios2/cs2_main.Rmd

@@ -265,11 +265,29 @@ pCapVariables <- tribble(
   "FE|Transport", "GJ/yr", 1e9,
   "FE|Buildings", "GJ/yr", 1e9,
   "FE|Industry", "GJ/yr", 1e9,
+  "FE|Buildings|non-Heating|Electricity|Conventional", "GJ/yr", 1e9, 
+  "FE|Buildings|Heating|Electricity|Heat pump", "GJ/yr", 1e9,
+  "FE|Buildings|Heating|District Heating", "GJ/yr", 1e9,
+  "FE|Buildings|Heating|Electricity|Resistance", "GJ/yr", 1e9,
+  "FE|Buildings|Heating|Hydrogen", "GJ/yr", 1e9,
+  "FE|Buildings|Heating|Gases", "GJ/yr", 1e9,
+  "FE|Buildings|Heating|Liquids", "GJ/yr", 1e9,
+  "FE|Buildings|Heating|Solids", "GJ/yr", 1e9,
   "FE|Buildings|Heating", "GJ/yr", 1e9,
   "FE|Buildings|Appliances and Light", "GJ/yr", 1e9,
   "FE|Buildings|Cooking and Water", "GJ/yr", 1e9,
   "FE|Buildings|Space Cooling", "GJ/yr", 1e9,
   "FE|Buildings|Space Heating", "GJ/yr", 1e9,
+  "UE|Buildings", "GJ/yr", 1e9,
+  "UE|Buildings|non-Heating|Electricity|Conventional", "GJ/yr", 1e9, 
+  "UE|Buildings|Heating|Electricity|Heat pump", "GJ/yr", 1e9,
+  "UE|Buildings|Heating|District Heating", "GJ/yr", 1e9,
+  "UE|Buildings|Heating|Electricity|Resistance", "GJ/yr", 1e9,
+  "UE|Buildings|Heating|Hydrogen", "GJ/yr", 1e9,
+  "UE|Buildings|Heating|Gases", "GJ/yr", 1e9,
+  "UE|Buildings|Heating|Liquids", "GJ/yr", 1e9,
+  "UE|Buildings|Heating|Solids", "GJ/yr", 1e9,
+  "UE|Buildings|Heating", "GJ/yr", 1e9,
   "ES|Transport|Pass", "km/yr", 1e9,
   "ES|Transport|Pass|Road|LDV", "km/yr", 1e9,
   "ES|Transport|Pass|non-LDV", "km/yr", 1e9,