Fix codecheck issues.

core/declarations.gms

@@ -115,7 +115,6 @@ p_aux_capacityFactorHistOverREMIND(all_regi,all_te)         "aux. param. to calc
 pm_fe2es(tall,all_regi,all_teEs)                     "Conversion factor from final energies to energy services. Default is 1."
 
 pm_shFeCes(ttot,all_regi,all_enty,all_in,all_teEs)   "Final energy shares for CES nodes"
-pm_bunker_share_in_nonldv_fe(tall,all_regi)   "Share of bunkers in non-LDV transport - fedie"
 
 p_adj_coeff_Orig(ttot,all_regi,all_te)               "initial value of p_adj_coeff"
 p_adj_seed_te_Orig(ttot,all_regi,all_te)             "initial value of p_adj_seed_te"

modules/35_transport/complex/declarations.gms

@@ -20,7 +20,6 @@ p35_pass_FE_share_transp(all_regi)            "Share of 'non-LDV passenger FE' i
 p35_pass_nonLDV_ES_efficiency(ttot,all_regi)  "Non-LDV passenger energy service per non-LDV FE. Unit: bn pkm/EJ"
 p35_passLDV_ES_efficiency(ttot,all_regi)      "LDV passenger energy service per non-LDV FE. Only correct if applied to CES-input, as BEV and H2FCV have higher efficiencies. Unit: bn pkm/EJ"
 p35_freight_ES_efficiency(ttot,all_regi)      "Freight energy service per freight FE. Unit: bn tkm/EJ"
-pm_bunker_share_in_nonldv_fe(tall,all_regi)   "Share of bunkers in non-LDV transport - fedie"
 
 p35_share_seliq_t(ttot,all_regi)                               "share of liquids used for transport sector (fedie + fepet). Unit 0..1"
 p35_share_seh2_t(ttot,all_regi)                                "share of hydrogen used for transport sector  (feh2t). Unit 0..1"

modules/35_transport/complex/not_used.txt

@@ -8,3 +8,8 @@ name,type,reason
 pm_esCapCost,input,questionnaire
 pm_fe2es,input,questionnaire
 pm_shFeCes,input,questionnaire
+vm_prodSe,input,questionnaire
+vm_prodFe,input,questionnaire
+vm_demFeForEs,input,questionnaire
+pm_cf,input,questionnaire
+cm_startyear,input,questionnaire

modules/35_transport/edge_esm/datainput.gms

@@ -16,46 +16,46 @@ Parameter
 pm_cesdata_sigma(ttot,in)$p35_cesdata_sigma(in) = p35_cesdata_sigma(in);
 
 parameters
-p35_esCapCost(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_teEs)
+p35_esCapCost(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_teEs) "Capital costs for the transport system [$/pkm or $/tkm]"
 /
 $ondelim
 $include "./modules/35_transport/edge_esm/input/esCapCost.cs4r"
 $offdelim
 /
 
-p35_fe2es(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_teEs)
+p35_fe2es(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_teEs) "Aggregate energy efficiency of transport fuel technologies [trn pkm/Twa or trn tkm/Twa]"
 /
 $ondelim
 $include "./modules/35_transport/edge_esm/input/fe2es.cs4r"
 $offdelim
 /
 
-p35_demByTech(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_enty,all_in,all_teEs)
+p35_demByTech(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_enty,all_in,all_teEs) "Aggregate FE Demand per transport fuel technology [TWa]"
 /
 $ondelim
 $include "./modules/35_transport/edge_esm/input/fe_demand_tech.cs4r"
 $offdelim
 /
 
-* p35_demLimit(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_in)
+* p35_demLimit(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_in)
 * /
 * $ondelim
 * $include "./modules/35_transport/edge_esm/input/dem_smart_Elpush.csv"
 * $offdelim
 * /
 
-p35_shFeCes(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_enty,all_in,all_teEs)                "shares by fuel"
+p35_shFeCes(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_enty,all_in,all_teEs)                "Shares of "
 ;
 
 *** overwrite starting points for policy runs for ES
 if (cm_startyear gt 2005,
 Execute_Loadpoint 'input_ref' p35_demByTech=p35_demByTech, p35_fe2es=p35_fe2es;
-p35_esCapCost(ttot,regi,SSP_scenario,EDGE_scenario,teEs_dyn35) = 0;
+p35_esCapCost(ttot,regi,"%cm_GDPscen%",EDGE_scenario,teEs_dyn35) = 0;
 );
 
 *** calculate shares for fuels by CES node
-p35_shFeCes(ttot,regi,SSP_scenario,EDGE_scenario,entyFe,ppfen_dyn35,teEs_dyn35)$fe2ces_dyn35(entyFe,ppfen_dyn35,teEs_dyn35) =
-        p35_demByTech(ttot,regi,SSP_scenario,EDGE_scenario,entyFe,ppfen_dyn35,teEs_dyn35) / sum((entyFe2,teEs_dyn35_2)$fe2ces_dyn35(entyFe2,ppfen_dyn35,teEs_dyn35_2),p35_demByTech(ttot,regi,SSP_scenario,EDGE_scenario,entyFe2,ppfen_dyn35,teEs_dyn35_2));
+p35_shFeCes(ttot,regi,"%cm_GDPscen%",EDGE_scenario,entyFe,ppfen_dyn35,teEs_dyn35)$fe2ces_dyn35(entyFe,ppfen_dyn35,teEs_dyn35) =
+        p35_demByTech(ttot,regi,"%cm_GDPscen%",EDGE_scenario,entyFe,ppfen_dyn35,teEs_dyn35) / sum((entyFe2,teEs_dyn35_2)$fe2ces_dyn35(entyFe2,ppfen_dyn35,teEs_dyn35_2),p35_demByTech(ttot,regi,"%cm_GDPscen%",EDGE_scenario,entyFe2,ppfen_dyn35,teEs_dyn35_2));
 
 
 *** set starting points

modules/35_transport/edge_esm/declarations.gms

@@ -5,9 +5,13 @@
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: remind@pik-potsdam.de
 *** SOF ./modules/35_transport/edge_esm/declarations.gms
+Parameters
+pm_bunker_share_in_nonldv_fe(tall,all_regi)   "Share of bunkers in non-LDV transport - fedie"
+;
+
 Positive variables
-vm_shBioFe(ttot,all_regi)   "Share of biofuels in all final energies used for transportation. Value between 0 and 1."
-vm_shSynSe(ttot,all_regi)   "Share of synthetic liquids in all fossil liquids. Value between 0 and 1."
+v35_shBioFe(ttot,all_regi)   "Share of biofuels in all final energies used for transportation. Value between 0 and 1."
+v35_shSynSe(ttot,all_regi)   "Share of synthetic liquids in all fossil liquids. Value between 0 and 1."
 ;
 
 Equations

modules/35_transport/edge_esm/equations.gms

@@ -12,9 +12,9 @@
 
 q35_shBioFe(t,regi)..
   sum(se2fe(entySe,fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,entySe,fe_transport_liquids_dyn35,te) )
-  * vm_shBioFe(t,regi)
+  * v35_shBioFe(t,regi)
   =e=
-  sum(se2fe(se_with_bio_dyn35,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,se_with_bio_dyn35,fe_transport_liquids_dyn35,te) )
 ;
 
 ***---------------------------------------------------------------------------
@@ -23,7 +23,7 @@ q35_shBioFe(t,regi)..
 
 $ifthen.ccu %CCU% == "on"
 q35_shSynSe(t,regi)..
-    sum(se2fe(entySe,fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,entySe,fe_transport_liquids_dyn35,te) ) * vm_shSynSe(t,regi)
+    sum(se2fe(entySe,fe_transport_liquids_dyn35,te), vm_prodFe(t,regi,entySe,fe_transport_liquids_dyn35,te) ) * v35_shSynSe(t,regi)
     =e=
     vm_prodSe(t,regi,"seh2","seliqfos","MeOH")
 ;

modules/35_transport/edge_esm/not_used.txt

@@ -7,4 +7,3 @@ pm_pop,input,questionnaire
 pm_gdp,input,questionnaire
 pm_vintage_in,input,questionnaire
 vm_shUePeT,input,questionnaire
-pm_bunker_share_in_nonldv_fe,input,questionnaire

modules/35_transport/edge_esm/sets.gms

@@ -110,18 +110,7 @@ ces_transport_dyn35(all_in,all_in)   "CES tree structure - edge transport"
    entrp_frgt  . (entrp_frgt_sm, entrp_frgt_lo)
 /
 
-SSP_scenario_all     "SSP scenarios"
-/
-gdp_SSP1
-gdp_SSP2
-gdp_SSP3
-gdp_SSP4
-gdp_SSP5
-/
-
-SSP_scenario(SSP_scenario_all)
-
-EDGE_scenario_all    "EDGE scenarios"
+EDGE_scenario_all    "EDGE-T scenarios"
 /
 Conservative_liquids
 Hydrogen_push
@@ -129,40 +118,36 @@ Electricity_push
 Smart_lifestyles_Electricity_push
 /
 
-EDGE_scenario(EDGE_scenario_all)
+EDGE_scenario(EDGE_scenario_all) "Selected EDGE-T scenario"
 
 *** sets for the reporting, to be consistent with *complex* realisation
-FE_Transp_fety35(all_enty)   / fepet, fedie, feh2t, feelt /
-FE_Elec_fety35(all_enty)     / feels, feelt /
+FE_Transp_fety35(all_enty) "FEs used in the transport module"  / fepet, fedie, feh2t, feelt /
+FE_Elec_fety35(all_enty)   "FE electricity sets (should be moved to core/sets asap)"  / feels, feelt /
 
-se2fe_dyn35(all_enty,all_enty,all_te)
+*** nat. gas is not used in complex, that's why these elements have to be defined here and not in core
+se2fe_dyn35(all_enty,all_enty,all_te) "nat. gas techs for transport, missing in se2fe in core/sets"
 /
 segabio.fegat.tdbiogat
 segafos.fegat.tdfosgat
 /
 
-fe_transport_liquids_dyn35(all_enty)
+enty_dyn35(all_enty) "nat. gas FE used for transport, see comment above"
 /
-fepet
-fedie
-/
-
-se_with_bio_dyn35(all_enty)
-/
-seliqbio
+fegat        "final energy gas transport"
 /
 
-enty_dyn35(all_enty)
+entyFeTrans_dyn35(all_enty) "nat. gas FE used for transport, see comment above"
 /
-fegat        "final energy gas transport"
+fegat        "FE nat. gas transport"
 /
 
-entyFeTrans_dyn35(all_enty)
+fe_transport_liquids_dyn35(all_enty) "liquids used by the transport module"
 /
-fegat        "FE nat. gas transport"
+fepet
+fedie
 /
 
-emi2te_dyn35(all_enty,all_enty,all_te,all_enty)
+emi2te_dyn35(all_enty,all_enty,all_te,all_enty) "add. emission pathways: CH4 from nat. gas"
 /
 segabio.fegat.tdbiogat.ch4
 segafos.fegat.tdfosgat.ch4
@@ -190,6 +175,5 @@ cesOut2cesIn(ces_transport_dyn35)            = YES;
 
 
 EDGE_scenario("%cm_EDGEtr_scen%") = YES;
-SSP_scenario("%cm_GDPScen%") = YES;
 
 *** EOF ./modules/35_transport/edge_esm/sets.gms