From 660e11fa8287bffd11a3ff79eb1fe49a3fd58d62 Mon Sep 17 00:00:00 2001
From: robertpietzcker <pietzcker@pik-potsdam.de>
Date: Wed, 10 Jul 2024 20:52:01 +0200
Subject: [PATCH 1/3] cs2: added plots, added intermediate bookmarks/headers

---
 inst/compareScenarios/cs_03_emissions.Rmd     |  59 ++--
 inst/compareScenarios/cs_04_energy_supply.Rmd |  83 ++++-
 inst/compareScenarios/cs_05_energy_demand.Rmd | 298 +++++++++++++-----
 .../cs_09_carbon_management.Rmd               |  81 +++--
 4 files changed, 396 insertions(+), 125 deletions(-)

diff --git a/inst/compareScenarios/cs_03_emissions.Rmd b/inst/compareScenarios/cs_03_emissions.Rmd
index f2441f61..78109815 100644
--- a/inst/compareScenarios/cs_03_emissions.Rmd
+++ b/inst/compareScenarios/cs_03_emissions.Rmd
@@ -1,3 +1,5 @@
+\newpage
+
 # Emissions
 
 ## GHG - total
@@ -14,23 +16,36 @@ showLinePlotsWithTarget(data, items)
 showLinePlots(data, "Emi|GHG|w/ Bunkers")
 ```
 
+```{r GHG - total with national LULUCF accounting - should match UNFCCC reporting}
+showLinePlots(data, "Emi|GHG|w/ Bunkers|LULUCF national accounting")
+```
+
 
 ##  GHG Sectors
 
-```{r GHG Sectors}
-items <- c(
-  "Emi|GHG|Energy",
-  "Emi|GHG|Industrial Processes",
-  "Emi|GHG|Agriculture",
-  "Emi|GHG|Waste")
-walk(items, showLinePlots, data = data)
+### GHG Energy
+```{r GHG Energy}
+showLinePlots(data, "Emi|GHG|Energy")
+```
+
+### GHG Industrial Processes
+```{r GHG Industrial Processes}
+showLinePlots(data, "Emi|GHG|Industrial Processes")
+```
+
+### GHG Agriculture
+```{r GHG Agriculture}
+showLinePlots(data, "Emi|GHG|Agriculture")
 ```
 
+### GHG Waste
+```{r GHG Waste}
+showLinePlots(data, "Emi|GHG|Waste")
+```
 
 ## GHG - Market
 
 ### ETS
-
 ```{r GHG ETS}
 items <- "Emi|GHG|ETS"
 showLinePlots(data, items)
@@ -39,7 +54,6 @@ showLinePlotsWithTarget(data, items)
 
 
 ### ESR
-
 ```{r GHG ESR}
 items <- "Emi|GHG|ESR"
 showLinePlots(data, items)
@@ -50,16 +64,13 @@ Note: Reduction targets wrt 2005
 
 
 ### Other - Outside ETS and ESR
-
 ```{r GHG Other}
 showLinePlots(data, "Emi|GHG|Outside ETS and ESR")
 ```
 
 
 ## CO2
-
 ### CO2 by sector (net emissions, incl. BECCS)
-
 ```{r CO2 by sector net incl. BECCS}
 tot <- "Emi|CO2"
 items <- c(
@@ -214,7 +225,7 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, scales = "fixed")
 ```
 
-### Process Emissions Cement
+#### Process Emissions Cement
 
 ```{r}
 items <- c(
@@ -225,7 +236,7 @@ showLinePlots(data, items)
 ```
 
 
-### Process Emissions Chemicals
+#### Process Emissions Chemicals
 
 ```{r}
 items <- c(
@@ -233,7 +244,7 @@ items <- c(
 showLinePlots(data, items)
 ```
 
-### Process Emissions Metals
+#### Process Emissions Metals
 
 ```{r}
 items <- c(
@@ -250,6 +261,14 @@ items <- c(
 showLinePlots(data, items)
 ```
 
+```{r CO2 Land-Use Change - LULUCF national accounting}
+items <- c(
+  "Emi|CO2|Land-Use Change|LULUCF national accounting", # scenario
+  "Emi|CO2|Land Use") # historical
+showLinePlots(data, items)
+```
+
+
 
 ### non-BECCS CDR
 
@@ -258,8 +277,8 @@ showLinePlots(data, "Emi|CO2|non-BECCS CDR")
 ```
 
 ### CDR
-
-```{r CO2 CDR}
+#### CDR compared to other CO2 emissions
+```{r CDR compared to other CO2 emissions}
 tot <- "Emi|CO2"
 items <- c(
   "Emi|CO2|Gross|Energy and Industrial Processes",
@@ -272,7 +291,7 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, scales = "fixed")
 ```
 
-
+#### Only CDR
 ```{r CO2 CDR Detail}
 tot <- "Emi|CO2|CDR"
 items <- c(
@@ -286,8 +305,8 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, scales = "fixed")
 ```
 
-
-```{r CO2 CDR Subcategories}
+#### CDR Subcategories - Line
+```{r CO2 CDR Subcategories - Line}
 cdrVars <-
   levels(data$variable) %>%
   str_subset(fixed("Emi|CO2|CDR|"))
diff --git a/inst/compareScenarios/cs_04_energy_supply.Rmd b/inst/compareScenarios/cs_04_energy_supply.Rmd
index 3a5d0494..d2b5cda1 100644
--- a/inst/compareScenarios/cs_04_energy_supply.Rmd
+++ b/inst/compareScenarios/cs_04_energy_supply.Rmd
@@ -31,12 +31,12 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 
 ```{r Capacities Electricity}
 items <- c(
-  "Cap|Electricity|Storage|Battery",
   "Cap|Electricity|Solar",
   if ("Cap|Electricity|Wind|Offshore" %in% levels(data$variable))
     c("Cap|Electricity|Wind|Onshore", "Cap|Electricity|Wind|Offshore")
   else
     "Cap|Electricity|Wind",
+  "Cap|Electricity|Storage|Battery",
   "Cap|Electricity|Hydro",
   "Cap|Electricity|Nuclear",  
   "Cap|Electricity|Geothermal",
@@ -115,6 +115,7 @@ items <- c(
 showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 ```
 
+
 ### PE Gas
 ```{r PE Gas}
 items <- c(
@@ -132,7 +133,6 @@ showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 
 
 ### PE Biomass
-
 ```{r PE Biomass}
 items <- c(
   "PE|Biomass|Hydrogen|w/ CC",
@@ -148,16 +148,45 @@ items <- c(
 showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 ```
 
-## Primary Energy line plots
+### PE Oil
+```{r PE Oil}
+items <- c(
+  "PE|Oil",
+  NULL)
+showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
+```
 
-```{r Primary Energy line plots}
+## Primary Energy line plots
+### PE Coal - Line
+```{r PE Coal}
 showLinePlots(data, "PE|Coal")
+```
+
+### PE Oil - Line
+```{r PE Oil}
 showLinePlots(data, "PE|Oil")
+```
+
+### PE Gas - Line
+```{r PE Gas}
 showLinePlots(data, "PE|Gas")
+```
+
+### PE Biomass - Line
+```{r PE Biomass}
 showLinePlots(data, "PE|Biomass")
+```
+
+### PE Biomass - Energy Crops - Line
+```{r PE Biomass - Energy Crops}
 showLinePlots(data, "Primary Energy Production|Biomass|Energy Crops")
 ```
 
+### PE Geothermal - Line
+```{r PE Geothermal}
+showLinePlots(data, "PE|Geothermal")
+```
+
 ### PE Coal Extraction
 ```{r PE Coal Extraction}
 showLinePlots(data, "Res|Extraction|Coal")
@@ -175,9 +204,7 @@ showLinePlots(data, "Res|Extraction|Gas")
 
 ## Secondary Energy Mixes
 
-
 ### SE Electricity
-
 ```{r SE Electricity}
 
 tot <- "SE|Electricity"
@@ -289,6 +316,20 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, scales = "fixed")
 ```
 
+### SE Solids - Usage
+```{r SE Solids - Usage}
+
+tot <- "SE|Solids"
+
+items <- c(
+  "SE|Solids|Input|T&D Losses",
+  "FE|CDR|Solids",
+  "FE|Transport|Solids",  
+  "FE|Buildings|Solids",
+  "FE|Non-energy Use|Industry|Solids",  
+  "FE|w/o Non-energy Use|Industry|Solids")
+showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
 
 ### SE Liquids
 
@@ -311,6 +352,22 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 ```
 
+### SE Liquids - Usage
+```{r SE Liquids - Usage}
+
+tot <- "SE|Liquids"
+
+items <- c(
+  "SE|Liquids|Input|T&D Losses",
+  "FE|CDR|Liquids",
+  "FE|Buildings|Liquids",
+  "FE|Non-energy Use|Industry|Liquids",
+  "FE|w/o Non-energy Use|Industry|Liquids",
+  "FE|Transport|Bunkers|Liquids",
+  "FE|Transport|w/o Bunkers|Liquids")
+showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
+
 ### SE Gases
 ```{r SE Gases}
 
@@ -328,7 +385,21 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars="user", scales = "fixed")
 ```
 
+### SE Gases - Usage
+```{r SE Gases - Usage}
+
+tot <- "SE|Gases"
 
+items <- c(
+  "SE|Gases|Input|T&D Losses",
+  "FE|CDR|Gases",
+  "FE|Transport|Bunkers|Gases",
+  "FE|Transport|w/o Bunkers|Gases",
+  "FE|Buildings|Gases",
+  "FE|Non-energy Use|Industry|Gases",
+  "FE|w/o Non-energy Use|Industry|Gases")
+showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
 
 
 
diff --git a/inst/compareScenarios/cs_05_energy_demand.Rmd b/inst/compareScenarios/cs_05_energy_demand.Rmd
index 5b47d4d8..36a81e0d 100644
--- a/inst/compareScenarios/cs_05_energy_demand.Rmd
+++ b/inst/compareScenarios/cs_05_energy_demand.Rmd
@@ -1,8 +1,6 @@
 # Energy Demand
 
-## Final Energy total
-
-### Basics
+## Final Energy all sectors
 
 ```{r Final Energy total}
 tot <- "FE"
@@ -17,32 +15,54 @@ items <- c(
 )
 ```
 
-\newpage
-
-#### FE Area Plots
-
-```{r FE Area Plots}
+### FE all sectors by carrier - Bar 
+```{r FE all sectors by carrier - Bar }
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
+
+### FE all sectors - carrier share - Bar 
+```{r FE all sectors - carrier share - Bar  }
 showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE)
 ```
 
-#### FE Line Plots
+### FE Line Plots
+#### Electricity
+```{r Electricity}
+showLinePlots(data, "FE|Electricity")
+```
+
+#### Liquids
+```{r Liquids}
+showLinePlots(data, "FE|Liquids")
+```
+
+#### Gases
+```{r Gases}
+showLinePlots(data, "FE|Gases")
+```
+
+#### Solids
+```{r Solids}
+showLinePlots(data, "FE|Solids")
+```
 
-```{r FE Line Plots}
-showLinePlots(data, tot)
-walk(items, showLinePlots, data = data)
+#### Hydrogen
+```{r Hydrogen}
+showLinePlots(data, "FE|Hydrogen")
 ```
 
-#### FE Electricity Share
+#### Heat
+```{r Heat}
+showLinePlots(data, "FE|Heat")
+```
 
+### FE Electricity Share
 ```{r FE Electricity Share}
 showLinePlots(data, "FE|Electricity|Share")
 ```
 
 ## Buildings Final Energy
 
-### Basics
-
 ```{r Buildings Final Energy}
 tot <- "FE|Buildings"
 items <- c(
@@ -73,23 +93,53 @@ items2 <- c(
 
 \newpage
 
-#### FE Buildings Area Plots
-
-```{r FE Buildings Area Plots}
+### FE Buildings by carrier - Bar
+```{r FE Buildings by carrier - Bar}
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
+
+### FE Buildings - carrier share - Bar 
+```{r FE Buildings - carrier share - Bar  }
 showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE)
+```
+
+### FE Buildings by carrier (detail) - Bar 
+```{r FE Buildings by carrier (detail) - Bar  }
 showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed")
 ```
 
-#### FE Buildings Line Plots
+### FE Buildings Line Plots
+#### Electricity
+```{r Electricity}
+showLinePlots(data, "FE|Buildings|Electricity")
+```
+
+#### Liquids
+```{r Liquids}
+showLinePlots(data, "FE|Buildings|Liquids")
+```
 
-```{r FE Buildings Line Plots}
-showLinePlots(data, tot)
-walk(items, showLinePlots, data = data)
+#### Gases
+```{r Gases}
+showLinePlots(data, "FE|Buildings|Gases")
 ```
 
-#### Electricity Share in Buildings Final Energy
+#### Solids
+```{r Solids}
+showLinePlots(data, "FE|Buildings|Solids")
+```
 
+#### Hydrogen
+```{r Hydrogen}
+showLinePlots(data, "FE|Buildings|Hydrogen")
+```
+
+#### Heat
+```{r Heat}
+showLinePlots(data, "FE|Buildings|Heat")
+```
+
+### Electricity Share in Buildings Final Energy
 ```{r Electricity Share in Buildings Final Energy}
 showLinePlots(data, "FE|Buildings|Electricity|Share")
 ```
@@ -97,8 +147,6 @@ showLinePlots(data, "FE|Buildings|Electricity|Share")
 
 ## Industry Final Energy
 
-### Basics
-
 ```{r Industry Final Energy}
 tot <- "FE|Industry"
 items <- c(
@@ -128,28 +176,79 @@ items2 <- c(
 
 \newpage
 
-#### FE Industry Area Plots
-
-```{r FE Industry Area Plots}
+### FE Industry by carrier - Bar
+```{r FE Industry by carrier - Bar}
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
+
+### FE Industry - carrier share - Bar 
+```{r FE Industry - carrier share - Bar  }
 showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE)
+```
+
+### FE Industry by carrier (detail) - Bar 
+```{r FE Industry by carrier (detail) - Bar  }
 showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed")
 ```
 
 #### FE Industry Line Plots
+#### Electricity
+```{r Electricity}
+showLinePlots(data, "FE|Industry|Electricity")
+```
 
-```{r FE Industry Line Plots}
-showLinePlots(data, tot)
-walk(items, showLinePlots, data = data)
+#### Liquids
+```{r Liquids}
+showLinePlots(data, "FE|Industry|Liquids")
 ```
 
-#### Electricity Share in Industry Final Energy
+#### Gases
+```{r Gases}
+showLinePlots(data, "FE|Industry|Gases")
+```
 
-```{r Electricity Share in Industry Final Energy}
+#### Solids
+```{r Solids}
+showLinePlots(data, "FE|Industry|Solids")
+```
+
+#### Hydrogen
+```{r Hydrogen}
+showLinePlots(data, "FE|Industry|Hydrogen")
+```
+
+#### Heat
+```{r Heat}
+showLinePlots(data, "FE|Industry|Heat")
+```
+
+### Electricity Share in Industry FE
+```{r Electricity Share in Industry FE}
 showLinePlots(data, "FE|Industry|Electricity|Share")
 ```
 
-### FE mix Steel
+### FE Industry Subsectors
+#### Steel
+```{r Steel}
+showLinePlots(data, "FE|Industry|Steel")
+```
+
+#### Cement
+```{r Cement}
+showLinePlots(data, "FE|Industry|Cement")
+```
+
+#### Chemicals
+```{r Chemicals}
+showLinePlots(data, "FE|Industry|Chemicals")
+```
+
+#### Other Industry
+```{r Other Industry}
+showLinePlots(data, "FE|Industry|Other Industry")
+```
+
+#### FE mix Steel
 ```{r FE mix Steel}
 tot <- "FE|Industry|Steel"
 items <- c(
@@ -163,7 +262,7 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
-### FE mix Steel using process-based steel modeling by route
+#### FE mix Steel using process-based steel modeling by route
 ```{r FE mix Steel route}
 if ("FE|Industry|Steel|BF-BOF" %in% levels(data$variable)){ # if process-based steel is used
   tot <- "FE|Industry|Steel"
@@ -187,7 +286,7 @@ showAreaAndBarPlots(droute, items, tot, orderVars="user", scales = "fixed")
 }
 ```
 
-### FE mix Cement
+#### FE mix Cement
 ```{r FE mix Cement}
 tot <- "FE|Industry|Cement"
 items <- c(
@@ -201,7 +300,7 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
-### FE mix Non-metallic minerals
+#### FE mix Non-metallic minerals
 ```{r FE mix Non-metallic minerals}
 tot <- "FE|Industry|Non-metallic minerals"
 items <- c(
@@ -214,7 +313,7 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
-### FE mix Chemicals
+#### FE mix Chemicals
 ```{r FE mix Chemicals}
 tot <- "FE|Industry|Chemicals"
 items <- c(
@@ -228,14 +327,14 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, scales = "fixed")
 ```
 
-### FE Total Chemicals
+#### FE Total Chemicals
 ```{r FE Total Chemicals}
 items <- c(
   "FE|Industry|Chemicals") 
 showLinePlots(data, items)
 ```
 
-### FE mix Other Industry
+#### FE mix Other Industry
 ```{r FE mix Other Industry}
 tot <- "FE|Industry|Other Industry"
 items <- c(
@@ -250,7 +349,7 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
-### FE Industry line plots
+#### FE Industry line plots
 ```{r FE Industry line plots}
 showLinePlots(data, "FE|Industry|Steel")
 showLinePlots(data, "FE|Industry|Steel|Primary")
@@ -262,7 +361,7 @@ showLinePlots(data, c("FE|Industry|Other Industry", "FE|Industry|other"))
 ```
 
 
-### FE Non-energy Use Industry per carrier and SE origin
+#### FE Non-energy Use Industry per carrier and SE origin
 
 ```{r FE Non-energy Use Industry per carrier and SE origin}
 tot <- "FE|Non-energy Use|Industry"
@@ -280,7 +379,7 @@ showAreaAndBarPlots(data, items, tot)
 
 
 
-### Specific Energy Consumption
+#### Specific Energy Consumption
 ```{r Specific Energy Consumption}
 # estimated values for thermodynamic limits are hard coded here. Could be
 # improved
@@ -334,9 +433,17 @@ data %>%
 showLinePlots(data, 'FE|Industry|Specific Energy Consumption|Other Industry')
 ```
 
-## Transport Final Energy
 
-### Basics -- with Bunkers
+## Transport FE split bunkers vs rest - Bar
+```{r Transport FE split bunkers vs rest - Bar}
+tot <- "FE|Transport"
+items <- c(
+  "FE|Transport|Bunkers",
+  "FE|Transport|w/o Bunkers")
+showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
+
+## Transport Final Energy --- with Bunkers
 
 ```{r Transport Final Energy}
 tot <- "FE|Transport"
@@ -361,17 +468,23 @@ items2 <- c(
 
 \newpage
 
-#### FE Transport Area Plots -- with Bunkers
-
-```{r FE Transport Area Plots -- with Bunkers}
+### FE Transport w Bunkers by carrier - Bar
+```{r FE Transport w Bunkers by carrier - Bar}
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
+
+### FE Transport w/ Bunkers - carrier share - Bar 
+```{r FE Transport w/ Bunkers - carrier share - Bar  }
 showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE)
-showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed")
 ```
 
-#### FE Transport Liquid Area Plots -- with Bunkers
+### FE Transport w/ Bunkers by carrier (detail) - Bar 
+```{r FE Transport w/ Bunkers by carrier (detail) - Bar  }
+showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed")
+```
 
-```{r Transport Final Energy Synthetic Liquid - by Use}
+#### FE Transport w/ Bunkers Synfuel by mode - Bar
+```{r FE Transport w/ Bunkers Synfuel by mode - Bar}
 tot_synliq <- "FE|Transport|Liquids|Hydrogen"
 items_synliq <- c(
   "FE|Transport|Pass|Road|LDV|Liquids|Hydrogen",
@@ -389,7 +502,8 @@ showAreaAndBarPlots(data, items_synliq, tot_synliq, orderVars = "user", scales =
 
 ```
 
-```{r Transport Final Energy Biogenic Liquid - by Use}
+#### FE Transport w/ Bunkers Biofuel by mode - Bar
+```{r FE Transport w/ Bunkers Biofuel by mode - Bar}
 tot_bioliq <- "FE|Transport|Liquids|Biomass"
 items_bioliq <- c(
   "FE|Transport|Pass|Road|LDV|Liquids|Biomass",
@@ -407,21 +521,34 @@ showAreaAndBarPlots(data, items_bioliq, tot_bioliq, orderVars = "user", scales =
 
 ```
 
-#### FE Transport Line Plots -- with Bunkers
+### FE Transport w/ Bunkers - Line Plots
 
-```{r FE Transport Line Plots -- with Bunkers}
-showLinePlots(data, tot)
-walk(items, showLinePlots, data = data)
+#### Electricity
+```{r Electricity}
+showLinePlots(data, "FE|Transport|Electricity")
 ```
 
-#### Electricity Share in Transport Final Energy
+#### Liquids
+```{r Liquids}
+showLinePlots(data, "FE|Transport|Liquids")
+```
 
-```{r Electricity Share in Transport Final Energy}
-showLinePlots(data, "FE|Transport|Electricity|Share")
+#### Gases
+```{r Gases}
+showLinePlots(data, "FE|Transport|Gases")
+```
+
+#### Hydrogen
+```{r Hydrogen}
+showLinePlots(data, "FE|Transport|Hydrogen")
 ```
 
+### Electricity Share in Transport w/ Bunkers FE
+```{r Electricity Share in Transport w/ Bunkers FE}
+showLinePlots(data, "FE|Transport|Electricity|Share")
+```
 
-### Basics -- w/o Bunkers
+## Transport Final Energy -- w/o Bunkers
 
 ```{r Basics -- w/o Bunkers}
 tot <- "FE|Transport|w/o Bunkers"
@@ -444,20 +571,46 @@ items2 <- c(
 ```
 
 \newpage
-
-#### FE Transport Area Plots -- w/o Bunkers
-
-```{r FE Transport Area Plots -- w/o Bunkers}
+### FE Transport w/o Bunkers by carrier - Bar
+```{r FE Transport w/o Bunkers by carrier - Bar}
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
+```
+
+### FE Transport w/o Bunkers - carrier share - Bar 
+```{r FE Transport w/o Bunkers - carrier share - Bar  }
 showAreaAndBarPlots(data, items, tot, orderVars = "user", fill = TRUE)
+```
+
+### FE Transport w/o Bunkers by carrier (detail) - Bar 
+```{r FE Transport w/o Bunkers by carrier (detail) - Bar  }
 showAreaAndBarPlots(data, items2, tot, orderVars = "user", scales = "fixed")
 ```
 
-#### FE Transport Line Plots -- w/o Bunkers
+### FE Transport w/o Bunkers - Line Plots
+
+#### Electricity
+```{r Electricity}
+showLinePlots(data, "FE|w/o Bunkers|Transport|Electricity")
+```
 
-```{r FE Transport Line Plots -- w/o Bunkers}
-showLinePlots(data, tot)
-walk(items, showLinePlots, data = data)
+#### Liquids
+```{r Liquids}
+showLinePlots(data, "FE|w/o Bunkers|Transport|Liquids")
+```
+
+#### Gases
+```{r Gases}
+showLinePlots(data, "FE|w/o Bunkers|Transport|Gases")
+```
+
+#### Hydrogen
+```{r Hydrogen}
+showLinePlots(data, "FE|w/o Bunkers|Transport|Hydrogen")
+```
+
+### Electricity Share in Transport w/o Bunkers FE
+```{r Electricity Share in Transport w/o Bunkers FE}
+showLinePlots(data, "FE|Transport|w/o Bunkers|Electricity|Share")
 ```
 
 
@@ -479,12 +632,3 @@ items <- c(
 showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
 ```
 
-### Bunkers
-
-```{r FE Transport Bunkers}
-tot <- "FE|Transport"
-items <- c(
-  "FE|Transport|Bunkers",
-  "FE|Transport|w/o Bunkers")
-showAreaAndBarPlots(data, items, tot, orderVars = "user", scales = "fixed")
-```
diff --git a/inst/compareScenarios/cs_09_carbon_management.Rmd b/inst/compareScenarios/cs_09_carbon_management.Rmd
index f2f523ac..ca1a174d 100644
--- a/inst/compareScenarios/cs_09_carbon_management.Rmd
+++ b/inst/compareScenarios/cs_09_carbon_management.Rmd
@@ -1,18 +1,33 @@
 # Carbon Management
 
 ## Carbon Capture
-
-```{r carbon capture}
+### Capture Total - Line
+```{r Capture Total - Line}
 showLinePlots(data, "Carbon Management|Carbon Capture")
+```
+
+### Capture by type - Bar
+```{r Capture by type - Bar}
 showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture", scales = "fixed")
+```
+
+### Bio PE2SE Capture by carrier - Bar
+```{r Bio PE2SE Capture by carrier - Bar}
 showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture|Biomass|Pe2Se", scales = "fixed")
+```
+
+### Fossil PE2SE Capture by carrier - Bar
+```{r Fossil PE2SE Capture by carrier - Bar}
 showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture|Fossil|Pe2Se", scales = "fixed")
+```
 
-# industry ----
-showAreaAndBarPlotsPlus(data,
-                        "Carbon Management|Carbon Capture|Industry Energy",
-                        scales = "fixed")
+### Industry Energy Capture by PE - Bar
+```{r Industry Energy Capture by PE - Bar}
+showAreaAndBarPlotsPlus(data, "Carbon Management|Carbon Capture|Industry Energy", scales = "fixed")
+```
 
+### Industry Process Capture by sector - Bar
+```{r Industry Process Capture by sector - Bar}
 showAreaAndBarPlots(
   data = data,
   vars = rev(c('Carbon Management|Carbon Capture|Industry Energy|Cement',
@@ -23,37 +38,59 @@ showAreaAndBarPlots(
   orderVars = 'user')
 ```
 
-## Storage
+## Split Usage / Storage
+### Share of Storage in Capture - Line
+```{r Share of Storage in Capture}
+showLinePlots(data, "Carbon Management|Share of Stored CO2 from Captured CO2")
+```
+
+### Use of captured carbon - Bar
+```{r Use of captured carbon - Bar}
+showAreaAndBarPlots(data, 
+                    vars = c('Carbon Management|Storage',
+                             'Carbon Management|Usage'),
+                    tot = 'Carbon Management|Carbon Capture')
+```
 
-```{r carbon management storage}
+## Carbon Storage
+### Storage Total - Line
+```{r Storage Total - Line}
 showLinePlots(data, "Carbon Management|Storage")
+```
+
+### Storage by source type - Bar
+```{r Storage by source type - Bar}
 showAreaAndBarPlotsPlus(data, "Carbon Management|Storage", scales = "fixed")
+```
+
+### Storage from Industry Energy by PE - Bar
+```{r Storage from Industry Energy by PE - Bar}
 showAreaAndBarPlotsPlus(data, "Carbon Management|Storage|Industry Energy", scales = "fixed")
+```
+
+### Share of storage potential used
+```{r Share of storage potential used}
 showLinePlots(data, "Carbon Management|Storage|Share of annual potential used")
+```
+
+### Maximum annual storage
+```{r Maximum annual storage}
 showAreaAndBarPlots(data,
                     vars = c("Carbon Management|Storage"),
                     tot = "Carbon Management|Storage|Maximum annual CO2 storage potential")
 ```
 
-## Usage
-
-```{r carbon management usage}
+## Carbon Usage
+### Usage Total - Line
+```{r Usage Total - Line}
 showLinePlots(data, "Carbon Management|Usage")
-showAreaAndBarPlotsPlus(data, "Carbon Management|Usage", scales = "fixed")
 ```
 
-## Share
-
-```{r carbon management share}
-showLinePlots(data, "Carbon Management|Share of Stored CO2 from Captured CO2")
+### Usage for carrier - Bar
+```{r Usage for carrier - Bar}
+showAreaAndBarPlotsPlus(data, "Carbon Management|Usage", scales = "fixed")
 ```
 
-```{r}
-showAreaAndBarPlots(data, 
-                    vars = c('Carbon Management|Storage',
-                             'Carbon Management|Usage'),
-                    tot = 'Carbon Management|Carbon Capture')
-```
 
 # Materials
 

From ffd63b58349910af827dc34637c35d65c7b52b40 Mon Sep 17 00:00:00 2001
From: robertpietzcker <pietzcker@pik-potsdam.de>
Date: Thu, 11 Jul 2024 13:54:24 +0200
Subject: [PATCH 2/3] cs2: added energy service plots, both absolute as well as
 per Capita. Also adjusted units to include "pCap"

---
 .../cs_06_energy_services.Rmd                 |  67 +++++++-
 inst/compareScenarios/preprocessing.R         | 146 +++++++++---------
 2 files changed, 135 insertions(+), 78 deletions(-)

diff --git a/inst/compareScenarios/cs_06_energy_services.Rmd b/inst/compareScenarios/cs_06_energy_services.Rmd
index 4a39029c..6b4a13e1 100644
--- a/inst/compareScenarios/cs_06_energy_services.Rmd
+++ b/inst/compareScenarios/cs_06_energy_services.Rmd
@@ -153,8 +153,18 @@ showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap")
 
 
 ## Transport
-### Energy Services for Passenger Transport per Capita - LinePlot
-```{r ES Transport}
+
+### ES Pass - Line
+```{r ES Pass - Line}
+items <- c(
+  "ES|Transport|Pass",
+  "ES|Transport|Pass|Road|LDV",
+  "ES|Transport|Pass|non-LDV")
+showMultiLinePlots(data, items)
+```
+
+### ES Pass - perCap - Line
+```{r ES Pass - perCap - Line}
 items <- c(
   "ES|Transport|Pass pCap",
   "ES|Transport|Pass|Road|LDV pCap",
@@ -163,8 +173,19 @@ showMultiLinePlots(data, items)
 showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap")
 ```
 
-### Energy Services for Passenger Transport LDV per Capita - StackedBars
-```{r ES Transport passenger LDV per capita}
+### ES Pass LDV by tech - Bar
+```{r ES Pass LDV by tech - Bar}
+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|Liquids")
+showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
+```
+
+### ES Pass LDV by tech - perCap - Bar
+```{r ES Pass LDV by tech - perCap - Bar}
 items <- c(
   "ES|Transport|Pass|Road|LDV|BEV pCap",
   "ES|Transport|Pass|Road|LDV|FCEV pCap",
@@ -174,16 +195,33 @@ items <- c(
 showAreaAndBarPlots(data, items, orderVars = "user", scales = "fixed")
 ```
 
-### Energy Services for Freight Transport per Capita - LinePlot
-```{r ES transport freight per capita}
+### ES Freight - Line
+```{r ES Freight - Line}
+items <- c(
+  "ES|Transport|Freight")
+showMultiLinePlots(data, items)
+```
+
+### ES Freight - perCap - Line
+```{r ES Freight - perCap - Line}
 items <- c(
   "ES|Transport|Freight pCap")
 showMultiLinePlots(data, items)
 showMultiLinePlotsByVariable(data, items, "GDP|PPP pCap")
 ```
 
-### Energy Services for Freight Road Transport per Capita - StackedBars
-```{r ES transport freight road per capita}
+### ES Freight Road by tech - Bar
+```{r ES Freight Road by tech - Bar}
+items <- c(
+  "ES|Transport|Freight|Road|Electric",
+  "ES|Transport|Freight|Road|FCEV",
+  "ES|Transport|Freight|Road|Gases",
+  "ES|Transport|Freight|Road|Liquids")
+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|FCEV pCap",
@@ -205,6 +243,19 @@ items <- c(
 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"
+items <- c(
+  "Stock|Transport|LDV|BEV pCap",
+  "Stock|Transport|LDV|Hybrid Electric pCap",  
+  "Stock|Transport|LDV|FCEV pCap",
+  "Stock|Transport|LDV|NG pCap",
+  "Stock|Transport|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"
diff --git a/inst/compareScenarios/preprocessing.R b/inst/compareScenarios/preprocessing.R
index eed8aa2f..2b9337bf 100644
--- a/inst/compareScenarios/preprocessing.R
+++ b/inst/compareScenarios/preprocessing.R
@@ -18,71 +18,77 @@ options(mip.histRefModel = histRefModel) # nolint
 # The new variable "OldName pCap" will be available in the plot sections.
 pCapVariables <- tribble(
   ~variable, ~newUnit, ~conversionFactor,
-  "GDP|PPP", "kUS$2005", 1e6, # creates "GDP|PPP pCap" which is equal to reported variable "GDP|per capita|PPP"
-  "GDP|MER", "kUS$2005", 1e6, # creates "GDP|MER pCap" which is equal to reported variable "GDP|per capita|MER"
-  "FE", "GJ/yr", 1e9,
-  "FE|CDR", "GJ/yr", 1e9,
-  "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,
-  "ES|Transport|Pass|Road|LDV|BEV", "km/yr", 1e9,
-  "ES|Transport|Pass|Road|LDV|FCEV", "km/yr", 1e9,
-  "ES|Transport|Pass|Road|LDV|Gases", "km/yr", 1e9,
-  "ES|Transport|Pass|Road|LDV|Hybrid Electric", "km/yr", 1e9,
-  "ES|Transport|Pass|Road|LDV|Liquids", "km/yr", 1e9,
-  "ES|Transport|Freight", "tkm/yr", 1e9,
-  "ES|Transport|Freight|Road|Electric", "tkm/yr", 1e9,
-  "ES|Transport|Freight|Road|FCEV", "tkm/yr", 1e9,
-  "ES|Transport|Freight|Road|Gases", "tkm/yr", 1e9,
-  "ES|Transport|Freight|Road|Liquids", "tkm/yr", 1e9,
-  "Emi|GHG", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Gross|Energy|Supply|Electricity", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Gross|Energy|Supply|Non-electric", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Energy|Demand|Transport", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Energy|Demand|Buildings", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Gross|Energy|Demand|Industry", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Industrial Processes", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Agriculture", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Land-Use Change", "t CO2eq/yr", 1e6,
-  "Emi|GHG|Waste", "t CO2eq/yr", 1e6,
-  "Emi|CO2|CDR|BECCS", "t CO2eq/yr", 1e6,
-  "Emi|CO2|CDR|Industry CCS|Synthetic Fuels", "t CO2eq/yr", 1e6,
-  "Emi|CO2|CDR|DACCS", "t CO2eq/yr", 1e6,
-  "Emi|CO2|CDR|EW", "t CO2eq/yr", 1e6,
-  "Emi|CO2", "t CO2eq/yr", 1e6,
-  "Emi|CO2|Land-Use Change", "t CO2eq/yr", 1e6,
-  "Emi|CO2|Industrial Processes", "t CO2eq/yr", 1e6,
-  "Emi|CO2|Energy|Demand|Transport", "t CO2eq/yr", 1e6,
-  "Emi|CO2|Gross|Energy|Demand|Industry", "t CO2eq/yr", 1e6,
-  "Emi|CO2|Energy|Demand|Buildings", "t CO2eq/yr", 1e6,
-  "Emi|CO2|Gross|Energy|Supply|Non-electric", "t CO2eq/yr", 1e6,
-  "Emi|CO2|Gross|Energy|Supply|Electricity", "t CO2eq/yr", 1e6)
+  "GDP|PPP", "kUS$2005/pCap", 1e6, # creates "GDP|PPP pCap" which is equal to reported variable "GDP|per capita|PPP"
+  "GDP|MER", "kUS$2005/pCap", 1e6, # creates "GDP|MER pCap" which is equal to reported variable "GDP|per capita|MER"
+  "FE", "GJ/yr/pCap", 1e9,
+  "FE|CDR", "GJ/yr/pCap", 1e9,
+  "FE|Transport", "GJ/yr/pCap", 1e9,
+  "FE|Buildings", "GJ/yr/pCap", 1e9,
+  "FE|Industry", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|non-Heating|Electricity|Conventional", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating|Electricity|Heat pump", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating|District Heating", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating|Electricity|Resistance", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating|Hydrogen", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating|Gases", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating|Liquids", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating|Solids", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Heating", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Appliances and Light", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Cooking and Water", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Space Cooling", "GJ/yr/pCap", 1e9,
+  "FE|Buildings|Space Heating", "GJ/yr/pCap", 1e9,
+  "UE|Buildings", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|non-Heating|Electricity|Conventional", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating|Electricity|Heat pump", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating|District Heating", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating|Electricity|Resistance", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating|Hydrogen", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating|Gases", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating|Liquids", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating|Solids", "GJ/yr/pCap", 1e9,
+  "UE|Buildings|Heating", "GJ/yr/pCap", 1e9,
+  "ES|Transport|Pass", "k pkm/yr/pCap", 1e6, # use kilo-passenger-kilometer to prevent too large numbers in the plots
+  "ES|Transport|Pass|Road|LDV", "k pkm/yr/pCap", 1e6,
+  "ES|Transport|Pass|non-LDV", "k pkm/yr/pCap", 1e6,
+  "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|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|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,
+  "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,
+  "Emi|GHG|Energy|Demand|Transport", "t CO2eq/yr/pCap", 1e6,
+  "Emi|GHG|Energy|Demand|Buildings", "t CO2eq/yr/pCap", 1e6,
+  "Emi|GHG|Gross|Energy|Demand|Industry", "t CO2eq/yr/pCap", 1e6,
+  "Emi|GHG|Industrial Processes", "t CO2eq/yr/pCap", 1e6,
+  "Emi|GHG|Agriculture", "t CO2eq/yr/pCap", 1e6,
+  "Emi|GHG|Land-Use Change", "t CO2eq/yr/pCap", 1e6,
+  "Emi|GHG|Waste", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|CDR|BECCS", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|CDR|Industry CCS|Synthetic Fuels", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|CDR|DACCS", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|CDR|EW", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|Land-Use Change", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|Industrial Processes", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|Energy|Demand|Transport", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|Gross|Energy|Demand|Industry", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|Energy|Demand|Buildings", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|Gross|Energy|Supply|Non-electric", "t CO2eq/yr/pCap", 1e6,
+  "Emi|CO2|Gross|Energy|Supply|Electricity", "t CO2eq/yr/pCap", 1e6)
 
 dataPop <-
   data %>%
@@ -127,11 +133,11 @@ dataGDP <-
 # The new variable "OldName pGDP_PPP" will be available in the plot sections.
 pGdpVariables <- tribble(
   ~variable, ~newUnit, ~conversionFactor,
-  "FE", "MJ/US$2005", 1e3,
-  "FE|CDR", "MJ/US$2005", 1e3,
-  "FE|Transport", "MJ/US$2005", 1e3,
-  "FE|Buildings", "MJ/US$2005", 1e3,
-  "FE|Industry", "MJ/US$2005", 1e3
+  "FE", "MJ/US$2005/pCap", 1e3,
+  "FE|CDR", "MJ/US$2005/pCap", 1e3,
+  "FE|Transport", "MJ/US$2005/pCap", 1e3,
+  "FE|Buildings", "MJ/US$2005/pCap", 1e3,
+  "FE|Industry", "MJ/US$2005/pCap", 1e3
 )
 
 dataPGdp <-

From fe90eb32f7245fbbf927c73db3e9d0705514c93c Mon Sep 17 00:00:00 2001
From: robertpietzcker <pietzcker@pik-potsdam.de>
Date: Thu, 11 Jul 2024 14:19:21 +0200
Subject: [PATCH 3/3] lucode2::buildLibrary()

---
 .buildlibrary | 2 +-
 CITATION.cff  | 4 ++--
 DESCRIPTION   | 4 ++--
 README.md     | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.buildlibrary b/.buildlibrary
index bc26b01f..7aa33f04 100644
--- a/.buildlibrary
+++ b/.buildlibrary
@@ -1,4 +1,4 @@
-ValidationKey: '228274182'
+ValidationKey: '228425050'
 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 d121cbed..3196c85e 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.146.3
-date-released: '2024-07-10'
+version: 1.147.0
+date-released: '2024-07-11'
 abstract: Contains the REMIND-specific routines for data and model output manipulation.
 authors:
 - family-names: Rodrigues
diff --git a/DESCRIPTION b/DESCRIPTION
index 015f3d08..b4697dac 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: remind2
 Title: The REMIND R package (2nd generation)
-Version: 1.146.3
-Date: 2024-07-10
+Version: 1.147.0
+Date: 2024-07-11
 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 d96f9103..807e4f53 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # The REMIND R package (2nd generation)
 
-R package **remind2**, version **1.146.3**
+R package **remind2**, version **1.147.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.146.3, <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.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.146.3},
+  note = {R package version 1.147.0},
   url = {https://github.com/pik-piam/remind2},
 }
 ```