Merge branch 'pullreq1' of github.com:MariannaR/remind into pullreq1

config/default.cfg

@@ -361,7 +361,7 @@ cfg$gms$cm_CO2priceRegConvEndYr         <- 2050     # def <- 2050
 cfg$gms$c_regi_nucscen <- "all" # def <- "all"
 cfg$gms$c_regi_capturescen <- "all" # def <- "all"
 
-cfg$gms$cm_EDGEtr_scen       <- "Conservative_liquids"     # def <- "Conservative_liquids"
+cfg$gms$cm_EDGEtr_scen       <- "ConvCase"     # def <- "ConvCase". For calibration runs: "ConvCase", "ConvCaseWise". For standard runs:"ConvCase", "ElecEra", "HydrHype", "ConvCaseWise", "ElecEraWise", "HydrHypeWise"
 
 #-----------------------------------------------------------------------------
 #                          FLAGS