read csv instead of toolreadSets

Fsioutas · Fsioutas · commit 5c6c62e3bc51 · 2024-11-26T10:09:41.000+02:00
diff --git a/R/calcIAvailRate.R b/R/calcIAvailRate.R
@@ -23,8 +23,11 @@ calcIAvailRate <- function() {
   fEndHorizon <- readEvalGlobal(system.file(file.path("extdata", "main.gms"), package = "mrprom"))["fEndHorizon"]
 
   # Get power plant set from GAMS code
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "PGALL")
-  set_pgall <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(name = "PGALL.csv",
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  set_pgall <- as.character(sets[, 1])
 
   df <- data.frame(variable = set_pgall,
                    period = 2020,
diff --git a/R/calcIDataElecProd.R b/R/calcIDataElecProd.R
@@ -27,8 +27,11 @@ calcIDataElecProd <- function() {
   x <- x[, c(max(fStartHorizon, min(getYears(x, as.integer = TRUE))) : max(getYears(x, as.integer = TRUE))), ]
 
   # load current OPENPROM set configuration
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "PGALL")
-  sets <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(name = "PGALL.csv",
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
 
   # use enerdata-openprom mapping to extract correct data from source
   map <- toolGetMapping(name = "prom-enerdata-elecprod-mapping.csv",
diff --git a/R/calcIDataGrossInlCons.R b/R/calcIDataGrossInlCons.R
@@ -45,8 +45,11 @@ calcIDataGrossInlCons <- function() {
     as.magpie()
 
   # load OPENPROM EFS set
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "EFS")
-  sets <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(name = "EFS.csv",
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
 
   ## Only keep items with the Mtoe unit
   x <- x[, , "Mtoe", pmatch = TRUE]
diff --git a/R/calcIDataTransTech.R b/R/calcIDataTransTech.R
@@ -43,11 +43,17 @@ calcIDataTransTech <- function() {
                         type = "sectoral",
                         where = "mrprom")
   # load current OPENPROM set configuration
-  TRANSFINAL <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "TRANSFINAL")
-  TRANSFINAL <- unlist(strsplit(TRANSFINAL[, 1], ","))
+  TRANSFINAL <- toolGetMapping(name = "TRANSE.csv",
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  TRANSFINAL <- as.character(TRANSFINAL[, 1])
 
-  TTECH <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "TTECH")
-  TTECH <- unlist(strsplit(TTECH[, 1], ","))
+  TTECH <- toolGetMapping(name = "TTECH.csv",
+                               type = "blabla_export",
+                               where = "mrprom")
+  
+  TTECH <- as.character(TTECH[, 1])
   
   #make dataframe with all the available variables
   x <- as.data.frame(expand.grid(TTECH, TRANSFINAL, years))
diff --git a/R/calcIDecomPlants.R b/R/calcIDecomPlants.R
@@ -29,8 +29,12 @@ calcIDecomPlants <- function() {
   x <- x %>% drop_na(period)
 
   # load current OPENPROM set configuration
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "PGALL")
-  sets <- unlist(strsplit(sets[, 1], ","))
+  
+  sets <- toolGetMapping(name = "PGALL.csv",
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
 
   # use iInvPlants-openprom mapping to extract correct data from source
   map <- toolGetMapping(name = "iInvPlants-mapping.csv",
diff --git a/R/calcIEnvPolicies.R b/R/calcIEnvPolicies.R
@@ -80,9 +80,11 @@ calcIEnvPolicies <- function() {
   
   
   # load current OPENPROM set configuration
-  POLICIES_set <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "POLICIES_set")
-  POLICIES_set <- unlist(strsplit(POLICIES_set[, 1], ","))
-  POLICIES_set <- POLICIES_set[c(1, 3:5, 11:13)]
+  sets <- toolGetMapping(name = "POLICIES_set.csv",
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  POLICIES_set <- as.character(sets[c(sets[, 1] %in% c("TRADE", "OPT", "REN", "EFF", "exogCV_NPi", "exogCV_1_5C", "exogCV_2C")), 1])
 
   x <- expand_grid(POLICIES_set, unique(qx["region"]), unique(qx["period"]))
   x["value"] <- NA
diff --git a/R/calcIFuelCons.R b/R/calcIFuelCons.R
@@ -32,8 +32,11 @@ calcIFuelCons <- function(subtype = "DOMSE") {
   x <- x[, c(fStartHorizon:lastYear), ]
 
   # load current OPENPROM set configuration
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), subtype)
-  sets <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(paste0(subtype, ".csv"),
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
 
   # use enerdata-openprom mapping to extract correct data from source
   map <- toolGetMapping(name = "prom-enerdata-fucon-mapping.csv",
diff --git a/R/calcIFuelPrice.R b/R/calcIFuelPrice.R
@@ -37,9 +37,11 @@ calcIFuelPrice <- function() {
   for (i in c("NENSE", "DOMSE", "INDSE", "TRANSE", "PG")) { # define main OPEN-PROM sectors that we need data for
     sets <- NULL
     # load current OPENPROM set configuration for each sector
-    try(sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), i))
-    try(sets <- unlist(strsplit(sets[, 1], ",")))
-    if (is.null(sets)) sets <- i
+    try(sets <- toolGetMapping(paste0(i, ".csv"),
+                               type = "blabla_export",
+                               where = "mrprom"))
+    try(sets <- as.character(sets[, 1]))
+    if (length(sets) == 0) sets <- i
 
     ## filter mapping to keep only i sectors
     map <- filter(map0, map0[, "SBS"] %in% sets)
diff --git a/R/calcIInvPlants.R b/R/calcIInvPlants.R
@@ -28,8 +28,11 @@ calcIInvPlants <- function() {
   x <- x %>% drop_na(period)
 
   # load current OPENPROM set configuration
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "PGALL")
-  sets <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(paste0("PGALL.csv"),
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
 
   # use iInvPlants-openprom mapping to extract correct data from source
   map <- toolGetMapping(name = "iInvPlants-mapping.csv",
diff --git a/R/calcIMatFacPlaAvailCap.R b/R/calcIMatFacPlaAvailCap.R
@@ -22,8 +22,11 @@ calcIMatFacPlaAvailCap <- function() {
   fEndHorizon <- readEvalGlobal(system.file(file.path("extdata", "main.gms"), package = "mrprom"))["fEndHorizon"]
 
   # load current OPENPROM set configuration
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "PGALL")
-  sets <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(paste0("PGALL.csv"),
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
 
   sets_remove <- c("CTHBMSWAS", "CCCGT", "PGLHYD", "PGSHYD", "PGWND", "PGSOL",
                    "PGANUC", "PGAPSS", "PGAPSSL", "PGACGSL", "PGACGS", "PGAGGS")
diff --git a/R/calcIMaxResPot.R b/R/calcIMaxResPot.R
@@ -32,8 +32,11 @@ calcIMaxResPot <- function() {
   q1 <- as.quitte(a1)
   q2 <- as.quitte(a2)
 
-  PGRENEF <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "PGRENEF")
-  PGRENEF <- unlist(strsplit(PGRENEF[, 1], ","))
+  PGRENEF <- toolGetMapping(paste0("PGRENEF.csv"),
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  PGRENEF <- as.character(sets[, 1])
 
   #rename the variables
   q1[["variable"]] <- ifelse(q1[["variable"]] == "wind onshore", PGRENEF[3], as.character(q1[["variable"]]))
diff --git a/R/calcIPriceFuelsInt.R b/R/calcIPriceFuelsInt.R
@@ -22,8 +22,11 @@ calcIPriceFuelsInt <- function() {
   spot <- readSource("ENERDATA2", subtype = "spot", convert = FALSE)
 
   # Read the WEF set including fossil fuels
-  promnames <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "WEF")
-  promnames <- unlist(strsplit(promnames[, 1], ","))
+  promnames <- toolGetMapping(paste0("WEF.csv"),
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  promnames <- as.character(sets[, 1])
 
   # Get time range from GAMS code
   fStartHorizon <- readEvalGlobal(system.file(file.path("extdata", "main.gms"), package = "mrprom"))["fStartHorizon"]
diff --git a/R/calcISuppPrimprod.R b/R/calcISuppPrimprod.R
@@ -27,8 +27,12 @@ calcISuppPrimprod <- function() {
   x <- x[, c(max(fStartHorizon, min(getYears(x, as.integer = TRUE))) : max(getYears(x, as.integer = TRUE))), ]
 
   # load current OPENPROM set configuration
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), "PPRODEF")
-  sets <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(paste0("PPRODEF.csv"),
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
+  
 
   # use enerdata-openprom mapping to extract correct data from source
   map <- toolGetMapping(name = "prom-enerdata-primaryproduction-mapping.csv",
diff --git a/R/calcNavigate.R b/R/calcNavigate.R
@@ -27,8 +27,11 @@ calcNavigate <- function(subtype = "DOMSE") {
   # filter years
   fStartHorizon <- readEvalGlobal(system.file(file.path("extdata", "main.gms"), package = "mrprom"))["fStartHorizon"]
   # load current OPENPROM set configuration
-  sets <- toolreadSets(system.file(file.path("extdata", "sets.gms"), package = "mrprom"), subtype)
-  sets <- unlist(strsplit(sets[, 1], ","))
+  sets <- toolGetMapping(paste0(subtype, ".csv"),
+                         type = "blabla_export",
+                         where = "mrprom")
+  
+  sets <- as.character(sets[, 1])
   
   # use navigate-openprom mapping to extract correct data from source
   map <- toolGetMapping(name = "prom-navigate-fucon-mapping.csv",
diff --git a/R/fullVALIDATION.R b/R/fullVALIDATION.R
