Add OAE capacity factors

pik-piam · Jul 24, 2024 · 1ba9319 · 1ba9319
1 parent 162e2e5
commit 1ba9319
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/R/readREMIND_11Regi.R b/R/readREMIND_11Regi.R
@@ -29,12 +29,8 @@ readREMIND_11Regi <- function(subtype) {
       getNames(x) <- "peoil"
       x
     },
-    "deltacapoffset"       = read.csv("p_adj_deltacapoffset.csv", sep = ";")    %>% as.magpie(datacol = 2),
-    "capacityFactorGlobal" = {
-      x <- read.csv("f_cf-global_REMIND_3.3.4.csv", sep = ";")
-      x[x$Tech == "rockgrind", "Tech"] <- "weathering"
-      as.magpie(x, datacol = 2)
-    },
+    "deltacapoffset"       = read.csv("p_adj_deltacapoffset.csv", sep = ";")     %>% as.magpie(datacol = 2),
+    "capacityFactorGlobal" = read.csv("f_cf-global_REMIND_3.3.5.csv", sep = ";") %>% as.magpie(x, datacol = 2),
     "capacityFactorRules"  = read.csv("f_cf-rules.csv", sep = ";")               %>% as.magpie(datacol = 4),
     "storageFactor"        = read.csv("storageFactor.csv", sep = ";")            %>% as.magpie(datacol = 2),
     "residuesShare"        = read.csv("residuesShare.csv", row.names = 1)        %>% as.magpie(datacol = 4),