Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix plastic waste to zero until 2010, and possibly to reference scenario values between 2015 and cm_startyear #1705

Merged
merged 2 commits into from
Jun 13, 2024
Merged

fix plastic waste to zero until 2010, and possibly to reference scenario values between 2015 and cm_startyear #1705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1afb929
formatting
0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q Jun 13, 2024
e935074
fix plastic waste to zero until 2010, and possibly to reference scenario
0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions modules/37_industry/subsectors/bounds.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.;
);
);
);
Expand All @@ -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
32 changes: 18 additions & 14 deletions modules/37_industry/subsectors/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand All @@ -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");
);

Expand All @@ -723,8 +723,12 @@ 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

if (cm_startyear gt 2005,
execute_load "input_ref.gdx" v37_plasticWaste.l = v37_plasticWaste.l;
);

*** EOF ./modules/37_industry/subsectors/datainput.gms
Loading