adapt q37_demFeIndst_intermediate: define v37_demFeIndst over ue inst…

…ead of ppfen to be compatible wit process-based implemen-based implementation
remindmodel · Mar 21, 2024 · 34a2297 · 34a2297
1 parent d65c4e7
commit 34a2297
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 15 deletions.
diff --git a/modules/37_industry/subsectors/declarations.gms b/modules/37_industry/subsectors/declarations.gms
@@ -44,8 +44,6 @@ Parameters
 
 *** 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)"
-  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"
   !! process-based implementation
   o37_demFePrc(ttot,all_regi,all_enty,all_te,opmoPrc)                    "Process-based FE demand per FE type and process"
@@ -87,7 +85,7 @@ Positive Variables
 Equations
 $ifthen.no_calibration "%CES_parameters%" == "load"   !! CES_parameters
   q37_energy_limits(ttot,all_regi,all_in)                                           "thermodynamic/technical limit of energy use"
-$endif.no_calibration                                                               
+$endif.no_calibration
   q37_limit_secondary_steel_share(ttot,all_regi)                                    "no more than 90% of steel from seconday production"
   q37_emiIndBase(ttot,all_regi,all_enty,secInd37)                                   "gross industry emissions before CCS"
   q37_emiIndCCSmax(ttot,all_regi,emiInd37)                                          "maximum abatable industry emissions at current CO2 price"
@@ -96,7 +94,7 @@ $endif.no_calibration
   q37_cementCCS(ttot,all_regi)                                                      "link cement fuel and process abatement"
   q37_IndCCSCost                                                                    "Calculate industry CCS costs"
   q37_demFeIndst(ttot,all_regi,all_enty,all_enty,all_emiMkt)                        "industry final energy demand (per emission market)"
-  q37_demFeIndst_intermediate(ttot,all_regi,all_in,secInd37,all_emiMkt)             "industry final energy demand (per emission market)"
+  q37_demFeIndst_intermediate(ttot,all_regi,all_enty,all_in,secInd37,all_emiMkt)    "industry final energy demand (per emission market)"
   q37_costCESmarkup(ttot,all_regi,all_in)                                           "calculation of additional CES markup cost to represent demand-side technology cost of end-use transformation, for example, cost of heat pumps etc."
   q37_chemicals_feedstocks_limit(ttot,all_regi)                                     "lower bound on feso/feli/fega in chemicals FE input for feedstocks"
   q37_demFeFeedstockChemIndst(ttot,all_regi,all_enty,all_emiMkt)                    "defines energy flow of non-energy feedstocks for the chemicals industry. It is used for emissions accounting"
@@ -109,7 +107,7 @@ $endif.no_calibration
   q37_feedstockEmiUnknownFate(ttot,all_regi,all_enty,all_enty,all_emiMkt)           "calculate carbon contained in chemical feedstock with unknown fate [GtC]"
   q37_feedstocksLimit(ttot,all_regi,all_enty,all_enty,all_in,secInd37,all_emiMkt)   "restrict feedstocks flow to total energy flows into industry"
 
-  !! process-based implementation                                                   
+  !! process-based implementation
   q37_demMatPrc(tall,all_regi,mat)                                                  "Material demand of processes"
   q37_prodMat(tall,all_regi,mat)                                                    "Production volume of processes equals material flow of output material"
   q37_mat2ue(tall,all_regi,all_in)                                                  "Connect materials production to ue ces tree nodes"

diff --git a/modules/37_industry/subsectors/equations.gms b/modules/37_industry/subsectors/equations.gms
@@ -13,21 +13,21 @@
 ***------------------------------------------------------
 *' Industry final energy balance
 ***------------------------------------------------------
-q37_demFeIndst_intermediate(t,regi,in,secInd37,emiMkt)$(
-                                          ppfen_industry_dyn37(in)
+q37_demFeIndst_intermediate(t,regi,entyFe,in,secInd37,emiMkt)$(
+                                          ue_industry_dyn37(in)
                                       AND secInd37_2_pf(secInd37,in)
                                       AND secInd37_emiMkt(secInd37,emiMkt) ) ..
-  sum((sefe(entySe,entyFe),
-       fe2ppfEn(entyFe,in)),
+  sum(sefe(entySe,entyFe),
     v37_demFeIndst(t,regi,entySe,entyFe,in,emiMkt)
   )
   =e=
-    ( vm_cesIO(t,regi,in)
-    + pm_cesdata(t,regi,in,"offset_quantity")
-    )$( NOT secInd37Prc(secInd37) )
-  + sum((secInd37_tePrc(secInd37,tePrc),
-         tePrc2opmoPrc(tePrc,opmoPrc),
-         fe2ppfEn(entyFe,in)),
+    sum((ue_industry_2_pf(in,in2),
+         fe2ppfEn(entyFe,in2)),
+    ( vm_cesIO(t,regi,in2)
+    + pm_cesdata(t,regi,in2,"offset_quantity")
+    ))
+  + sum((tePrc2ue(tePrc,in),
+         tePrc2opmoPrc(tePrc,opmoPrc)),
       pm_specFeDem(t,regi,entyFe,tePrc,opmoPrc)
     * vm_outflowPrc(t,regi,tePrc,opmoPrc)
     )