remove stationary calculation from calcFEdemand

pik-piam · Dec 5, 2024 · 9ec9ad0 · 9ec9ad0
1 parent 90a02f9
commit 9ec9ad0
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/R/calcFEdemand.R b/R/calcFEdemand.R
@@ -9,18 +9,9 @@ calcFEdemand <- function() {
 
   # add Navigate and Campaigners scenarios to industry and transport to match buildings scenarios by duplication
   duplicateScens <- "gdp_SSP2EU_NAV_all"
-  feTransport <- mbind(feTransport, setItems(feTransport[, , "gdp_SSP2EU"], 3.1, duplicateScens))
   feIndustry <- mbind(feIndustry, setItems(feIndustry[, , "gdp_SSP2EU"], 3.1, duplicateScens))
 
-  # add up industry and buildings contributions to stationary
-  stationaryItems <- c("fehes", "feh2s")
-  feStationary <- feIndustry[, , stationaryItems] + feBuildings[, , stationaryItems]
-
-  remind <- mbind(
-    feBuildings[, , stationaryItems, invert = TRUE],
-    feIndustry[, , stationaryItems, invert = TRUE],
-    feStationary
-  )
+  remind <- mbind(feBuildings, feIndustry)
 
   return(list(
     x = remind,