diff --git a/modules/29_CES_parameters/calibrate/datainput.gms b/modules/29_CES_parameters/calibrate/datainput.gms index 46f4da4a3c647578c03ed4611bfb6932009f33e7..b2dacadb50f21bfdd9dbdbcd24f8a25056eaa74b 100644 --- a/modules/29_CES_parameters/calibrate/datainput.gms +++ b/modules/29_CES_parameters/calibrate/datainput.gms @@ -161,7 +161,6 @@ $offdelim / - p29_esdemand "energy service demand" / $ondelim @@ -169,12 +168,14 @@ $include "./modules/29_CES_parameters/calibrate/input/pm_es_demand.cs4r" $offdelim / +$ifthen.edgesm %transport% == "edge_esm" p29_trpdemand "transport demand" / $ondelim $include "./modules/29_CES_parameters/calibrate/input/pm_trp_demand.cs4r" $offdelim / +$endif.edgesm p29_efficiency_growth "efficency growth for ppf beyond calibration" diff --git a/modules/29_CES_parameters/calibrate/declarations.gms b/modules/29_CES_parameters/calibrate/declarations.gms index f9bb79e053211486f55083e22aaa73cb1e3ab29e..cb29d27632c353bf06add7124546983212f14412 100644 --- a/modules/29_CES_parameters/calibrate/declarations.gms +++ b/modules/29_CES_parameters/calibrate/declarations.gms @@ -17,7 +17,9 @@ Parameters p29_effGr(tall,all_regi,all_in) "growth of factor efficiency from input.gdx" p29_fedemand(tall,all_regi,all_GDPscen,all_in) "final energy demand" p29_cesdata_price(tall,all_regi,all_in) "exogenous prices in case they are needed" +$ifthen.edgesm %transport% == "edge_esm" p29_trpdemand(tall,all_regi,all_GDPscen,EDGE_scenario_all,all_in) "transport demand for the edge_esm transport module, unit: trillion passenger/ton km" +$endif.edgesm p29_esdemand(tall,all_regi,all_GDPscen,all_in) "energy service demand" p29_efficiency_growth(tall,all_regi,all_GDPscen,all_in) "efficency level paths for ppf beyond calibration" p29_capitalQuantity(tall,all_regi,all_GDPscen,all_in) "capital quantities" diff --git a/modules/29_CES_parameters/calibrate/input/files b/modules/29_CES_parameters/calibrate/input/files index 9918ed623c2b19d6a5e3612e5a997d757597f2dc..28524ae89be69cf9c96c4d0f087c73c32b8efdfd 100644 --- a/modules/29_CES_parameters/calibrate/input/files +++ b/modules/29_CES_parameters/calibrate/input/files @@ -2,6 +2,7 @@ p29_capitalQuantity.cs4r p29_efficiency_growth.cs4r pm_es_demand.cs4r pm_fe_demand.cs4r +pm_trp_demand.cs4r p29_cesdata_price.cs4r f29_capitalUnitProjections.cs4r