Bugfix: calibration file name has edge transport description only if edge_esm is called.

scripts/start/prepare_and_run.R

@@ -228,10 +228,12 @@ prepare <- function() {
   #}  
   
   # select demand pathway for transportation: options are conv (conventional demand pathway) and wise (wiseways, limited demand)
-  if(grepl("Wise", cfg$gms$cm_EDGEtr_scen)){
-  demTrsp = "wise"
-  } else {
-  demTrsp = "conv"
+  if(transport == "edge_esm"){
+    if(grepl("Wise", cfg$gms$cm_EDGEtr_scen)){
+       demTrsp = "wise"
+    } else {
+       demTrsp = "conv"
+    }
   }
 
   # Calculate CES configuration string
@@ -242,7 +244,7 @@ prepare <- function() {
                                          "POP_", cfg$gms$cm_POPscen, "-",
                                          "GDP_", cfg$gms$cm_GDPscen, "-",
                                          "Kap_", cfg$gms$capitalMarket, "-",
-                                         "demTrsp_", demTrsp, "-",
+                                         ifelse(transport == "edge_esm", paste0( "demTrsp_", demTrsp, "-"), ""),
                                          "Reg_", substr(regionscode(cfg$regionmapping),1,10))
   
   # write name of corresponding CES file to datainput.gms