diff --git a/CHANGELOG.md b/CHANGELOG.md index 24b4f5dca..4ff40ee5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## [Unreleased] +### changed +- **37_industry** changed industry to have subsector-specific shares of SE + origins in FE carriers[[#1620]](https://github.com/remindmodel/remind/pull/1620) + ### added - **config** regex tests for many parameters [[#1356](https://github.com/remindmodel/remind/pull/1356)] - **scripts** add script to check fixing of runs to reference run diff --git a/modules/21_tax/off/not_used.txt b/modules/21_tax/off/not_used.txt index 6199f444e..3dd1c8623 100644 --- a/modules/21_tax/off/not_used.txt +++ b/modules/21_tax/off/not_used.txt @@ -51,7 +51,6 @@ pm_pvp,input,questionnaire pm_taxemiMkt,input,questionnaire pm_taxemiMkt_iteration,input,questionnaire vm_Mport,input,questionnaire -vm_deltaCap, variable, ??? sm_TWa_2_MWh,input,questionnaire vm_emiCO2Sector,input,questionnaire pm_taxCO2eqSum,input,questionnare diff --git a/modules/37_industry/subsectors/declarations.gms b/modules/37_industry/subsectors/declarations.gms index 6fb18d67c..0241dc87e 100644 --- a/modules/37_industry/subsectors/declarations.gms +++ b/modules/37_industry/subsectors/declarations.gms @@ -86,38 +86,38 @@ 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 - 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" - q37_IndCCS(ttot,all_regi,emiInd37) "limit industry emissions abatement" - q37_limit_IndCCS_growth(ttot,all_regi,emiInd37) "limit industry CCS scale-up" - 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_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]" - q37_incinerationEmi(ttot,all_regi,all_enty,all_enty,all_emiMkt) "calculate carbon contained in plastics that are incinerated [GtC]" - q37_nonIncineratedPlastics(ttot,all_regi,all_enty,all_enty,all_emiMkt) "calculate carbon contained in plastics that are not incinerated [GtC]" - 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" + q37_energy_limits(ttot,all_regi,all_in) "thermodynamic/technical limit of energy use" +$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" + q37_IndCCS(ttot,all_regi,emiInd37) "limit industry emissions abatement" + q37_limit_IndCCS_growth(ttot,all_regi,emiInd37) "limit industry CCS scale-up" + 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_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]" + q37_incinerationEmi(ttot,all_regi,all_enty,all_enty,all_emiMkt) "calculate carbon contained in plastics that are incinerated [GtC]" + q37_nonIncineratedPlastics(ttot,all_regi,all_enty,all_enty,all_emiMkt) "calculate carbon contained in plastics that are not incinerated [GtC]" + 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 - 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" - q37_limitCapMat(tall,all_regi,all_te) "Material-flow conversion is limited by capacities" - q37_emiPrc(ttot,all_regi,all_enty,all_te,opmoPrc) "Local industry emissions [GtC/a] pre-capture; Only used as baseline for CCS" - q37_emiCCPrc(tall,all_regi,emiInd37) "Captured emissions from CCS" - q37_limitOutflowCCPrc(tall,all_regi,all_te) "Carbon capture processes can only capture as much co2 as the base process emits" - q37_costMat(tall,all_regi) "External material cost (non-energy)" + !! 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" + q37_limitCapMat(tall,all_regi,all_te) "Material-flow conversion is limited by capacities" + q37_emiPrc(ttot,all_regi,all_enty,all_te,opmoPrc) "Local industry emissions [GtC/a] pre-capture; Only used as baseline for CCS" + q37_emiCCPrc(tall,all_regi,emiInd37) "Captured emissions from CCS" + q37_limitOutflowCCPrc(tall,all_regi,all_te) "Carbon capture processes can only capture as much co2 as the base process emits" + q37_costMat(tall,all_regi) "External material cost (non-energy)" ; *** EOF ./modules/37_industry/subsectors/declarations.gms