Skip to content

Commit

Permalink
adding comments suggested by reviewer
Browse files Browse the repository at this point in the history
  • Loading branch information
Renato-Rodrigues committed Sep 20, 2024
1 parent 2f3642f commit 72ff3b9
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions core/declarations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -426,8 +426,8 @@ v_shGreenH2(ttot,all_regi) "share of green hydrogen in all hydrogen by 2030 [0
v_shBioTrans(ttot,all_regi) "Share of biofuels in transport liquids from 2025 onwards. Value between 0 and 1."

v_shfe(ttot,all_regi,all_enty,emi_sectors) "share of final energy in sector total final energy [0..1]"
v_shSeFe(ttot,all_regi,all_enty) "share of secondary energy on total secondary energy type (liquids, solids and gases) [0..1]"
v_shSeFeSector(ttot,all_regi,all_enty,all_enty,emi_sectors,all_emiMkt) "share of secondary energy on secondary energy type (liquids, solids and gases) per final energy, sector and emission market [0..1]"
v_shSeFe(ttot,all_regi,all_enty) "share of energy carrier subtype in final energy demand of the aggregated carrier type (eg 'the share of bio-based FE liquids in all FE liquids') [0..1]"
v_shSeFeSector(ttot,all_regi,all_enty,all_enty,emi_sectors,all_emiMkt) "share of energy carrier subtype in final energy demand of the aggregated carrier type per sector/emiMarket combination (eg 'the share of bio-based FE liquids in all FE liquids used in ETS-covered transport') [0..1]"
v_shGasLiq_fe(ttot,all_regi,emi_sectors) "share of gases and liquids in sector final energy [0..1]"

vm_emiCdrAll(ttot,all_regi) "all CDR emissions"
Expand Down
16 changes: 8 additions & 8 deletions core/equations.gms
Original file line number Diff line number Diff line change
Expand Up @@ -1068,11 +1068,11 @@ q_shfe(t,regi,entyFe,sector)$(pm_shfe_up(t,regi,entyFe,sector) OR pm_shfe_lo(t,r
vm_demFeSector_afterTax(t,regi,entySe,entyFe,sector,emiMkt)))
;

q_shSeFe(t,regi,entySe)$(entySeBio(entySe) OR entySeSyn(entySe) OR entySeFos(entySe)).. !!secondary energy carriers shares in final energy demand calculated only for entySeBio, entySeSyn and entySeFos
q_shSeFe(t,regi,entySe)$(entySeBio(entySe) OR entySeSyn(entySe) OR entySeFos(entySe)).. !! share of energy carrier subtype in final energy demand of the aggregated carrier type (eg 'the share of bio-based FE liquids in all FE liquids')
v_shSeFe(t,regi,entySe)
* sum(seAgg$seAgg2se(seAgg,entySe), !!controlling the list of secondary energy carriers to sum up
sum((sector,emiMkt)$sector2emiMkt(sector,emiMkt),
sum(entySe2$seAgg2se(seAgg,entySe2),
* sum((sector,emiMkt)$sector2emiMkt(sector,emiMkt),
sum(seAgg$seAgg2se(seAgg,entySe), !! determining the aggregate SE carrier type (liquids, gases, ...)
sum(entySe2$seAgg2se(seAgg,entySe2), !! summing over the bio/fos/syn variants of the chosen SE carrier"
sum(entyFe$(sefe(entySe2,entyFe) AND entyFe2Sector(entyFe,sector)),
vm_demFeSector_afterTax(t,regi,entySe2,entyFe,sector,emiMkt)))))
=e=
Expand Down Expand Up @@ -1160,7 +1160,7 @@ q_penSeFeSectorShareDev(t,regi,entySe,entyFe,sector,emiMkt)$(
( (NOT(sameas(sector,"build") AND (t.val le 2020)))
OR (NOT(sameas(sector,"indst") AND (t.val le 2020)))
OR (NOT(sameas(sector,"cdr") AND (t.val le 2020)))
) AND !!disable historical year share incentives to buildings, industry and CDR
) AND !!disable share incentives for historical years in buildings, industry and CDR as this should be handled by historical bounds
( NOT(sameas(sector,"build") AND (sameas(entyFE,"fesos"))) ) !!disable buildings solids share incentives
)..
v_penSeFeSectorShare(t,regi,entySe,entyFe,sector,emiMkt)
Expand All @@ -1175,7 +1175,7 @@ q_penSeFeSectorShareDev(t,regi,entySe,entyFe,sector,emiMkt)$(
( (NOT(sameas(sector,"build") AND (t.val le 2020)))
OR (NOT(sameas(sector,"indst") AND (t.val le 2020)))
OR (NOT(sameas(sector,"cdr") AND (t.val le 2020)))
) AND !!disable historical year share incentives to buildings, industry and CDR
) AND !!disable share incentives for historical years in buildings, industry and CDR as this should be handled by historical bounds
( NOT(sameas(sector,"build") AND (sameas(entyFE,"fesos"))) ) !!disable buildings solids share incentives
)..
v_penSeFeSectorShare(t,regi,entySe,entyFe,sector,emiMkt)
Expand All @@ -1190,7 +1190,7 @@ q_penSeFeSectorShareDev(t,regi,entySe,entyFe,sector,emiMkt)$(
( (NOT(sameas(sector,"build") AND (t.val le 2020)))
OR (NOT(sameas(sector,"indst") AND (t.val le 2020)))
OR (NOT(sameas(sector,"cdr") AND (t.val le 2020)))
) AND !!disable historical year share incentives to buildings, industry and CDR
) AND !!disable share incentives for historical years in buildings, industry and CDR as this should be handled by historical bounds
( NOT(sameas(sector,"build") AND (sameas(entyFE,"fesos"))) ) !!disable buildings solids share incentives
)..
v_penSeFeSectorShare(t,regi,entySe,entyFe,sector,emiMkt)
Expand All @@ -1205,7 +1205,7 @@ q_minMaxPenSeFeSectorShareDev(t,regi,entySe,entyFe,sector,emiMkt)$(
( (NOT(sameas(sector,"build") AND (t.val le 2020)))
OR (NOT(sameas(sector,"indst") AND (t.val le 2020)))
OR (NOT(sameas(sector,"cdr") AND (t.val le 2020)))
) AND !!disable historical year share incentives to buildings, industry and CDR
) AND !!disable share incentives for historical years in buildings, industry and CDR as this should be handled by historical bounds
( NOT(sameas(sector,"build") AND (sameas(entyFE,"fesos"))) ) !!disable buildings solids share incentives
)..
(
Expand Down

0 comments on commit 72ff3b9

Please sign in to comment.