From 5cae064d428b2a5f9285082cb9e4e22ad10f54e8 Mon Sep 17 00:00:00 2001
From: Chen Gong <>
Date: Tue, 12 Dec 2023 17:53:34 +0100
Subject: [PATCH] add GDP PPP / population

---
 inst/markdown/compareScenarios2/cs2_02_macro.Rmd | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/inst/markdown/compareScenarios2/cs2_02_macro.Rmd b/inst/markdown/compareScenarios2/cs2_02_macro.Rmd
index 1813c9e0..5d283079 100644
--- a/inst/markdown/compareScenarios2/cs2_02_macro.Rmd
+++ b/inst/markdown/compareScenarios2/cs2_02_macro.Rmd
@@ -248,16 +248,18 @@ kaya <-
     emiCO2_by_FE = `Emi|CO2|Energy` / FE,
     FE_by_GDP_MER = FE / `GDP|MER`,
     FE_by_GDP_PPP = FE / `GDP|PPP`,
-    GDP_by_Pop = `GDP|MER` / Population,
-    `Emi|CO2|Energy` = NULL, FE = NULL, `GDP|MER` = NULL) %>%
+    GDP_MER_by_Pop = `GDP|MER` / Population,
+    GDP_PPP_by_Pop = `GDP|PPP` / Population,
+    `Emi|CO2|Energy` = NULL, FE = NULL, `GDP|MER` = NULL, `GDP|PPP` = NULL) %>%
   pivot_longer(
-    c(emiCO2_by_FE, FE_by_GDP_MER, FE_by_GDP_PPP, GDP_by_Pop, Population),
+    c(emiCO2_by_FE, FE_by_GDP_MER, FE_by_GDP_PPP, GDP_MER_by_Pop, GDP_PPP_by_Pop, Population),
     names_to = "variable",
     values_to = "value")
 kayaUnits <- tribble(
   ~variable, ~unit,
   "Population", "million",
-  "GDP_by_Pop", "billion US$2005/yr/million",
+  "GDP_MER_by_Pop", "billion US$2005/yr/million",
+  "GDP_PPP_by_Pop", "billion US$2005/yr/million",
   "FE_by_GDP_MER", "EJ/billion US$2005",
   "FE_by_GDP_PPP", "EJ/billion US$2005",
   "emiCO2_by_FE", "EJ/Mt CO2")