Calibration settings minor adjustments and bugfix.

modules/29_CES_parameters/calibrate/datainput.gms

@@ -272,8 +272,8 @@ pm_cesdata(t,regi,in,"quantity") $ p29_esdemand(t,regi,"%cm_GDPscen%",in)
 
 *** Load exogenous transport demand - required for the EDGE transport module
 $ifthen.edgesm %transport% ==  "edge_esm"
-pm_cesdata(t,regi,in,"quantity") $ p29_trpdemand(t,regi,"%cm_GDPscen%",in)
-           = p29_trpdemand(t,regi,"%cm_GDPscen%",in);
+pm_cesdata(t,regi,in,"quantity") $ p29_trpdemand(t,regi,"%cm_GDPscen%","%cm_EDGEtr_scen%", in)
+           = p29_trpdemand(t,regi,"%cm_GDPscen%", "%cm_EDGEtr_scen%", in);
 $endif.edgesm
 
 *** Load capital quantities

modules/35_transport/edge_esm/output.gms

@@ -6,5 +6,8 @@
 *** |  Contact: remind@pik-potsdam.de
 *** SOF ./modules/35_transport/edge_esm/output.gms
 
-Execute "Rscript EDGE_transport.R --reporting";
+$ifthen.calibrate %CES_parameters% == "load"
+  Execute "Rscript EDGE_transport.R --reporting";
+$endif.calibrate
+
 *** EOF ./modules/35_transport/edge_esm/output.gms

scripts/start/prepare_and_run.R

@@ -227,6 +227,13 @@ prepare <- function() {
   #  create_ExogSameAsPrevious_CO2price_file(as.character(cfg$files2export$start["input_ref.gdx"]))
   #}  
   
+  # 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"
+  }
+
   # Calculate CES configuration string
   cfg$gms$cm_CES_configuration <- paste0("stat_",cfg$gms$stationary,"-",
                                          "indu_",cfg$gms$industry,"-",
@@ -235,6 +242,7 @@ prepare <- function() {
                                          "POP_", cfg$gms$cm_POPscen, "-",
                                          "GDP_", cfg$gms$cm_GDPscen, "-",
                                          "Kap_", cfg$gms$capitalMarket, "-",
+                                         "demTrsp_", demTrsp, "-",
                                          "Reg_", substr(regionscode(cfg$regionmapping),1,10))
   
   # write name of corresponding CES file to datainput.gms