From 1afb9292788b1aa20d5d4366343d68f8587ae4a7 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Thu, 13 Jun 2024 14:35:10 +0200 Subject: [PATCH 1/2] formatting --- modules/37_industry/subsectors/bounds.gms | 12 ++++----- modules/37_industry/subsectors/datainput.gms | 28 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/37_industry/subsectors/bounds.gms b/modules/37_industry/subsectors/bounds.gms index b68c735be..01d139e02 100755 --- a/modules/37_industry/subsectors/bounds.gms +++ b/modules/37_industry/subsectors/bounds.gms @@ -139,17 +139,17 @@ $ifthen.cm_subsec_model_steel "%cm_subsec_model_steel%" == "processes" if (cm_startyear eq 2005, loop(regi, loop(tePrc2opmoPrc(tePrc,opmoPrc), - vm_outflowPrc.fx('2005',regi,tePrc,opmoPrc) = pm_outflowPrcIni(regi,tePrc,opmoPrc); + vm_outflowPrc.fx("2005",regi,tePrc,opmoPrc) = pm_outflowPrcIni(regi,tePrc,opmoPrc); ); ); loop(regi, loop(ttot$(ttot.val ge 2005 AND ttot.val le 2020), - vm_outflowPrc.fx(ttot,regi,'eaf','pri') = 0.; - vm_outflowPrc.fx(ttot,regi,'idr','ng') = 0.; - vm_outflowPrc.fx(ttot,regi,'idr','h2') = 0.; - vm_outflowPrc.fx(ttot,regi,'bfcc','standard') = 0.; - vm_outflowPrc.fx(ttot,regi,'idrcc','ng') = 0.; + vm_outflowPrc.fx(ttot,regi,"eaf","pri") = 0.; + vm_outflowPrc.fx(ttot,regi,"idr","ng") = 0.; + vm_outflowPrc.fx(ttot,regi,"idr","h2") = 0.; + vm_outflowPrc.fx(ttot,regi,"bfcc","standard") = 0.; + vm_outflowPrc.fx(ttot,regi,"idrcc","ng") = 0.; ); ); ); diff --git a/modules/37_industry/subsectors/datainput.gms b/modules/37_industry/subsectors/datainput.gms index fed832bfd..982350d59 100644 --- a/modules/37_industry/subsectors/datainput.gms +++ b/modules/37_industry/subsectors/datainput.gms @@ -672,14 +672,14 @@ pm_specFeDem(tall,all_regi,all_enty,all_te,opmoPrc) = 0.; pm_outflowPrcIni(all_regi,all_te,opmoPrc) = 0.; $ifthen.cm_subsec_model_steel "%cm_subsec_model_steel%" == "processes" if (cm_startyear eq 2005, - pm_outflowPrcIni(regi,'bof','unheated') = pm_fedemand('2005',regi,'ue_steel_primary'); - pm_outflowPrcIni(regi,'bf','standard') = p37_specMatDem("pigiron","bof","unheated") * pm_outflowPrcIni(regi,'bof','unheated'); - pm_outflowPrcIni(regi,'eaf','sec') = pm_fedemand('2005',regi,'ue_steel_secondary'); - pm_outflowPrcIni(regi,'eaf','pri') = 0.; - pm_outflowPrcIni(regi,'idr','ng') = 0.; - pm_outflowPrcIni(regi,'idr','h2') = 0.; - pm_outflowPrcIni(regi,'bfcc','standard') = 0.; - pm_outflowPrcIni(regi,'idrcc','ng') = 0.; + pm_outflowPrcIni(regi,"bof","unheated") = pm_fedemand("2005",regi,"ue_steel_primary"); + pm_outflowPrcIni(regi,"bf","standard") = p37_specMatDem("pigiron","bof","unheated") * pm_outflowPrcIni(regi,"bof","unheated"); + pm_outflowPrcIni(regi,"eaf","sec") = pm_fedemand("2005",regi,"ue_steel_secondary"); + pm_outflowPrcIni(regi,"eaf","pri") = 0.; + pm_outflowPrcIni(regi,"idr","ng") = 0.; + pm_outflowPrcIni(regi,"idr","h2") = 0.; + pm_outflowPrcIni(regi,"bfcc","standard") = 0.; + pm_outflowPrcIni(regi,"idrcc","ng") = 0.; loop(ttot$(ttot.val ge 2005 AND ttot.val le 2020), pm_specFeDem(ttot,regi,"feh2s","idr","h2") = p37_specFeDemTarget("feh2s","idr","h2"); @@ -694,12 +694,12 @@ if (cm_startyear eq 2005, pm_specFeDem(ttot,regi,"fegas","idrcc","ng") = p37_specFeDemTarget("fegas","idrcc","ng"); pm_specFeDem(ttot,regi,"feels","idrcc","ng") = p37_specFeDemTarget("feels","idrcc","ng"); - pm_specFeDem(ttot,regi,"fesos","bf","standard") = pm_fedemand(ttot,regi,'feso_steel') * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,'ue_steel_primary') ); - pm_specFeDem(ttot,regi,"fehos","bf","standard") = pm_fedemand(ttot,regi,'feli_steel') * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,'ue_steel_primary') ); - pm_specFeDem(ttot,regi,"fegas","bf","standard") = pm_fedemand(ttot,regi,'fega_steel') * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,'ue_steel_primary') ); - pm_specFeDem(ttot,regi,"feels","bf","standard") = pm_fedemand(ttot,regi,'feel_steel_primary') * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,'ue_steel_primary') ); + pm_specFeDem(ttot,regi,"fesos","bf","standard") = pm_fedemand(ttot,regi,"feso_steel") * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,"ue_steel_primary") ); + pm_specFeDem(ttot,regi,"fehos","bf","standard") = pm_fedemand(ttot,regi,"feli_steel") * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,"ue_steel_primary") ); + pm_specFeDem(ttot,regi,"fegas","bf","standard") = pm_fedemand(ttot,regi,"fega_steel") * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,"ue_steel_primary") ); + pm_specFeDem(ttot,regi,"feels","bf","standard") = pm_fedemand(ttot,regi,"feel_steel_primary") * sm_EJ_2_TWa / ( p37_specMatDem("pigiron","bof","unheated") * pm_fedemand(ttot,regi,"ue_steel_primary") ); - pm_specFeDem(ttot,regi,"feels","eaf","sec") = pm_fedemand(ttot,regi,'feel_steel_secondary') * sm_EJ_2_TWa / pm_fedemand(ttot,regi,'ue_steel_secondary'); + pm_specFeDem(ttot,regi,"feels","eaf","sec") = pm_fedemand(ttot,regi,"feel_steel_secondary") * sm_EJ_2_TWa / pm_fedemand(ttot,regi,"ue_steel_secondary"); pm_specFeDem(ttot,regi,"feels","eaf","pri") = pm_specFeDem(ttot,regi,"feels","eaf","sec"); ); @@ -723,7 +723,7 @@ if (cm_startyear eq 2005, ); if (cm_startyear gt 2005, - Execute_Loadpoint 'input_ref' pm_specFeDem = pm_specFeDem; + Execute_Loadpoint "input_ref" pm_specFeDem = pm_specFeDem; ); $endif.cm_subsec_model_steel From e935074eac701d0341a202f982d548fe46c291a3 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Thu, 13 Jun 2024 14:22:54 +0200 Subject: [PATCH 2/2] fix plastic waste to zero until 2010, and possibly to reference scenario values between 2015 and cm_startyear --- modules/37_industry/subsectors/bounds.gms | 7 +++++++ modules/37_industry/subsectors/datainput.gms | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/modules/37_industry/subsectors/bounds.gms b/modules/37_industry/subsectors/bounds.gms index 01d139e02..029e0b8ff 100755 --- a/modules/37_industry/subsectors/bounds.gms +++ b/modules/37_industry/subsectors/bounds.gms @@ -171,5 +171,12 @@ loop ((ue_industry_dyn37(in),regi_groupExt(regi_fxDem37(ext_regi),regi)), ); $endif.fixedUE_scenario +*** fix plastic waste to zero until 2010, and possible to reference scenario +*** values between 2015 and cm_startyear +v37_plasticWaste.fx(t,regi,entySe,entyFe,emiMkt)$( + t.val lt max(2015, cm_startyear) + AND sefe(entySe,entyFe) + AND entyFE2sector2emiMkt_NonEn(entyFe,"indst",emiMkt) ) + = v37_plasticWaste.l(t,regi,entySe,entyFe,emiMkt)$( t.val ge 2015 ); *** EOF ./modules/37_industry/subsectors/bounds.gms diff --git a/modules/37_industry/subsectors/datainput.gms b/modules/37_industry/subsectors/datainput.gms index 982350d59..9e5e20692 100644 --- a/modules/37_industry/subsectors/datainput.gms +++ b/modules/37_industry/subsectors/datainput.gms @@ -727,4 +727,8 @@ if (cm_startyear gt 2005, ); $endif.cm_subsec_model_steel +if (cm_startyear gt 2005, + execute_load "input_ref.gdx" v37_plasticWaste.l = v37_plasticWaste.l; +); + *** EOF ./modules/37_industry/subsectors/datainput.gms