adapt q37_demFeIndst and o37_demFeIndSub to q37_demFeIndst_intermediate

change
remindmodel · Mar 19, 2024 · 2bb59cd · 2bb59cd
1 parent 5b122b5
commit 2bb59cd
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/modules/37_industry/subsectors/equations.gms b/modules/37_industry/subsectors/equations.gms
@@ -13,36 +13,40 @@
 ***------------------------------------------------------
 *' Industry final energy balance
 ***------------------------------------------------------
-q37_demFeIndst_intermediate(t,regi,entyFe,in,secInd37,emiMkt)$(
-                                          ue_industry_dyn37(in)
-                                      AND secInd37_2_pf(secInd37,in)
+*' Industry final energy demand is calculated by (entySe,entyFe,out,secIind37)
+*' tuple, where out is the root of the CES subtree (e.g. ue_cement).  The
+*' (entyFe,out) tuple is equivalent to ppfen, and necessary to deal with
+*' process-based steel, which is not part of the CES tree below
+*' ue_steel_primary/ue_steel_secondary.
+q37_demFeIndst_intermediate(t,regi,entyFe,out,secInd37,emiMkt)$(
+                                          ue_industry_dyn37(out)
+                                      AND secInd37_2_pf(secInd37,out)
                                       AND secInd37_emiMkt(secInd37,emiMkt) ) ..
   sum(sefe(entySe,entyFe),
-    v37_demFeIndst(t,regi,entySe,entyFe,in,emiMkt)
+    v37_demFeIndst(t,regi,entySe,entyFe,out,emiMkt)
   )
   =e=
-    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)),
+    sum((ue_industry_2_pf(out,in),
+         fe2ppfEn(entyFe,in)),
+      vm_cesIO(t,regi,in)
+    + pm_cesdata(t,regi,in,"offset_quantity")
+    )
+  + sum(tePrc2ue(tePrc,opmoPrc,out),
       pm_specFeDem(t,regi,entyFe,tePrc,opmoPrc)
     * vm_outflowPrc(t,regi,tePrc,opmoPrc)
     )
 ;
 
 q37_demFeIndst(t,regi,entySe,entyFe,emiMkt)$(
                                              sefe(entySe,entyFe)
-                                         AND entyFe2Sector(entyFe,"indst") ) ..
+                                         AND entyFe2Sector(entyFe,"indst")
+                                         AND sector2emiMkt("indst",emiMkt) ) ..
   vm_demFeSector_afterTax(t,regi,entySe,entyFe,"indst",emiMkt)
   =e=
-  sum((fe2ppfEn(entyFe,in),
-       ppfen_industry_dyn37(in),
-       secInd37_2_pf(secInd37,in),
-       secInd37_emiMkt(secInd37,emiMkt)),
-    v37_demFeIndst(t,regi,entySe,entyFe,in,emiMkt)
+  sum((secInd37_emiMkt(secInd37,emiMkt),
+       secInd37_2_pf(secInd37,out),
+       ue_industry_dyn37(out)),
+    v37_demFeIndst(t,regi,entySe,entyFe,out,emiMkt)
   )
 ;
 

diff --git a/modules/37_industry/subsectors/postsolve.gms b/modules/37_industry/subsectors/postsolve.gms
@@ -33,9 +33,9 @@ o37_demFePrc(ttot,regi,entyFe,tePrc,opmoPrc)$(pm_specFeDem(ttot,regi,entyFe,tePr
 o37_demFeIndSub(ttot,regi,entySe,entyFe,secInd37,emiMkt)$(
                                              sefe(entySe,entyFe)
                                          AND secInd37_emiMkt(secInd37,emiMkt) )
-  = sum((fe2ppfEn(entyFe,in),
-         secInd37_2_pf(secInd37,in)),
-      v37_demFeIndst.l(ttot,regi,entySe,entyFe,in,emiMkt)
+  = sum((secInd37_2_pf(secInd37,out),
+         ue_industry_dyn37(out)),
+      v37_demFeIndst.l(ttot,regi,entySe,entyFe,out,emiMkt)
     );
 
 *** industry captured fuel CO2