Included transport ESM branch.

.gitignore

@@ -91,6 +91,7 @@ modules/29_CES_parameters/calibrate/input/p29_capitalQuantity.cs4r
 modules/29_CES_parameters/calibrate/input/p29_efficiency_growth.cs4r
 modules/29_CES_parameters/calibrate/input/pm_es_demand.cs4r
 modules/29_CES_parameters/calibrate/input/pm_fe_demand.cs4r
+modules/29_CES_parameters/calibrate/input/pm_trp_demand.cs4r
 modules/29_CES_parameters/calibrate/input/p29_cesdata_price.cs4r
 modules/29_CES_parameters/calibrate/input/f29_capitalUnitProjections.cs4r
 modules/29_CES_parameters/calibrate/input/
@@ -117,6 +118,15 @@ modules/33_CDR/weathering/input/f33_maxProdGradeRegiWeathering.cs3r
 modules/35_transport/complex/input/f35_factorVintages.cs3r
 modules/35_transport/complex/input/f35_transp_eff.cs3r
 modules/35_transport/complex/input/pm_bunker_share_in_nonldv_fe.cs4r
+modules/35_transport/edge_esm/input/SW.cs4r
+modules/35_transport/edge_esm/input/UCD_NEC_iso.cs4r
+modules/35_transport/edge_esm/input/esCapCost.cs4r
+modules/35_transport/edge_esm/input/fe2es.cs4r
+modules/35_transport/edge_esm/input/fe_demand_tech.cs4r
+modules/35_transport/edge_esm/input/harmonized_intensities.cs4r
+modules/35_transport/edge_esm/input/logit_exponent.cs4r
+modules/35_transport/edge_esm/input/price_nonmot.cs4r
+modules/35_transport/edge_esm/input/value_time.cs4r
 modules/36_buildings/services_putty/input/p36_floorspace_scen.cs4r
 modules/36_buildings/services_putty/input/p36_serviceInputs.cs4r
 modules/36_buildings/services_putty/input/p36_serviceOutputs.cs4r

modules/21_tax/on/datainput.gms

@@ -76,6 +76,13 @@ $offdelim
   p21_tau_fe_tax_transport(ttot,all_regi,feForUe) = f21_tau_fe_tax_transport(ttot,all_regi,feForUe);
   p21_tau_fe_sub_transport(ttot,all_regi,feForUe) = f21_tau_fe_sub_transport(ttot,all_regi,feForUe);
   
+
+  p21_tau_fe_tax_transport(ttot,all_regi,feForEs) = f21_tau_fe_tax_transport(ttot,all_regi,feForEs);
+  p21_tau_fe_sub_transport(ttot,all_regi,feForEs) = f21_tau_fe_sub_transport(ttot,all_regi,feForEs);
+
+  p21_tau_fe_tax_transport(ttot,all_regi,"fegat") = p21_tau_fe_tax_transport(ttot,all_regi,"fedie");
+  p21_tau_fe_sub_transport(ttot,all_regi,"fegat") = p21_tau_fe_sub_transport(ttot,all_regi,"fedie");
+
 loop ( fe_tax_sub_sbi(all_in, in), !! Pathways I from FE to the CES
   p21_tau_fe_tax_bit_st(ttot,all_regi,in) = f21_tau_fe_tax_bit_st(ttot,all_regi,all_in);   !! ppfen in stationary/buildings_industry : all but transport ppfen
   p21_tau_fe_sub_bit_st(ttot,all_regi,in) = f21_tau_fe_sub_bit_st(ttot,all_regi,all_in);   !! ppfen in stationary/buildings_industry : all but transport ppfen

modules/21_tax/on/equations.gms

@@ -96,10 +96,14 @@ v21_emiALLco2neg(t,regi) =e= -vm_emiAll(t,regi,"co2") + v21_emiALLco2neg_slack(t
 ***---------------------------------------------------------------------------
 q21_taxrevFEtrans(t,regi)$(t.val ge max(2010,cm_startyear))..
 v21_taxrevFEtrans(t,regi) 
-=g=  SUM(feForUe(enty),
+=g=  SUM(feForEs(enty),
+        (p21_tau_fe_tax_transport(t,regi,feForEs) + p21_tau_fe_sub_transport(t,regi,feForEs) ) * SUM(se2fe(enty2,enty,te), vm_prodFe(t,regi,enty2,enty,te))
+      ) +
+     SUM(feForUe(enty),
         (p21_tau_fe_tax_transport(t,regi,feForUe) + p21_tau_fe_sub_transport(t,regi,feForUe) ) * SUM(se2fe(enty2,enty,te), vm_prodFe(t,regi,enty2,enty,te))
       )
-	  - p21_taxrevFEtrans0(t,regi) ;
+  - p21_taxrevFEtrans0(t,regi) ;
+
 
 ***---------------------------------------------------------------------------
 *'  Calculation of final Energy taxes in Buildings_Industry or Stationary: effective tax rate (tax - subsidy) times FE use in sector
@@ -163,7 +167,7 @@ v21_taxrevSO2(t,regi) =g= p21_tau_so2_tax(t,regi) * vm_emiTe(t,regi,"so2")
 *'  Documentation of overall tax approach is above at q21_taxrev.
 ***---------------------------------------------------------------------------
 q21_taxrevBio(t,regi)$(t.val ge max(2010,cm_startyear))..
-v21_taxrevBio(t,regi) =g= v21_tau_bio(t) * vm_fuExtr(t,regi,"pebiolc","1") * vm_pebiolc_price(t,regi) 
+v21_taxrevBio(t,regi) =g= v21_tau_bio(t) * vm_fuExtr(t,regi,"pebiolc","1") * vm_pebiolc_price_shifted(t,regi)
                           - p21_taxrevBio0(t,regi);
 						  
 ***---------------------------------------------------------------------------

modules/21_tax/on/postsolve.gms

@@ -26,7 +26,9 @@ p21_taxrevCCS0(ttot,regi) = cm_frac_CCS * pm_data(regi,"omf","ccsinje") * pm_inc
 p21_taxrevNetNegEmi0(ttot,regi) = cm_frac_NetNegEmi * pm_taxCO2eq(ttot,regi) * v21_emiALLco2neg.l(ttot,regi);
 p21_taxrevFEtrans0(ttot,regi) = SUM(feForUe(enty),
                                       (p21_tau_fe_tax_transport(ttot,regi,feForUe) + p21_tau_fe_sub_transport(ttot,regi,feForUe) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
-                                    );
+                                    )+
+				SUM(feForEs(enty), (p21_tau_fe_tax_transport(ttot,regi,feForEs) + p21_tau_fe_sub_transport(ttot,regi,feForEs) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
+				);
 p21_taxrevFEBuildInd0(ttot,regi) = SUM(ppfen(in)$( NOT ppfenFromUe(in)),
                                          (p21_tau_fe_tax_bit_st(ttot,regi,ppfen) + p21_tau_fe_sub_bit_st(ttot,regi,ppfen) ) * vm_cesIO.l(ttot,regi,ppfen)
                                        );
@@ -39,7 +41,7 @@ p21_taxrevPE2SE0(ttot,regi) = SUM(pe2se(enty,enty2,te),
                                   ); 
 p21_taxrevXport0(ttot,regi) = SUM(tradePe(enty), p21_tau_XpRes_tax(ttot,regi,enty) * vm_Xport.l(ttot,regi,enty));
 p21_taxrevSO20(ttot,regi) = p21_tau_so2_tax(ttot,regi) * vm_emiTe.l(ttot,regi,"so2");
-p21_taxrevBio0(ttot,regi) = v21_tau_bio.l(ttot) * vm_fuExtr.l(ttot,regi,"pebiolc","1") * vm_pebiolc_price.l(ttot,regi);
+p21_taxrevBio0(ttot,regi) = v21_tau_bio.l(ttot) * vm_fuExtr.l(ttot,regi,"pebiolc","1") * vm_pebiolc_price_shifted.l(ttot,regi);
 p21_implicitDiscRate0(ttot,regi) = sum(ppfKap(in),  p21_implicitDiscRateMarg(ttot,regi,in)  * vm_cesIO.l(ttot,regi,in) );
 ***DK: for reporting only
 p21_tau_bioenergy_tax(t) = v21_tau_bio.l(t);

modules/21_tax/on/presolve.gms

@@ -25,7 +25,9 @@ p21_taxrevNetNegEmi0(ttot,regi) = cm_frac_NetNegEmi * pm_taxCO2eq(ttot,regi) * v
 p21_emiALLco2neg0(ttot,regi)  = v21_emiALLco2neg.l(ttot,regi);		
 p21_taxrevFEtrans0(ttot,regi) = SUM(feForUe(enty),
                                       (p21_tau_fe_tax_transport(ttot,regi,feForUe) + p21_tau_fe_sub_transport(ttot,regi,feForUe) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
-                                    );
+                                      )+
+				      SUM(feForEs(enty), (p21_tau_fe_tax_transport(ttot,regi,feForEs) + p21_tau_fe_sub_transport(ttot,regi,feForEs) ) * SUM(se2fe(enty2,enty,te), vm_prodFe.l(ttot,regi,enty2,enty,te))
+				    );
 p21_taxrevFEBuildInd0(ttot,regi) = SUM(ppfen(in)$( NOT ppfenFromUe(in)),
                                          (p21_tau_fe_tax_bit_st(ttot,regi,ppfen) + p21_tau_fe_sub_bit_st(ttot,regi,ppfen) ) * vm_cesIO.l(ttot,regi,ppfen)
                                        );
@@ -40,7 +42,7 @@ p21_taxrevPE2SE0(ttot,regi) = SUM(pe2se(enty,enty2,te),
                                   ); 
 p21_taxrevXport0(ttot,regi) = SUM(tradePe(enty), p21_tau_XpRes_tax(ttot,regi,enty) * vm_Xport.l(ttot,regi,enty));
 p21_taxrevSO20(ttot,regi) = p21_tau_so2_tax(ttot,regi) * vm_emiTe.l(ttot,regi,"so2");
-p21_taxrevBio0(ttot,regi) = v21_tau_bio.l(ttot) * vm_fuExtr.l(ttot,regi,"pebiolc","1")*vm_pebiolc_price.l(ttot,regi);
+p21_taxrevBio0(ttot,regi) = v21_tau_bio.l(ttot) * vm_fuExtr.l(ttot,regi,"pebiolc","1")*vm_pebiolc_price_shifted.l(ttot,regi);
 p21_implicitDiscRate0(ttot,regi) = sum(ppfKap(in),  p21_implicitDiscRateMarg(ttot,regi,in)  * vm_cesIO.l(ttot,regi,in) );
 
 *** EOF ./modules/21_tax/on/presolve.gms

modules/35_transport/edge_esm/datainput.gms

@@ -16,34 +16,50 @@ Parameter
 pm_cesdata_sigma(ttot,in)$p35_cesdata_sigma(in) = p35_cesdata_sigma(in);
 
 parameters
-p35_esCapCost(tall,all_regi,all_in)    "???"
+p35_esCapCost(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_teEs)
 /
 $ondelim
 $include "./modules/35_transport/edge_esm/input/esCapCost.cs4r"
 $offdelim
 /
 
-p35_fe2es(tall,all_regi,all_teEs)     "???"
+p35_fe2es(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_teEs)
 /
 $ondelim
 $include "./modules/35_transport/edge_esm/input/fe2es.cs4r"
 $offdelim
 /
 
-p35_shFeCes(tall,all_regi,all_enty,all_in)    "???"
+p35_demByTech(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_enty,all_in,all_teEs)
 /
 $ondelim
-$include "./modules/35_transport/edge_esm/input/shFeCes.cs4r"
+$include "./modules/35_transport/edge_esm/input/fe_demand_tech.cs4r"
 $offdelim
 /
+
+p35_shFeCes(tall,all_regi,SSP_scenario_all,EDGE_scenario_all,all_enty,all_in,all_teEs)                "shares by fuel"
 ;
 
-*** starting points:
-pm_esCapCost(t,regi,ppfen_dyn35) = p35_esCapCost(t,regi,ppfen_dyn35);
+*** 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;
+);
+
+*** 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));
+
+
+*** set starting points
+pm_esCapCost(ttot,regi,teEs_dyn35) = p35_esCapCost(ttot,regi,"%cm_GDPScen%","%cm_EDGEtr_scen%",teEs_dyn35);
 
-pm_fe2es(t,regi,teEs_dyn35) = p35_fe2es(t,regi,teEs_dyn35);
+pm_fe2es(ttot,regi,teEs_dyn35) = p35_fe2es(ttot,regi,"%cm_GDPScen%","%cm_EDGEtr_scen%",teEs_dyn35);
 
-pm_shFeCes(t,regi,entyFe,ppfen_dyn35)$p35_shFeCes(t,regi,entyFe,ppfen_dyn35) = p35_shFeCes(t,regi,entyFe,ppfen_dyn35);
+pm_shFeCes(ttot,regi,entyFe,ppfen_dyn35,teEs_dyn35)$fe2ces_dyn35(entyFe,ppfen_dyn35,teEs_dyn35) = p35_shFeCes(ttot,regi,"%cm_GDPScen%","%cm_EDGEtr_scen%",entyFe,ppfen_dyn35,teEs_dyn35);
 
+*** workaround for nat. gas for transport -> should go to mmoinput at some point
+pm_cf(ttot,regi,"tdfosgat") = 0.65;
+pm_cf(ttot,regi,"tdbiogat") = 0.65;
 
 *** EOF ./modules/35_transport/edge_esm/datainput.gms

modules/35_transport/edge_esm/input/create_fakedata.R

-# |  (C) 2006-2019 Potsdam Institute for Climate Impact Research (PIK)
-# |  authors, and contributors see CITATION.cff file. This file is part
-# |  of REMIND and licensed under AGPL-3.0-or-later. Under Section 7 of
-# |  AGPL-3.0, you are granted additional permissions described in the
-# |  REMIND License Exception, version 1.0 (see LICENSE file).
-# |  Contact: remind@pik-potsdam.de
-require(data.table)
-require(gdx)
-require(gdxdt)
-
-inputgdx <- "../../../../config/input.gdx"
-
-## years
-ttot <- readgdx(inputgdx, "ttot")[[1]]
-
-## regions
-regi <- readgdx(inputgdx, "regi")[[1]]
-
-## ces nodes
-ppfen <- c("entrp_pass_sm", "entrp_pass_lo", "entrp_frgt_sm", "entrp_frgt_lo")
-
-## technologies
-tees <- c(
-    "te_espet_pass_sm",
-    "te_esdie_pass_sm",
-    "te_eselt_pass_sm",
-    "te_esdie_pass_lo",
-    "te_esdie_frgt_sm",
-    "te_eselt_frgt_sm",
-    "te_esdie_frgt_lo")
-
-## fes
-enty <- c("fedie", "fepet", "feelt")
-
-## prices
-prices <- CJ(tall=ttot,all_regi=regi,all_in=ppfen)
-prices[, value := 0]
-
-## efficiencies
-effcs <- CJ(tall=ttot,all_regi=regi,all_tees=tees)
-effcs[, value := 1]
-
-## shares
-fedem <- readgdx(inputgdx, "p29_fedemand")
-## uetypes
-ues <- c("ueHDVt", "ueLDVt", "ueelTt")
-
-scen <- "gdp_SSP2"
-
-fedem <- fedem[all_in %in% ues & all_GDPscen == scen]
-techmap <- data.table(
-    all_in=c("ueelTt", "ueLDVt", "ueHDVt", "ueHDVt", "ueHDVt"),
-    ces=c("entrp_pass_sm", "entrp_pass_sm", "entrp_pass_lo", "entrp_frgt_sm", "entrp_frgt_lo"))
-## apply map
-fedem <- techmap[fedem, on="all_in", allow.cartesian=T]
-fedem[, ces_share := value/sum(value), by=.(tall, all_regi, ces)]
-
-femap = data.table(all_enty=enty, all_in=ues)
-out <- femap[fedem, on="all_in"][, .(tall, all_regi, all_enty, all_in=ces, value=ces_share)]
-
-## csv for initialCap
-fwrite(prices, "esCapCost.cs4r", col.names = F)
-fwrite(effcs, "fe2es.cs4r", col.names = F)
-fwrite(out, "shFeCes.cs4r", col.names = F)
-
-## write gdxes
-## writegdx.parameter("esCapCost.gdx", prices, "p35_esCapCost", "value", c("tall", "all_regi", "all_in"))
-## writegdx.parameter("fe2es.gdx", effcs, "p35_fe2es", "value", c("tall", "all_regi", "all_tees"))
-## writegdx.parameter("shFeCes.gdx", out, "p35_shFeCes", "value", c("tall", "all_regi", "all_enty", "all_in"))

modules/35_transport/edge_esm/preloop.gms

@@ -5,5 +5,4 @@
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: remind@pik-potsdam.de
 *** SOF ./modules/35_transport/edge_esm/preloop.gms
-
 *** EOF ./modules/35_transport/edge_esm/preloop.gms

modules/35_transport/edge_esm/presolve.gms

@@ -5,15 +5,19 @@
 *** |  REMIND License Exception, version 1.0 (see LICENSE file).
 *** |  Contact: remind@pik-potsdam.de
 *** SOF ./modules/35_transport/edge_esm/presolve.gms
-Execute "Rscript EDGE_sharecalculation.R"
+$ifthen.calibrate %CES_parameters% == "load"
+if( ((ord(iteration) ge 5) and ( mod(ord(iteration), 5) eq 0)),
+    Execute "Rscript EDGE_transport.R";
 
-Execute_Loadpoint 'p35_esCapCost' p35_esCapCost;
-pm_esCapCost(t,regi,ppfen_dyn35) = p35_esCapCost(t,regi,ppfen_dyn35);
+    Execute_Loadpoint 'p35_esCapCost' p35_esCapCost;
+    pm_esCapCost(t,regi,teEs_dyn35)$(t.val > 2010) = p35_esCapCost(t,regi,"%cm_GDPscen%","%cm_EDGEtr_scen%",teEs_dyn35);
 
-Execute_Loadpoint 'p35_fe2es' p35_fe2es;
-pm_fe2es(t,regi,teEs_dyn35) = p35_fe2es(t,regi,teEs_dyn35);
+    Execute_Loadpoint 'p35_fe2es' p35_fe2es;
+    pm_fe2es(t,regi,teEs_dyn35)$(t.val > 2010) = p35_fe2es(t,regi,"%cm_GDPscen%","%cm_EDGEtr_scen%",teEs_dyn35);
 
-Execute_Loadpoint 'p35_shFeCes' p35_shFeCes;
-pm_shFeCes(t,regi,entyFe,ppfen_dyn35)$p35_shFeCes(t,regi,entyFe,ppfen_dyn35) = p35_shFeCes(t,regi,entyFe,ppfen_dyn35);
+    Execute_Loadpoint 'p35_shFeCes' p35_shFeCes;
+    pm_shFeCes(t,regi,entyFe,ppfen_dyn35,teEs_dyn35)$(p35_shFeCes(t,regi,"%cm_GDPscen%","%cm_EDGEtr_scen%",entyFe,ppfen_dyn35,teEs_dyn35) AND t.val > 2010) = p35_shFeCes(t,regi,"%cm_GDPscen%","%cm_EDGEtr_scen%",entyFe,ppfen_dyn35,teEs_dyn35);
+);
+$endif.calibrate
 
 *** EOF ./modules/35_transport/edge_esm/presolve.gms

modules/35_transport/edge_esm/realization.gms

@@ -24,5 +24,6 @@ $Ifi "%phase%" == "equations" $include "./modules/35_transport/edge_esm/equation
 $Ifi "%phase%" == "preloop" $include "./modules/35_transport/edge_esm/preloop.gms"
 $Ifi "%phase%" == "bounds" $include "./modules/35_transport/edge_esm/bounds.gms"
 $Ifi "%phase%" == "presolve" $include "./modules/35_transport/edge_esm/presolve.gms"
+$Ifi "%phase%" == "postsolve" $include "./modules/35_transport/edge_esm/postsolve.gms"
 *######################## R SECTION END (PHASES) ###############################
 *** EOF ./modules/35_transport/edge_esm.gms

modules/35_transport/edge_esm/sets.gms

@@ -13,13 +13,13 @@ teEs_dyn35(all_teEs)  "technologies - transport module additions"
     te_espet_pass_sm "short-to-medium distance passenger transport CES node"
     te_esdie_pass_sm "short-to-medium distance passenger transport CES node"
     te_eselt_pass_sm "short-to-medium distance passenger transport CES node"
-*    te_esh2t_pass_sm "short-to-medium distance passenger transport CES node"
-*    te_esgat_pass_sm "short-to-medium distance passenger transport CES node"
+    te_esh2t_pass_sm "short-to-medium distance passenger transport CES node"
+    te_esgat_pass_sm "short-to-medium distance passenger transport CES node"
     te_esdie_pass_lo "long distance passenger transport (aviation) CES node"
     te_esdie_frgt_sm "short-to-medium distance freight transport CES node"
     te_eselt_frgt_sm "short-to-medium distance freight transport CES node"
-*    te_esh2t_frgt_sm "short-to-medium distance freight transport CES node"
-*    te_esgat_frgt_sm "short-to-medium distance freight transport CES node"
+    te_esh2t_frgt_sm "short-to-medium distance freight transport CES node"
+    te_esgat_frgt_sm "short-to-medium distance freight transport CES node"
     te_esdie_frgt_lo "long distance freight transport CES node"    
 /    
     
@@ -40,13 +40,13 @@ esty_dyn35(all_esty)            "Energy service types"
     esdie_pass_sm
     esdie_pass_lo
     eselt_pass_sm
-*    esh2t_pass_sm
-*    esgat_pass_sm
+    esh2t_pass_sm
+    esgat_pass_sm
     esdie_frgt_lo
     esdie_frgt_sm
-*    esh2t_frgt_sm
+    esh2t_frgt_sm
     eselt_frgt_sm
-*    esgat_frgt_sm
+    esgat_frgt_sm
 /
 
 ppfen_dyn35(all_in)   "all energy input nodes - transport module additions"
@@ -57,32 +57,50 @@ ppfen_dyn35(all_in)   "all energy input nodes - transport module additions"
     entrp_frgt_lo "long distance freight transport CES node"
 /
 
-es2ppfen_dyn35(all_esty,all_in)      "matching FE to ppfEn in MACRO"
+es2ppfen_dyn35(all_esty,all_in)      "matching ES to ppfEn in MACRO"
 /
     espet_pass_sm.entrp_pass_sm
     esdie_pass_sm.entrp_pass_sm
     esdie_pass_lo.entrp_pass_lo
     eselt_pass_sm.entrp_pass_sm
-*    esh2t_pass_sm.entrp_pass_sm
-*    esgat_pass_sm.entrp_pass_sm
+    esh2t_pass_sm.entrp_pass_sm
+    esgat_pass_sm.entrp_pass_sm
     esdie_frgt_lo.entrp_frgt_lo
     esdie_frgt_sm.entrp_frgt_sm
-*    esh2t_frgt_sm.entrp_frgt_sm
+    esh2t_frgt_sm.entrp_frgt_sm
     eselt_frgt_sm.entrp_frgt_sm
-*    esgat_frgt_sm.entrp_frgt_sm
+    esgat_frgt_sm.entrp_frgt_sm
 /
 
 fe2es_dyn35(all_enty,all_esty,all_teEs)    "map FE carriers to ES via appliances"
 /
     fepet.espet_pass_sm.te_espet_pass_sm
     fedie.esdie_pass_sm.te_esdie_pass_sm
-    fedie.esdie_pass_lo.te_esdie_pass_lo
+    feh2t.esh2t_pass_sm.te_esh2t_pass_sm
+    fegat.esgat_pass_sm.te_esgat_pass_sm
     feelt.eselt_pass_sm.te_eselt_pass_sm
+    fedie.esdie_pass_lo.te_esdie_pass_lo
     fedie.esdie_frgt_lo.te_esdie_frgt_lo
     fedie.esdie_frgt_sm.te_esdie_frgt_sm
     feelt.eselt_frgt_sm.te_eselt_frgt_sm
+    feh2t.esh2t_frgt_sm.te_esh2t_frgt_sm
+    fegat.esgat_frgt_sm.te_esgat_frgt_sm
 /
 
+fe2ces_dyn35(all_enty,all_in,all_teEs)    "map FE carriers to CES nodes via appliances"
+/
+    fepet.entrp_pass_sm.te_espet_pass_sm
+    fedie.entrp_pass_sm.te_esdie_pass_sm
+    feh2t.entrp_pass_sm.te_esh2t_pass_sm
+    fegat.entrp_pass_sm.te_esgat_pass_sm
+    feelt.entrp_pass_sm.te_eselt_pass_sm
+    fedie.entrp_pass_lo.te_esdie_pass_lo
+    fedie.entrp_frgt_lo.te_esdie_frgt_lo
+    fedie.entrp_frgt_sm.te_esdie_frgt_sm
+    feelt.entrp_frgt_sm.te_eselt_frgt_sm
+    feh2t.entrp_frgt_sm.te_esh2t_frgt_sm
+    fegat.entrp_frgt_sm.te_esgat_frgt_sm
+/
 
 ces_transport_dyn35(all_in,all_in)   "CES tree structure - edge transport"
 /
@@ -92,13 +110,54 @@ 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"
+/
+conservative
+progressive
+/
+
+EDGE_scenario(EDGE_scenario_all)
+
 *** sets for the reporting, to be consistent with *complex* realisation
-FE_Transp_fety35(all_enty)  "set for reporting"
-/ fepet, fedie, feh2t, feelt /
-FE_Elec_fety35(all_enty)    "set for reporting" 
-/ feels, feelt /
+FE_Transp_fety35(all_enty)   / fepet, fedie, feh2t, feelt /
+FE_Elec_fety35(all_enty)     / feels, feelt /
+
+se2fe_dyn35(all_enty,all_enty,all_te)
+/
+segabio.fegat.tdbiogat
+segafos.fegat.tdfosgat
+/
+
+enty_dyn35(all_enty)
+/
+fegat        "final energy gas transport"
+/
+
+entyFeTrans_dyn35(all_enty)
+/
+fegat        "FE nat. gas transport"
+/
+
+emi2te_dyn35(all_enty,all_enty,all_te,all_enty)
+/
+segabio.fegat.tdbiogat.ch4
+segafos.fegat.tdfosgat.ch4
+/
+
 ;
 
+alias(teEs_dyn35,teEs_dyn35_2);
 teEs(teEs_dyn35)         = YES;
 in(in_dyn35)             = YES;
 
@@ -108,6 +167,16 @@ fe2es(fe2es_dyn35)       = YES;
 es2ppfen(es2ppfen_dyn35) = YES;
 ppfEn(ppfen_dyn35)       = YES;
 
+*** compatibility set overwrites
+se2fe(se2fe_dyn35) = YES;
+enty(enty_dyn35) = YES;
+entyFeTrans(entyFeTrans_dyn35) = YES;
+emi2te(emi2te_dyn35) = YES;
+
 cesOut2cesIn(ces_transport_dyn35)            = YES;
 
+
+EDGE_scenario("%cm_EDGEtr_scen%") = YES;
+SSP_scenario("%cm_GDPScen%") = YES;
+
 *** EOF ./modules/35_transport/edge_esm/sets.gms