From 72ff3b94284974579fb0c732f6a6158a27640c48 Mon Sep 17 00:00:00 2001 From: Renato-Rodrigues Date: Fri, 20 Sep 2024 15:58:18 +0200 Subject: [PATCH] adding comments suggested by reviewer --- core/declarations.gms | 4 ++-- core/equations.gms | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/core/declarations.gms b/core/declarations.gms index be3c1ab0d..451afc097 100644 --- a/core/declarations.gms +++ b/core/declarations.gms @@ -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" diff --git a/core/equations.gms b/core/equations.gms index 8629ca22a..231d591ef 100644 --- a/core/equations.gms +++ b/core/equations.gms @@ -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= @@ -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) @@ -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) @@ -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) @@ -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 ).. (