for sectoral FE pGDP plots, only change documentation and variable na…

…mes so it is more obvious that it is divided by GDP_PPP not GDP_MER

inst/markdown/compareScenarios2/cs2_02_macro.Rmd

@@ -206,25 +206,25 @@ walk(vars, showLinePlots, data = data)
 
 ## FE intensity of GDP
 
-```{r FE intensity of GDP}
+```{r FE intensity of GDP_PPP}
 items <- c(
-  "FE|Transport pGDP",
-  "FE|Buildings pGDP",
-  "FE|Industry pGDP")
+  "FE|Transport pGDP_PPP",
+  "FE|Buildings pGDP_PPP",
+  "FE|Industry pGDP_PPP")
 showAreaAndBarPlots(data, items, scales = "fixed")
 ```
 
-## FE intensity of GDP, linegraph (by GDP)
+## FE intensity of GDP_PPP, linegraph (by pGDP_PPP)
 
-```{r FE intensity of GDP, linegraph}
+```{r FE intensity of GDP_PPP, linegraph}
 dIea <-
   data %>%
   # To make the plots less crowded, show only IEA historical data.
   filter(scenario != "historical" | model == "IEA")
 items <- c(
-  "FE|Transport pGDP",
-  "FE|Buildings pGDP",
-  "FE|Industry pGDP")
+  "FE|Transport pGDP_PPP",
+  "FE|Buildings pGDP_PPP",
+  "FE|Industry pGDP_PPP")
 showMultiLinePlots(dIea, items, scales = "fixed")
 showMultiLinePlotsByVariable(dIea, items, "GDP|PPP pCap", scales = "fixed")
 ```

inst/markdown/compareScenarios2/cs2_main.Rmd

@@ -334,7 +334,7 @@ data <-
 ```
 
 
-```{r calculate pGDP variables}
+```{r calculate pGDP_PPP variables}
 dataGDP <-
   data %>%
   filter(variable == "GDP|PPP pCap") %>%
@@ -345,10 +345,10 @@ dataGDP <-
   rename(gdp = value)
 
 # For all variables in following table, add a new variable to data with the name
-# "OldName pGDP". Calculate its value by
+# "OldName pGDP_PPP". Calculate its value by
 #     OldValue / (GDP|PPP pCap) * conversionFactor
 # and set its unit to newUnit.
-# The new variable "OldName pGDP" will be available in the plot sections.
+# The new variable "OldName pGDP_PPP" will be available in the plot sections.
 pGdpVariables <- tribble(
   ~variable, ~newUnit, ~conversionFactor,
   "FE", "MJ/US$2005", 1e3,
@@ -363,8 +363,8 @@ dataPGdp <-
   left_join(dataGDP, c("scenario", "region", "period")) %>%
   mutate(
     value = value / gdp * conversionFactor,
-    variable = paste0(variable, " pGDP"),
-    varplus = paste0(varplus, " pGDP"),
+    variable = paste0(variable, " pGDP_PPP"),
+    varplus = paste0(varplus, " pGDP_PPP"),
     unit = newUnit,
     newUnit = NULL, conversionFactor = NULL, gdp = NULL)