Merge pull request #681 from robertpietzcker/updateCompScen2

cs2: add several energy supply plots

.buildlibrary

@@ -1,4 +1,4 @@
-ValidationKey: '232919820'
+ValidationKey: '233178540'
 AcceptedWarnings:
 - .*following variables are expected in the piamInterfaces.*
 - Summation checks have revealed some gaps.*

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.161.0
-date-released: '2024-12-05'
+version: 1.162.0
+date-released: '2024-12-10'
 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.161.0
-Date: 2024-12-05
+Version: 1.162.0
+Date: 2024-12-10
 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.161.0**
+R package **remind2**, version **1.162.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 <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.161.0, <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.162.0, <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.161.0},
+  note = {R package version 1.162.0},
   url = {https://github.com/pik-piam/remind2},
 }
 ```

inst/compareScenarios/cs_04_energy_supply.Rmd

@@ -31,21 +31,21 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 ### Mix of Electricity Capacities
 ```{r Capacities Electricity}
 items <- c(
-  "Cap|Electricity|Storage|Battery",
-  "Cap|Electricity|Hydrogen",
   "Cap|Electricity|Solar|CSP",
   "Cap|Electricity|Solar|PV",
-  "Cap|Electricity|Wind|Offshore",
   "Cap|Electricity|Wind|Onshore",
+  "Cap|Electricity|Wind|Offshore",
+  "Cap|Electricity|Storage|Battery",
   "Cap|Electricity|Hydro",
-  "Cap|Electricity|Nuclear",  
+  "Cap|Electricity|Hydrogen",
   "Cap|Electricity|Geothermal",
   "Cap|Electricity|Biomass",
   "Cap|Electricity|Gas|w/ CC",
   "Cap|Electricity|Gas|w/o CC",
   "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")
@@ -111,6 +111,106 @@ showLinePlots(data, "Cap|Electricity|Storage|Battery")
 ```
 
 
+## Capacities Hydrogen
+### Mix of Hydrogen Capacities
+```{r Capacities Hydrogen}
+items <- c(
+  "Cap|Hydrogen|Electricity",
+  "Cap|Hydrogen|Biomass|w/o CC",
+  "Cap|Hydrogen|Biomass|w/ CC",
+  "Cap|Hydrogen|Gas|w/ CC",
+  "Cap|Hydrogen|Gas|w/o CC",
+  "Cap|Hydrogen|Coal|w/ CC",
+  "Cap|Hydrogen|Coal|w/o CC",
+  NULL
+  )
+showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
+```
+
+### Electricity
+```{r Cap Electricity}
+showLinePlots(data, "Cap|Hydrogen|Electricity")
+```
+
+```{r Cap Electricity in GW_el}
+showLinePlots(data, "Cap (GWel)|Hydrogen|Electricity")
+```
+
+### Biomass
+```{r Cap Biomass}
+showLinePlots(data, "Cap|Hydrogen|Biomass")
+```
+
+### Biomass w/o CCS
+```{r Cap Biomass w/o CCS}
+showLinePlots(data, "Cap|Hydrogen|Biomass|w/o CC")
+```
+
+### Biomass w/ CCS
+```{r Cap Biomass w/ CCS}
+showLinePlots(data, "Cap|Hydrogen|Biomass|w/ CC")
+```
+
+### Coal
+```{r Cap Coal}
+showLinePlots(data, "Cap|Hydrogen|Coal")
+```
+
+### Gas
+```{r Cap Gas}
+showLinePlots(data, "Cap|Hydrogen|Gas")
+```
+
+### Gas w/o CC
+```{r Cap Gas w/o CC}
+showLinePlots(data, "Cap|Hydrogen|Gas|w/o CC")
+```
+
+### Gas w/ CC
+```{r Cap Gas w/ CC}
+showLinePlots(data, "Cap|Hydrogen|Gas|w/ CC")
+```
+
+## Capacities Heat
+### Mix of Heat Capacities
+```{r Capacities Heat}
+items <- c(
+  "Cap|Heat|Solar",
+  "Cap|Heat|Electricity|Heat Pump",
+  "Cap|Heat|Biomass",
+  "Cap|Heat|Gas",
+  "Cap|Heat|Coal",
+  NULL
+  )
+showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
+```
+
+### Electricity Heat Pump
+```{r Cap Electricity}
+showLinePlots(data, "Cap|Heat|Electricity|Heat Pump")
+```
+
+### Biomass
+```{r Cap Biomass}
+showLinePlots(data, "Cap|Heat|Biomass")
+```
+
+### Solar
+```{r Cap Solar}
+showLinePlots(data, "Cap|Heat|Solar")
+```
+
+### Gas
+```{r Cap Gas}
+showLinePlots(data, "Cap|Heat|Gas")
+```
+
+### Coal
+```{r Cap Coal}
+showLinePlots(data, "Cap|Heat|Coal")
+```
+
+
 ## PE Extraction (before trade)
 ### PE Coal Extraction
 ```{r PE Coal Extraction}
@@ -259,15 +359,17 @@ showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 tot <- "SE|Electricity"
 
 items <- c(
+  "SE|Input|Electricity|T&D losses",
+  "SE|Input|Electricity|Self Consumption Energy System",
   "SE|Input|Electricity|Hydrogen|Synthetic Fuels|Liquids",
   "SE|Input|Electricity|Hydrogen|Synthetic Fuels|Gases",
   "SE|Input|Electricity|Hydrogen|direct FE H2",
   "SE|Input|Electricity|Hydrogen|Electricity Storage",
   "SE|Input|Electricity|Buildings",
   "SE|Input|Electricity|Industry",
   "SE|Input|Electricity|Transport",
-  "SE|Input|Electricity|CDR",
-  "SE|Input|Electricity|Self Consumption Energy System")
+  "SE|Input|Electricity|CDR"
+)
 
 showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 ```
@@ -285,6 +387,17 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 ```
 
+### SE Heat - Usage
+```{r SE Heat - Usage}
+
+tot <- "SE|Heat"
+
+items <- c(
+  "SE|Input|Heat|T&D losses",
+  "FE|Industry|Heat",
+  "FE|Buildings|Heat")
+showAreaAndBarPlots(data, items, tot, scales = "fixed")
+```
 
 ### SE Hydrogen
 ```{r SE Hydrogen}
@@ -312,6 +425,7 @@ showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 tot <- "SE|Hydrogen"
 
 items <- c(
+  "SE|Input|Hydrogen|T&D losses",
   "FE|Industry|Hydrogen",
   "FE|Buildings|Hydrogen",
   "FE|Transport|Hydrogen",
@@ -343,7 +457,7 @@ showAreaAndBarPlots(data, items, tot, scales = "fixed")
 tot <- "SE|Solids"
 
 items <- c(
-  "SE|Solids|Input|T&D Losses",
+  "SE|Input|Solids|T&D losses",
   "FE|CDR|Solids",
   "FE|Transport|Solids",  
   "FE|Buildings|Solids",
@@ -379,7 +493,7 @@ showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 tot <- "SE|Liquids"
 
 items <- c(
-  "SE|Liquids|Input|T&D Losses",
+  "SE|Input|Liquids|T&D losses",
   "FE|CDR|Liquids",
   "FE|Buildings|Liquids",
   "FE|Non-energy Use|Industry|Liquids",
@@ -412,7 +526,7 @@ showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 tot <- "SE|Gases"
 
 items <- c(
-  "SE|Gases|Input|T&D Losses",
+  "SE|Input|Gases|T&D losses",
   "FE|CDR|Gases",
   "FE|Transport|Bunkers|Gases",
   "FE|Transport|w/o Bunkers|Gases",
@@ -494,14 +608,17 @@ showLinePlots(data, "SE|Heat|Electricity|Heat Pump")
 ### SE Hydrogen
 ```{r SE Hydrogen detail line}
 
-showLinePlots(data,  "SE|Hydrogen|Coal|w/ CC")
-showLinePlots(data,  "SE|Hydrogen|Coal|w/o CC")
-showLinePlots(data,  "SE|Hydrogen|Gas|w/ CC")
-showLinePlots(data,  "SE|Hydrogen|Gas|w/o CC")
+showLinePlots(data,  "SE|Hydrogen|Electricity|Standard Electrolysis")
+showLinePlots(data,  "SE|Hydrogen|Electricity|VRE Storage Electrolysis")
+showLinePlots(data,  "SE|Hydrogen|Biomass")
 showLinePlots(data,  "SE|Hydrogen|Biomass|w/ CC")
 showLinePlots(data,  "SE|Hydrogen|Biomass|w/o CC")
-showLinePlots(data,  "SE|Hydrogen|Electricity|VRE Storage Electrolysis")
-showLinePlots(data,  "SE|Hydrogen|Electricity|Standard Electrolysis")
+showLinePlots(data,  "SE|Hydrogen|Gas")
+showLinePlots(data,  "SE|Hydrogen|Gas|w/ CC")
+showLinePlots(data,  "SE|Hydrogen|Gas|w/o CC")
+showLinePlots(data,  "SE|Hydrogen|Coal")
+showLinePlots(data,  "SE|Hydrogen|Coal|w/ CC")
+showLinePlots(data,  "SE|Hydrogen|Coal|w/o CC")
 showLinePlots(data,  "SE|Hydrogen|Net Imports")
 
 ```