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

Change prefix of p37_specFeDem to pm_specFeDem #1553

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Change prefix of p37_specFeDem to pm_specFeDem #1553

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
f520a98
rename p37_specFeDem to pm_specFeDem
JakobBD Feb 15, 2024
ebf02ae
revert unintended variable name change
JakobBD Feb 15, 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
4 changes: 2 additions & 2 deletions modules/05_initialCap/on/preloop.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ q05_eedemini(regi,enty)..
)
)
!! Pathway IV: process-based industry
+ sum(tePrc2opmoPrc(tePrc,opmoPrc)$(p37_specFEDem("2005",regi,enty,tePrc,opmoPrc) gt 0.),
p37_specFEDem("2005",regi,enty,tePrc,opmoPrc)
+ sum(tePrc2opmoPrc(tePrc,opmoPrc)$(pm_specFeDem("2005",regi,enty,tePrc,opmoPrc) gt 0.),
pm_specFeDem("2005",regi,enty,tePrc,opmoPrc)
*
pm_outflowPrcIni(regi,tePrc,opmoPrc)
)$(entyFeStat(enty))
Expand Down
1 change: 1 addition & 0 deletions modules/37_industry/fixed_shares/not_used.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ pm_secBioShare, parameter, not needed
pm_exogDemScen, input, added by codeCheck
pm_ts, parameter, not needed
pm_outflowPrcIni, parameter, not needed
pm_specFeDem, parameter, not needed
sm_macChange, parameter, not needed
vm_demFENonEnergySector, variable, not needed
vm_FeedstocksCarbon, variable, not needed
Expand Down
36 changes: 18 additions & 18 deletions modules/37_industry/subsectors/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -641,7 +641,7 @@ $endif.cm_subsec_model_steel

*** --------------------------------

p37_specFeDem(tall,all_regi,all_enty,all_te,opmoPrc) = 0.;
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,
Expand All @@ -655,25 +655,25 @@ if (cm_startyear eq 2005,
pm_outflowPrcIni(regi,'idrcc','ng') = 0.;

loop(ttot$(ttot.val ge 2005 AND ttot.val le 2020),
p37_specFeDem(ttot,regi,"feh2s","idr","h2") = p37_specFeDemTarget("feh2s","idr","h2");
p37_specFeDem(ttot,regi,"feels","idr","h2") = p37_specFeDemTarget("feels","idr","h2");
pm_specFeDem(ttot,regi,"feh2s","idr","h2") = p37_specFeDemTarget("feh2s","idr","h2");
pm_specFeDem(ttot,regi,"feels","idr","h2") = p37_specFeDemTarget("feels","idr","h2");

p37_specFeDem(ttot,regi,"fegas","idr","ng") = p37_specFeDemTarget("fegas","idr","ng");
p37_specFeDem(ttot,regi,"feels","idr","ng") = p37_specFeDemTarget("feels","idr","ng");
pm_specFeDem(ttot,regi,"fegas","idr","ng") = p37_specFeDemTarget("fegas","idr","ng");
pm_specFeDem(ttot,regi,"feels","idr","ng") = p37_specFeDemTarget("feels","idr","ng");

p37_specFeDem(ttot,regi,"fegas","bfcc","standard") = p37_specFeDemTarget("fegas","bfcc","standard");
p37_specFeDem(ttot,regi,"feels","bfcc","standard") = p37_specFeDemTarget("feels","bfcc","standard");
pm_specFeDem(ttot,regi,"fegas","bfcc","standard") = p37_specFeDemTarget("fegas","bfcc","standard");
pm_specFeDem(ttot,regi,"feels","bfcc","standard") = p37_specFeDemTarget("feels","bfcc","standard");

p37_specFeDem(ttot,regi,"fegas","idrcc","ng") = p37_specFeDemTarget("fegas","idrcc","ng");
p37_specFeDem(ttot,regi,"feels","idrcc","ng") = p37_specFeDemTarget("feels","idrcc","ng");
pm_specFeDem(ttot,regi,"fegas","idrcc","ng") = p37_specFeDemTarget("fegas","idrcc","ng");
pm_specFeDem(ttot,regi,"feels","idrcc","ng") = p37_specFeDemTarget("feels","idrcc","ng");

p37_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') );
p37_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') );
p37_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') );
p37_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') );

p37_specFeDem(ttot,regi,"feels","eaf","sec") = pm_fedemand(ttot,regi,'feel_steel_secondary') * sm_EJ_2_TWa / pm_fedemand(ttot,regi,'ue_steel_secondary');
p37_specFeDem(ttot,regi,"feels","eaf","pri") = p37_specFeDem(ttot,regi,"feels","eaf","sec");
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");
);

!! loop over other years and blend
Expand All @@ -684,9 +684,9 @@ if (cm_startyear eq 2005,
loop(ttot$(ttot.val > 2020),
!! fedemand in excess of BAT halves until 2055
!! gams cannot handle float exponents, so pre-compute 0.5^(1/(2055-2020)) = 0.9804
p37_specFeDem(ttot,regi,all_enty,all_te,opmoPrc)
pm_specFeDem(ttot,regi,all_enty,all_te,opmoPrc)
= p37_specFeDemTarget(all_enty,all_te,opmoPrc)
+ (p37_specFeDem("2020",regi,all_enty,all_te,opmoPrc) - p37_specFeDemTarget(all_enty,all_te,opmoPrc))
+ (pm_specFeDem("2020",regi,all_enty,all_te,opmoPrc) - p37_specFeDemTarget(all_enty,all_te,opmoPrc))
* power(0.9804, ttot.val - 2020) ;
);
);
Expand All @@ -696,7 +696,7 @@ if (cm_startyear eq 2005,
);

if (cm_startyear gt 2005,
Execute_Loadpoint 'input_ref' p37_specFeDem = p37_specFeDem;
Execute_Loadpoint 'input_ref' pm_specFeDem = pm_specFeDem;
);
$endif.cm_subsec_model_steel

Expand Down
4 changes: 2 additions & 2 deletions modules/37_industry/subsectors/declarations.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ Parameters
p37_cesIO_baseline(tall,all_regi,all_in) "vm_cesIO from the baseline scenario"
!! process-based implementation
p37_specMatDem(mat,all_te,opmoPrc) "Specific materials demand of a production technology and operation mode [t_input/t_output]"
p37_specFeDem(tall,all_regi,all_enty,all_te,opmoPrc) "Actual specific final-energy demand of a tech; blends between IEA data and Target [TWa/Gt_output]"
p37_specFeDemTarget(all_enty,all_te,opmoPrc) "Best available technology (will be reached in convergence year) [TWa/Gt_output]"
pm_specFeDem(tall,all_regi,all_enty,all_te,opmoPrc) "Actual specific final-energy demand of a tech; blends between IEA data and Target [TWa/Gt_output]"
p37_specFeDemTarget(all_enty,all_te,opmoPrc) "Best available technology (will be reached in convergence year) [TWa/Gt_output]"
pm_outflowPrcIni(all_regi,all_te,opmoPrc) "Exogenously prescribed production volume of processes in start year (from IEA data)"
p37_mat2ue(all_enty,all_in) "Contribution of process output to ue in CES tree [Gt/Gt]. Trivial if just one material per UE, as in steel"
p37_captureRate(all_te,opmoPrc) "Capture rate of CCS technology"
Expand Down
4 changes: 2 additions & 2 deletions modules/37_industry/subsectors/equations.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ q37_demFeIndst(ttot,regi,entyFE,emiMkt)$( ttot.val ge cm_startyear
sum((secInd37_emiMkt(secInd37Prc,emiMkt),
secInd37_tePrc(secInd37Prc,tePrc),
tePrc2opmoPrc(tePrc,opmoPrc)),
p37_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc)
pm_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc)
*
vm_outflowPrc(ttot,regi,tePrc,opmoPrc)
)
Expand Down Expand Up @@ -395,7 +395,7 @@ q37_limitCapMat(ttot,regi,tePrc)$(ttot.val ge cm_startyear) ..
q37_emiPrc(ttot,regi,entyFE,tePrc,opmoPrc)$(ttot.val ge cm_startyear ) ..
v37_emiPrc(ttot,regi,entyFE,tePrc,opmoPrc)
=e=
p37_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc)
pm_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc)
*
sum(se2fe(entySEfos,entyFE,te),
pm_emifac(ttot,regi,entySEfos,entyFE,te,"co2"))
Expand Down
8 changes: 4 additions & 4 deletions modules/37_industry/subsectors/postsolve.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ pm_FEPrice(ttot,regi,entyFE,"indst",emiMkt)$( abs(qm_budget.m(ttot,regi)) gt sm_
*** calculate reporting parameters for FE per subsector and SE origin to make R
*** reporting easier

o37_demFePrc(ttot,regi,entyFE,tePrc,opmoPrc)$(p37_specFEDem(ttot,regi,entyFE,tePrc,opmoPrc))
o37_demFePrc(ttot,regi,entyFE,tePrc,opmoPrc)$(pm_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc))
= vm_outflowPrc.l(ttot,regi,tePrc,opmoPrc)
* p37_specFEDem(ttot,regi,entyFE,tePrc,opmoPrc)
* pm_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc)
;

*** total FE per energy carrier and emissions market in industry (sum over
Expand Down Expand Up @@ -104,7 +104,7 @@ loop((tePrc,opmoPrc,teCCPrc,opmoCCPrc)$(
o37_relativeOutflow(ttot,regi,teCCPrc,opmoCCPrc)
= p37_captureRate(teCCPrc,opmoCCPrc)
* sum(entyFe,
p37_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc)
pm_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc)
*
sum(se2fe(entySEfos,entyFE,te),
pm_emifac(ttot,regi,entySEfos,entyFE,te,"co2")))
Expand Down Expand Up @@ -174,7 +174,7 @@ loop((entyFE,route,tePrc,opmoPrc,secInd37)$( tePrc2route(tePrc,opmoPrc,route)
= o37_demFeIndRoute(ttot,regi,entyFE,tePrc,route,secInd37) !!sum (only necessary if several opmodes for one route)
+ vm_outflowPrc.l(ttot,regi,tePrc,opmoPrc)
* o37_shareRoute(ttot,regi,tePrc,opmoPrc,route)
* p37_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc);
* pm_specFeDem(ttot,regi,entyFE,tePrc,opmoPrc);
);

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