Merge pull request #1690 from 0UmfHxcvx5J7JoaOhFSs5mncnisTJJ6q/dev/cl…

…ean_exogenous_industry_demand use existing parameters to fix industry demand
remindmodel · May 30, 2024 · 73237e6 · 73237e6
2 parents 142c841 + dd3bc36
commit 73237e6
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/modules/37_industry/subsectors/bounds.gms b/modules/37_industry/subsectors/bounds.gms
@@ -165,13 +165,9 @@ $endif.cm_subsec_model_steel
 
 $ifthen.fixedUE_scenario "%cm_fxIndUe%" == "on"
 
-loop(ue_industry_dyn37(in),
-  loop(ext_regi$regi_fxDem37(ext_regi),
-    loop(regi$regi_groupExt(ext_regi,regi),
-      vm_cesIO.fx(t,regi,in)$(p37_bau_uedemand(t,regi,in))
-        = p37_bau_uedemand(t,regi,in);
-    );
-  );
+loop ((ue_industry_dyn37(in),regi_groupExt(regi_fxDem37(ext_regi),regi)),
+  vm_cesIO.fx(t,regi,in)$( p37_cesIO_baseline(t,regi,in) )
+  = p37_cesIO_baseline(t,regi,in);
 );
 $endif.fixedUE_scenario
 

diff --git a/modules/37_industry/subsectors/datainput.gms b/modules/37_industry/subsectors/datainput.gms
@@ -727,9 +727,4 @@ if (cm_startyear gt 2005,
 );
 $endif.cm_subsec_model_steel
 
-if (cm_startyear gt 2005,
-Execute_Loadpoint "input_ref" p37_bau_uedemand = vm_cesIO.l;
-);
-
-
 *** EOF ./modules/37_industry/subsectors/datainput.gms
diff --git a/modules/37_industry/subsectors/declarations.gms b/modules/37_industry/subsectors/declarations.gms
@@ -42,7 +42,6 @@ Parameters
   p37_IndFeBal_FeedStock_RH(ttot,all_regi,all_enty,emiMkt)   "testing parameter Ind FE Balance right-hand side feedstock term"
   p37_EmiEnDemand_NonEnCorr(ttot,all_regi)                   "energy demand co2 emissions with non-energy correction"
   p37_EmiEnDemand(ttot,all_regi)                             "energy demand co2 emissions without non-energy correction"
-  p37_bau_uedemand(ttot,all_regi,all_in)	             "baseline UE demand in industry"
 *** 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)"