remove q37_FossilFeedstock_Base

close #1606
remindmodel · Mar 11, 2024 · 3a93f60 · 3a93f60
1 parent 854dfea
commit 3a93f60
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/modules/37_industry/fixed_shares/not_used.txt b/modules/37_industry/fixed_shares/not_used.txt
@@ -32,5 +32,4 @@ vm_outflowPrc,               variable,   not needed
 vm_costMatPrc,               variable,   not needed
 pm_emifacNonEnergy,          parameter,  not needed
 pm_incinerationRate,         parameter,  not needed
-cm_emiscen,                  parameter,  not needed
 vm_demFeSector,              variable,   not needed
diff --git a/modules/37_industry/subsectors/declarations.gms b/modules/37_industry/subsectors/declarations.gms
@@ -99,7 +99,6 @@ $endif.no_calibration
   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"
-  q37_FossilFeedstock_Base(ttot,all_regi,all_enty,all_emiMkt)       "in baseline runs feedstocks only come from fossil energy carriers"
   q37_FeedstocksCarbon(ttot,all_regi,all_enty,all_enty,all_emiMkt)  "calculate carbon contained in feedstocks [GtC]"
   q37_plasticsCarbon(ttot,all_regi,all_enty,all_enty,all_emiMkt)            "calculate carbon contained in plastics [GtC]"
   q37_plasticWaste(ttot,all_regi,all_enty,all_enty,all_emiMkt)  "calculate carbon contained in plastic waste [GtC]"

diff --git a/modules/37_industry/subsectors/equations.gms b/modules/37_industry/subsectors/equations.gms
@@ -242,8 +242,7 @@ q37_feedstocksLimit(t,regi,entySe,entyFe,emiMkt)$(
 *' Feedstocks have identical fossil/biomass/synfuel shares as industry FE
 q37_feedstocksShares(t,regi,entySe,entyFe,emiMkt)$(
                          sum(te, se2fe(entySe,entyFe,te))
-                     AND entyFE2sector2emiMkt_NonEn(entyFe,"indst",emiMkt)
-                     AND cm_emiscen ne 1                                   ) ..                 
+                     AND entyFE2sector2emiMkt_NonEn(entyFe,"indst",emiMkt) ) ..                 
     vm_demFeSector_afterTax(t,regi,entySe,entyFe,"indst",emiMkt)
   * sum(se2fe(entySe2,entyFe,te),
       vm_demFENonEnergySector(t,regi,entySe2,entyFe,"indst",emiMkt)
@@ -321,18 +320,6 @@ q37_feedstockEmiUnknownFate(t,regi,sefe(entySe,entyFe),emiMkt)$(
   * (1 - s37_plasticsShare)
 ;
 
-*' in baseline runs, all industrial feedstocks should come from fossil energy
-*' carriers, no biofuels or synfuels
-q37_FossilFeedstock_Base(t,regi,entyFe,emiMkt)$(
-                         entyFE2sector2emiMkt_NonEn(entyFe,"indst",emiMkt)
-                     AND cm_emiscen eq 1                                   ) ..
-  sum(entySe, vm_demFENonEnergySector(t,regi,entySe,entyFe,"indst",emiMkt))
-  =e=
-  sum(entySeFos,
-    vm_demFENonEnergySector(t,regi,entySeFos,entyFe,"indst",emiMkt)
-  )
-;
-
 *** ---------------------------------------------------------------------------
 ***        2. Process-Based
 *** ---------------------------------------------------------------------------