Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove industry/fixed_shares #1941

Draft
wants to merge 10 commits into
base: develop
Choose a base branch
from
Draft

Remove industry/fixed_shares #1941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
365a84f
remove industry/fixed_shares
fbenke-pik Jan 6, 2025
6a42b50
Merge branch 'develop' of github.com:remindmodel/remind into refactor
fbenke-pik Jan 7, 2025
3fb088d
rename variables to satisfy codeCheck
fbenke-pik Jan 7, 2025
f5c8508
remove 'pm_CementDemandReductionCost'
fbenke-pik Jan 7, 2025
a431140
remove fe_tax_sub37
fbenke-pik Jan 7, 2025
61bf6fc
Merge branch 'develop' of github.com:remindmodel/remind into refactor
fbenke-pik Jan 10, 2025
f4ea23c
fix compile errors
fbenke-pik Jan 14, 2025
ea33377
mark technologies for deletion
fbenke-pik Jan 14, 2025
d46a446
move 'pm_abatparam_Ind.gms' to 'datainput.gms'
fbenke-pik Jan 14, 2025
4a17f80
Merge branch 'develop' of github.com:remindmodel/remind into refactor
fbenke-pik Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/default.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cfg$regionmapping <- "config/regionmappingH12.csv"
cfg$extramappings_historic <- ""

#### Current input data revision (<mainrevision>.<subrevision>) ####
cfg$inputRevision <- "7.19"
cfg$inputRevision <- "7.19refactor"

#### Current CES parameter and GDX revision (commit hash) ####
cfg$CESandGDXversion <- "cfe76b2cb670aee30490e8191a5498ff8b0b6421"
Expand Down
22 changes: 0 additions & 22 deletions core/bounds.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,28 +505,6 @@ vm_emiFgas.fx(ttot,all_regi,all_enty) = f_emiFgas(ttot,all_regi,"%c_SSP_forcing_
display vm_emiFgas.L;


*** Bugfix. For some reason the model cannot reduce the production of district heating to 0
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can this really be removed, or does it have to be refactored?

*** where it should be 0. Not fixings can account for this
*** Fixing vm_prodSe to 0 avoids the problem
loop ((in,in2) $ (sameAs(in,"feheb") and sameAs(in2,"fehei")),
loop ((t, regi) $ ( (sameAs(t,"2010") OR sameAs(t,"2015"))
AND
((pm_cesdata(t,regi,in,"quantity") + pm_cesdata(t,regi,in,"offset_quantity")
+ pm_cesdata(t,regi,in2,"quantity") + pm_cesdata(t,regi,in2,"offset_quantity")
) eq 0)
AND
(sum(ttot$(ttot.val lt 2005), vm_deltaCap.up(ttot,regi,"biochp","1")) eq 0)) ,
vm_prodSe.up(t,regi,"pegas" ,"seel","gaschp") = 0;
vm_prodSe.up(t,regi,"pecoal" ,"seel","coalchp") = 0;
vm_prodSe.up(t,regi,"pecoal" ,"sehe","coalhp") = 0;
vm_prodSe.up(t,regi,"pegeo" ,"sehe","geohe") = 0;
vm_prodSe.up(t,regi,"pesol" ,"sehe","solhe") = 0;
vm_prodSe.up(t,regi,"pebiolc","seel","biochp") = 0;
vm_prodSe.up(t,regi,"pebiolc","sehe","biohp") = 0;
vm_prodSe.up(t,regi,"pegas","sehe","gashp") = 0;
);
);

***----------------------------------------------------------------------------
*** lower bound on share of green hydrogen starting from 2030 (c_greenH2)
***----------------------------------------------------------------------------
Expand Down
11 changes: 2 additions & 9 deletions core/datainput.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,13 +516,6 @@ $offdelim
/
;

parameter pm_share_ind_fehos(tall,all_regi) "Share of heating oil used in the industry (rest is residential)"
/
$ondelim
$include "./core/input/p_share_ind_fehos.cs4r"
$offdelim
/
;
*** initialize pm_share_trans with the global value, will be updated after each negishi/nash iteration
pm_share_trans("2005",regi) = 0.617;
pm_share_trans("2010",regi) = 0.625;
Expand Down Expand Up @@ -1384,9 +1377,9 @@ $if %cm_MAgPIE_coupling% == "off" pm_macSwitch("co2luc") = 0;
*** The tiny fraction n2ofertsom of total land use n2o can get slightly negative in some cases. Ignore MAC for n2ofertsom by default.
$if %cm_MAgPIE_coupling% == "off" pm_macSwitch("n2ofertsom") = 0;

pm_macCostSwitch(enty)=pm_macSwitch(enty);
p_macCostSwitch(enty)=pm_macSwitch(enty);
pm_macSwitch("co2cement_process") =0 ;
pm_macCostSwitch("co2cement_process") =0 ;
p_macCostSwitch("co2cement_process") =0 ;

*** load econometric emission data
*** read in p3 and p4
Expand Down
11 changes: 5 additions & 6 deletions core/declarations.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,12 @@ p_macLevFree(tall,all_regi,all_enty) "Phase in of zero-cost MAC
pm_macCost(tall,all_regi,all_enty) "abatement costs for all emissions subject to MACCs (type emiMacSector) []"
pm_macStep(tall,all_regi,all_enty) "step number of abatement level [integer]"
pm_macSwitch(all_enty) "switch to include mac option in the code"
pm_macCostSwitch(all_enty) "switch to include mac costs in the code (e.g. in coupled scenarios, we want to include the costs in REMIND, but MAC effects on emissions are calculated in MAgPIE)"
p_macCostSwitch(all_enty) "switch to include mac costs in the code (e.g. in coupled scenarios, we want to include the costs in REMIND, but MAC effects on emissions are calculated in MAgPIE)"
p_priceCO2(tall,all_regi) "carbon price [$/tC]"
pm_priceCO2forMAC(tall,all_regi,all_enty) "carbon price defined for MAC gases [$/tC]"
p_priceCO2forMAC(tall,all_regi,all_enty) "carbon price defined for MAC gases [$/tC]"
p_priceGas(tall,all_regi) "gas price for ch4gas MAC [$/tCeq]"
pm_ResidualCementDemand(tall,all_regi) "reduction in cemend demand (and thus process emissions) due to climate policy [0...1]"
pm_CementAbatementPrice(ttot,all_regi) "CO2 price used during calculation of cement demand reduction [$/tCO2]"
pm_CementDemandReductionCost(tall,all_regi) "cost of reducing cement demand [tn$2005]"
p_ResidualCementDemand(tall,all_regi) "reduction in cemend demand (and thus process emissions) due to climate policy [0...1]"
p_CementAbatementPrice(ttot,all_regi) "CO2 price used during calculation of cement demand reduction [$/tCO2]"
p_macPE(ttot,all_regi,all_enty) "pe from MACs"
pm_shPerm(tall, all_regi) "emission permit shares"
pm_emicapglob(tall) "global emission cap"
Expand Down Expand Up @@ -321,7 +320,7 @@ vm_costSubsidizeLearning(ttot,all_regi) "regional cost of subsidy f
vm_dummyBudget(ttot,all_regi) "auxiliary variable that helps to meet permit allocation equation in nash case"
***----------------------------------------------------------------------------------------
***-------------------------------------------------ESM module-----------------------------
vm_macBase(ttot,all_regi,all_enty) "baseline emissions for all emissions subject to MACCs (type emismac)"
v_macBase(ttot,all_regi,all_enty) "baseline emissions for all emissions subject to MACCs (type emismac)"
vm_emiCO2Sector(ttot,all_regi,emi_sectors) "total CO2 emissions from individual sectors [GtC]"
vm_emiTeDetail(ttot,all_regi,all_enty,all_enty,all_te,all_enty) "energy-related emissions per region and technology"
vm_emiTe(ttot,all_regi,all_enty) "total energy-related emissions of each region. [GtC, Mt CH4, Mt N]"
Expand Down
7 changes: 3 additions & 4 deletions core/equations.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ q_balSe(t,regi,enty2)$( entySe(enty2) AND (NOT (sameas(enty2,"seel"))) )..
*** add (reused gas from waste landfills) to segas to not account for CO2
*** emissions - it comes from biomass
+ ( s_MtCH4_2_TWa
* ( vm_macBase(t,regi,"ch4wstl")
* ( v_macBase(t,regi,"ch4wstl")
- vm_emiMacSector(t,regi,"ch4wstl")
)
)$( sameas(enty2,"segabio") AND t.val gt 2005 )
Expand Down Expand Up @@ -730,7 +730,7 @@ vm_emiCO2Sector(t,regi,sector)
*' The endogenous baselines of non-energy emissions are calculated in the following equation:
***------------------------------------------------------
q_macBase(t,regi,enty)$( emiFuEx(enty) OR sameas(enty,"n2ofertin") ) ..
vm_macBase(t,regi,enty)
v_macBase(t,regi,enty)
=e=
sum(emi2fuel(enty2,enty),
p_efFossilFuelExtr(regi,enty2,enty)
Expand All @@ -749,7 +749,7 @@ q_emiMacSector(t,regi,emiMacSector(enty))..
vm_emiMacSector(t,regi,enty)
=e=

( vm_macBase(t,regi,enty)
( v_macBase(t,regi,enty)
* sum(emiMac2mac(enty,enty2),
1 - (pm_macSwitch(enty) * pm_macAbatLev(t,regi,enty2))
)
Expand Down Expand Up @@ -1003,7 +1003,6 @@ q_costEnergySys(ttot,regi)$( ttot.val ge cm_startyear ) ..
+ v_costInv(ttot,regi)
)
+ sum(emiInd37, vm_IndCCSCost(ttot,regi,emiInd37))
+ pm_CementDemandReductionCost(ttot,regi)
;


Expand Down
1 change: 0 additions & 1 deletion core/input/files
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ pm_risk_premium.cs4r
pm_shPPPMER.cs4r
p_PE_histCap.cs3r
p_regi_2_MAGICC_regions.cs3r
p_share_ind_fehos.cs4r
p_share_ind_fesos_bio.cs4r
p_share_ind_fesos.cs4r
pm_taxCO2eqHist.cs4r
Loading