Merge pull request #68 from Loisel/fix_sets

Fix minor issues on the edge_esm module

modules/35_transport/edge_esm/equations.gms

@@ -11,7 +11,7 @@ q35_shBioFe(t,regi)..
   sum(se2fe(entySe,fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,entySe,fe_transport_liquids_dyn35,te) )
   * v35_shBioFe(t,regi)
   =e=
-  sum(se2fe("seliqbio",fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,se_with_bio_dyn35,fe_transport_liquids_dyn35,te) )
+  sum(se2fe("seliqbio",fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,"seliqbio",fe_transport_liquids_dyn35,te) )
 ;
 
 

modules/35_transport/edge_esm/input/EDGEscenario_description.csv

+"scenario_name";"options";"switch"
+"Conservative_liquids";"addvintages";TRUE
+"Conservative_liquids";"endogeff";TRUE
+"Conservative_liquids";"enhancedtech";FALSE
+"Conservative_liquids";"inconvenience";TRUE
+"Conservative_liquids";"merge_traccs";TRUE
+"Conservative_liquids";"rebates_febates";FALSE
+"Conservative_liquids";"savetmpinput";TRUE
+"Conservative_liquids";"selfmarket_acceptancy";FALSE
+"Conservative_liquids";"selfmarket_policypush";FALSE
+"Conservative_liquids";"selfmarket_taxes";FALSE
+"Conservative_liquids";"smartlifestyle";FALSE
+"Electricity_push";"addvintages";TRUE
+"Electricity_push";"endogeff";TRUE
+"Electricity_push";"enhancedtech";TRUE
+"Electricity_push";"inconvenience";TRUE
+"Electricity_push";"merge_traccs";TRUE
+"Electricity_push";"rebates_febates";TRUE
+"Electricity_push";"savetmpinput";TRUE
+"Electricity_push";"selfmarket_acceptancy";TRUE
+"Electricity_push";"selfmarket_policypush";TRUE
+"Electricity_push";"selfmarket_taxes";TRUE
+"Electricity_push";"smartlifestyle";FALSE
+"Hydrogen_push";"addvintages";TRUE
+"Hydrogen_push";"endogeff";TRUE
+"Hydrogen_push";"enhancedtech";TRUE
+"Hydrogen_push";"inconvenience";TRUE
+"Hydrogen_push";"merge_traccs";TRUE
+"Hydrogen_push";"rebates_febates";TRUE
+"Hydrogen_push";"savetmpinput";TRUE
+"Hydrogen_push";"selfmarket_acceptancy";TRUE
+"Hydrogen_push";"selfmarket_policypush";TRUE
+"Hydrogen_push";"selfmarket_taxes";TRUE
+"Hydrogen_push";"smartlifestyle";FALSE
+"Smart_lifestyles_Electricity_push";"addvintages";TRUE
+"Smart_lifestyles_Electricity_push";"endogeff";TRUE
+"Smart_lifestyles_Electricity_push";"enhancedtech";TRUE
+"Smart_lifestyles_Electricity_push";"inconvenience";TRUE
+"Smart_lifestyles_Electricity_push";"merge_traccs";TRUE
+"Smart_lifestyles_Electricity_push";"rebates_febates";TRUE
+"Smart_lifestyles_Electricity_push";"savetmpinput";TRUE
+"Smart_lifestyles_Electricity_push";"selfmarket_acceptancy";TRUE
+"Smart_lifestyles_Electricity_push";"selfmarket_policypush";TRUE
+"Smart_lifestyles_Electricity_push";"selfmarket_taxes";TRUE
+"Smart_lifestyles_Electricity_push";"smartlifestyle";TRUE