From 7b7d5d905b85f5411b0b2f4c0cce0c560bcb7822 Mon Sep 17 00:00:00 2001 From: Michaja Pehl Date: Fri, 18 Aug 2023 15:23:25 +0200 Subject: [PATCH] addendum to #1354: carry changes over to fixed_shares; remove unused parameters --- .../37_industry/fixed_shares/declarations.gms | 1 - .../37_industry/fixed_shares/postsolve.gms | 37 +++++++++++-------- .../37_industry/subsectors/declarations.gms | 1 - modules/37_industry/subsectors/postsolve.gms | 11 ------ 4 files changed, 21 insertions(+), 29 deletions(-) diff --git a/modules/37_industry/fixed_shares/declarations.gms b/modules/37_industry/fixed_shares/declarations.gms index b322173b3..da220963f 100644 --- a/modules/37_industry/fixed_shares/declarations.gms +++ b/modules/37_industry/fixed_shares/declarations.gms @@ -30,7 +30,6 @@ Parameters o37_cementProcessEmissions(ttot,all_regi,all_enty) "cement process emissions [GtC/a]" o37_CESderivatives(ttot,all_regi,all_in,all_in) "derivatives of production CES function" o37_demFeIndSub(ttot,all_regi,all_enty,all_enty,secInd37,all_emiMkt) "FE demand per industry subsector, FE carrier, SE carrier, emissions market" - o37_demFeIndSub_SecCC(ttot,all_regi,secInd37) "FE per subsector whose emissions can be captured, helper parameter for calculation of industry captured CO2" !! empty parameters from subsectors pm_energy_limit(all_in) "" / / diff --git a/modules/37_industry/fixed_shares/postsolve.gms b/modules/37_industry/fixed_shares/postsolve.gms index 2f0ce21a5..31a50ff64 100644 --- a/modules/37_industry/fixed_shares/postsolve.gms +++ b/modules/37_industry/fixed_shares/postsolve.gms @@ -25,22 +25,27 @@ o37_demFeIndSub(ttot,regi,entySe,entyFe,secInd37,emiMkt) = sum(fe2ppfEn37(entyFe,in), p37_shIndFE(regi,in,secInd37)) * vm_demFeSector_afterTax.l(ttot,regi,entySe,entyFe,"indst",emiMkt); -*** FE per subsector whose emissions can be captured (helper parameter for -*** calculation of industry captured CO2 below) -o37_demFeIndSub_SecCC(ttot,regi,secInd37) - = sum((se2fe(entySe,entyFe,te),macBaseInd37(entyFe,secInd37), - sector2emiMkt("indst",emiMkt)), - o37_demFeIndSub(ttot,regi,entySe,entyFe,secInd37,emiMkt) - ); - -*** industry captured CO2 -pm_IndstCO2Captured(ttot,regi,entySe,entyFe,secInd37,emiMkt)$( - entyFeCC37(entyFe) AND o37_demFeIndSub_SecCC(ttot,regi,secInd37) - AND macBaseInd37(entyFe,secInd37)) - = sum( secInd37_2_emiInd37(secInd37,emiInd37)$(emiInd37_fuel(emiInd37)), - vm_emiIndCCS.l(ttot,regi,emiInd37) +*** industry captured fuel CO2 +pm_IndstCO2Captured(ttot,regi,entySE,entyFE(entyFEcc37),secInd37,emiMkt)$( + macBaseInd37(entyFE,secInd37) + AND sum(entyFE2, vm_macBaseInd.l(ttot,regi,entyFE2,secInd37)) ) + = ( o37_demFEindsub(ttot,regi,entySE,entyFE,secInd37,emiMkt) + * sum(se2fe(entySE2,entyFE,te), + !! collapse entySE dimension, so emission factors apply to all entyFE + !! regardless or origin, and therefore entySEbio and entySEsyn have + !! non-zero emission factors + pm_emifac(ttot,regi,entySE2,entyFE,te,"co2") ) - * o37_demFeIndSub(ttot,regi,entySe,entyFe,secInd37,emiMkt) - / o37_demFeIndSub_SecCC(ttot,regi,secInd37); + ) !! subsector emissions (smokestack, i.e. including biomass & synfuels) + + * ( sum(secInd37_2_emiInd37(secInd37,emiInd37(emiInd37_fuel)), + vm_emiIndCCS.l(ttot,regi,emiInd37) + ) !! subsector captured energy emissions + + / sum(entyFE2, + vm_macBaseInd.l(ttot,regi,entyFE2,secInd37) + ) !! subsector total energy emissions + ) !! subsector capture share +; *** EOF ./modules/37_industry/fixed_shares/postsolve.gms diff --git a/modules/37_industry/subsectors/declarations.gms b/modules/37_industry/subsectors/declarations.gms index ac97a3060..324564b08 100644 --- a/modules/37_industry/subsectors/declarations.gms +++ b/modules/37_industry/subsectors/declarations.gms @@ -33,7 +33,6 @@ $endif.process_based_steel o37_demFeIndTotEn(ttot,all_regi,all_enty,all_emiMkt) "total FE per energy carrier and emissions market in industry (sum over subsectors)" o37_shIndFE(ttot,all_regi,all_enty,secInd37,all_emiMkt) "share of subsector in FE industry energy carriers and emissions markets" o37_demFeIndSub(ttot,all_regi,all_enty,all_enty,secInd37,all_emiMkt) "FE demand per industry subsector" - o37_demFeIndSub_SecCC(ttot,all_regi,secInd37) "FE per subsector whose emissions can be captured, helper parameter for calculation of industry captured CO2" $ifThen.CESMkup not "%cm_CESMkup_ind%" == "standard" p37_CESMkup_input(all_in) "markup cost parameter read in from config for CES levels in industry to influence demand-side cost and efficiencies in CES tree [trUSD/CES input]" / %cm_CESMkup_ind% / diff --git a/modules/37_industry/subsectors/postsolve.gms b/modules/37_industry/subsectors/postsolve.gms index 0e0ba73b1..59502ccd1 100644 --- a/modules/37_industry/subsectors/postsolve.gms +++ b/modules/37_industry/subsectors/postsolve.gms @@ -42,17 +42,6 @@ o37_demFeIndSub(ttot,regi,entySe,entyFe,secInd37,emiMkt) * vm_demFeSector_afterTax.l(ttot,regi,entySe,entyFe,"indst",emiMkt) ); -*** FE per subsector whose emissions can be captured (helper parameter for -*** calculation of industry captured CO2 below) -*** NOTE: not used for pm_IndstCO2Captured anymore since it did not take into -*** account the different emission factors of FE carriers. But used in remind2, -*** so kept for backwards compatibility. -o37_demFeIndSub_SecCC(ttot,regi,secInd37) - = sum((se2fe(entySe,entyFe,te),macBaseInd37(entyFe,secInd37), - sector2emiMkt("indst",emiMkt)), - o37_demFeIndSub(ttot,regi,entySe,entyFe,secInd37,emiMkt) - ); - *** industry captured fuel CO2 pm_IndstCO2Captured(ttot,regi,entySE,entyFE(entyFEcc37),secInd37,emiMkt)$( macBaseInd37(entyFE,secInd37)