diff --git a/scripts/start/prepare_and_run.R b/scripts/start/prepare_and_run.R index 01d00ac602e4678ec6455c1b974e3737e9dfb8bc..0e8a79e84e560fddf39ff6d68aa57d213f76f635 100644 --- a/scripts/start/prepare_and_run.R +++ b/scripts/start/prepare_and_run.R @@ -228,7 +228,7 @@ prepare <- function() { #} # select demand pathway for transportation: options are conv (conventional demand pathway) and wise (wiseways, limited demand) - if(transport == "edge_esm"){ + if(cfg$gms$transport == "edge_esm"){ if(grepl("Wise", cfg$gms$cm_EDGEtr_scen)){ demTrsp = "wise" } else { @@ -244,7 +244,7 @@ prepare <- function() { "POP_", cfg$gms$cm_POPscen, "-", "GDP_", cfg$gms$cm_GDPscen, "-", "Kap_", cfg$gms$capitalMarket, "-", - ifelse(transport == "edge_esm", paste0( "demTrsp_", demTrsp, "-"), ""), + ifelse(cfg$gms$transport == "edge_esm", paste0( "demTrsp_", demTrsp, "-"), ""), "Reg_", substr(regionscode(cfg$regionmapping),1,10)) # write name of corresponding CES file to datainput.gms