diff --git a/modules/37_industry/subsectors/bounds.gms b/modules/37_industry/subsectors/bounds.gms index aa995635b..b68c735be 100755 --- a/modules/37_industry/subsectors/bounds.gms +++ b/modules/37_industry/subsectors/bounds.gms @@ -165,13 +165,9 @@ $endif.cm_subsec_model_steel $ifthen.fixedUE_scenario "%cm_fxIndUe%" == "on" -loop(ue_industry_dyn37(in), - loop(ext_regi$regi_fxDem37(ext_regi), - loop(regi$regi_groupExt(ext_regi,regi), - vm_cesIO.fx(t,regi,in)$(p37_bau_uedemand(t,regi,in)) - = p37_bau_uedemand(t,regi,in); - ); - ); +loop ((ue_industry_dyn37(in),regi_groupExt(regi_fxDem37(ext_regi),regi)), + vm_cesIO.fx(t,regi,in)$( p37_cesIO_baseline(t,regi,in) ) + = p37_cesIO_baseline(t,regi,in); ); $endif.fixedUE_scenario diff --git a/modules/37_industry/subsectors/datainput.gms b/modules/37_industry/subsectors/datainput.gms index 3d6a32d48..fed832bfd 100644 --- a/modules/37_industry/subsectors/datainput.gms +++ b/modules/37_industry/subsectors/datainput.gms @@ -727,9 +727,4 @@ if (cm_startyear gt 2005, ); $endif.cm_subsec_model_steel -if (cm_startyear gt 2005, -Execute_Loadpoint "input_ref" p37_bau_uedemand = vm_cesIO.l; -); - - *** EOF ./modules/37_industry/subsectors/datainput.gms diff --git a/modules/37_industry/subsectors/declarations.gms b/modules/37_industry/subsectors/declarations.gms index 4fd8b6708..5ed409313 100644 --- a/modules/37_industry/subsectors/declarations.gms +++ b/modules/37_industry/subsectors/declarations.gms @@ -42,7 +42,6 @@ Parameters p37_IndFeBal_FeedStock_RH(ttot,all_regi,all_enty,emiMkt) "testing parameter Ind FE Balance right-hand side feedstock term" p37_EmiEnDemand_NonEnCorr(ttot,all_regi) "energy demand co2 emissions with non-energy correction" p37_EmiEnDemand(ttot,all_regi) "energy demand co2 emissions without non-energy correction" - p37_bau_uedemand(ttot,all_regi,all_in) "baseline UE demand in industry" *** output parameters only for reporting o37_cementProcessEmissions(ttot,all_regi,all_enty) "cement process emissions [GtC/a]" o37_demFeIndTotEn(ttot,all_regi,all_enty,all_emiMkt) "total FE per energy carrier and emissions market in industry (sum over subsectors)"