Skip to content
Snippets Groups Projects
Commit b306dcea authored by Alois Dirnaichner's avatar Alois Dirnaichner
Browse files

Adapt EDGE_transport script to changed calling signature of

edgeTrpLib, see b6f2a2c6.
parent 2cb0a6c3
No related branches found
No related tags found
1 merge request!79EDGE-T Validation Output - Fix
...@@ -18,12 +18,14 @@ library(moinput) ...@@ -18,12 +18,14 @@ library(moinput)
## use cached input data for speed purpose ## use cached input data for speed purpose
setConfig(forcecache=T) setConfig(forcecache=T)
data_folder <- "EDGE-T"
mapspath <- function(fname){ mapspath <- function(fname){
file.path("../../modules/35_transport/edge_esm/input", fname) file.path("../../modules/35_transport/edge_esm/input", fname)
} }
datapath <- function(fname){ datapath <- function(fname){
file.path("input_EDGE", fname) file.path(data_folder, fname)
} }
REMINDpath <- function(fname){ REMINDpath <- function(fname){
...@@ -76,9 +78,16 @@ EDGE2teESmap <- fread(mapspath("mapping_EDGE_REMIND_transport_categories.csv")) ...@@ -76,9 +78,16 @@ EDGE2teESmap <- fread(mapspath("mapping_EDGE_REMIND_transport_categories.csv"))
## input data loading ## input data loading
input_path = paste0("../../modules/35_transport/edge_esm/input/") input_folder = paste0("../../modules/35_transport/edge_esm/input/")
if (length(list.files(path = data_folder, pattern = "RDS")) < 8) {
createRDS(input_folder, data_folder,
SSP_scenario = scenario,
EDGE_scenario = EDGE_scenario)
}
inputdata <- loadInputData(data_folder)
inputdata = createRDS(input_path, SSP_scenario = scenario, EDGE_scenario = EDGE_scenario)
vot_data = inputdata$vot_data vot_data = inputdata$vot_data
sw_data = inputdata$sw_data sw_data = inputdata$sw_data
inco_data = inputdata$inco_data inco_data = inputdata$inco_data
...@@ -121,6 +130,7 @@ REMIND_prices <- merge_prices( ...@@ -121,6 +130,7 @@ REMIND_prices <- merge_prices(
intensity_data = int_dat, intensity_data = int_dat,
nonfuel_costs = nonfuel_costs) nonfuel_costs = nonfuel_costs)
## save prices ## save prices
## read last iteration count ## read last iteration count
keys <- c("iso", "year", "technology", "vehicle_type") keys <- c("iso", "year", "technology", "vehicle_type")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment