change formula

close #425
pik-piam · Aug 14, 2023 · b2f7ca0 · b2f7ca0
1 parent 9a18b8f
commit b2f7ca0
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/R/reportCrossVariables.R b/R/reportCrossVariables.R
@@ -215,13 +215,19 @@ reportCrossVariables <- function(gdx, output = NULL, regionSubsetList = NULL,
   # Energy shares
   tmp <- mbind(
     tmp,
-    setNames( # assume 8 % for transmission losses and autoconsumption of power plants
+    setNames(
         100
       * ( output[,,"SE|Electricity|Non-Biomass Renewables (EJ/yr)"]
         + output[,,"SE|Electricity|Biomass (EJ/yr)"]
         )
-      / 1.08
-      / output[,,"FE|Electricity (EJ/yr)"],
+        # "gross electricity demand" is just the sum of electricity generation
+        #  plus imports (excluding output from pump hydro storage that has no
+        #   natural inflows)
+      / ( output[,,"SE|Electricity (EJ/yr)"]
+          # default net imports to zero if not present in data
+        + dimSums(mselect(tmp, list(d3 = 'SE|Electricity|Net Imports (EJ/yr)')),
+                  dim = 3)
+        ),
       "Secondary Energy|Electricity|Share of renewables in gross demand|Estimation (Percent)"))
 
   # Energy expenditures