Skip to content

Fix out-of-date unit documentation for energy prices #2388

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

Merged
aodenweller merged 2 commits into from
Jul 2, 2026
Merged

Fix out-of-date unit documentation for energy prices #2388

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dc7282
Fix out-of-date unit documentation for energy prices
simonkrogmann Jul 2, 2026
601ba62
Merge branch 'develop' into 2017dollars
aodenweller Jul 2, 2026
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
44 changes: 22 additions & 22 deletions core/declarations.gms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,28 +331,28 @@ $ifthen.scaleDemandIndTable not "%c_scaleDemandIndTable%" == "off"
$endif.scaleDemandIndTable

*** energy prices
pm_FEPrice(ttot,all_regi,all_enty,sector,emiMkt) "parameter to capture all FE prices across sectors and markets [tr$2005/TWa]"
pm_FEPrice_iter(iteration,ttot,all_regi,all_enty,sector,emiMkt) "parameter to capture all FE prices across sectors and markets [tr$2005/TWa] across iterations"
pm_SEPrice(ttot,all_regi,all_enty) "parameter to capture all SE prices [tr$2005/TWa]"
pm_PEPrice(ttot,all_regi,all_enty) "parameter to capture all PE prices [tr$2005/TWa]"

p_FEPrice_by_SE_Sector_EmiMkt(ttot,all_regi,entySe,all_enty,sector,emiMkt) "parameter to save FE price per SE, sector and emission market [tr$2005/TWa]"
p_FEPrice_by_Sector_EmiMkt(ttot,all_regi,all_enty,sector,emiMkt) "parameter to save FE marginal price per sector and emission market [tr$2005/TWa]"
pm_FEPrice_by_SE_Sector(ttot,all_regi,entySe,all_enty,sector) "parameter to save FE marginal price per SE and sector [tr$2005/TWa]"
p_FEPrice_by_SE_EmiMkt(ttot,all_regi,entySe,all_enty,emiMkt) "parameter to save FE marginal price per SE and emission market [tr$2005/TWa]"
p_FEPrice_by_SE(ttot,all_regi,entySe,all_enty) "parameter to save FE marginal price per SE [tr$2005/TWa]"
p_FEPrice_by_Sector(ttot,all_regi,all_enty,sector) "parameter to save FE marginal price per sector [tr$2005/TWa]"
p_FEPrice_by_EmiMkt(ttot,all_regi,all_enty,emiMkt) "parameter to save FE marginal price per emission market [tr$2005/TWa]"
p_FEPrice_by_FE(ttot,all_regi,all_enty) "parameter to save FE marginal price [tr$2005/TWa]"

p_FEPrice_by_SE_Sector_EmiMkt_iter(iteration,ttot,all_regi,entySe,all_enty,sector,emiMkt) "parameter to save iteration FE marginal price per SE, sector and emission market [tr$2005/TWa]"
p_FEPrice_by_Sector_EmiMkt_iter(iteration,ttot,all_regi,all_enty,sector,emiMkt) "parameter to save iteration FE marginal price per sector and emission market [tr$2005/TWa]"
p_FEPrice_by_SE_Sector_iter(iteration,ttot,all_regi,entySe,all_enty,sector) "parameter to save iteration FE marginal price per SE and sector [tr$2005/TWa]"
p_FEPrice_by_SE_EmiMkt_iter(iteration,ttot,all_regi,entySe,all_enty,emiMkt) "parameter to save iteration FE marginal price per SE and emission market [tr$2005/TWa]"
p_FEPrice_by_SE_iter(iteration,ttot,all_regi,entySe,all_enty) "parameter to save iteration FE marginal price per SE [tr$2005/TWa]"
p_FEPrice_by_Sector_iter(iteration,ttot,all_regi,all_enty,sector) "parameter to save iteration FE marginal price per sector [tr$2005/TWa]"
p_FEPrice_by_EmiMkt_iter(iteration,ttot,all_regi,all_enty,emiMkt) "parameter to save iteration FE marginal price per emission market [tr$2005/TWa]"
p_FEPrice_by_FE_iter(iteration,ttot,all_regi,all_enty) "parameter to save iteration FE marginal price [tr$2005/TWa]"
pm_FEPrice(ttot,all_regi,all_enty,sector,emiMkt) "parameter to capture all FE prices across sectors and markets [tr$2017/TWa]"
pm_FEPrice_iter(iteration,ttot,all_regi,all_enty,sector,emiMkt) "parameter to capture all FE prices across sectors and markets [tr$2017/TWa] across iterations"
pm_SEPrice(ttot,all_regi,all_enty) "parameter to capture all SE prices [tr$2017/TWa]"
pm_PEPrice(ttot,all_regi,all_enty) "parameter to capture all PE prices [tr$2017/TWa]"

p_FEPrice_by_SE_Sector_EmiMkt(ttot,all_regi,entySe,all_enty,sector,emiMkt) "parameter to save FE price per SE, sector and emission market [tr$2017/TWa]"
p_FEPrice_by_Sector_EmiMkt(ttot,all_regi,all_enty,sector,emiMkt) "parameter to save FE marginal price per sector and emission market [tr$2017/TWa]"
pm_FEPrice_by_SE_Sector(ttot,all_regi,entySe,all_enty,sector) "parameter to save FE marginal price per SE and sector [tr$2017/TWa]"
p_FEPrice_by_SE_EmiMkt(ttot,all_regi,entySe,all_enty,emiMkt) "parameter to save FE marginal price per SE and emission market [tr$2017/TWa]"
p_FEPrice_by_SE(ttot,all_regi,entySe,all_enty) "parameter to save FE marginal price per SE [tr$2017/TWa]"
p_FEPrice_by_Sector(ttot,all_regi,all_enty,sector) "parameter to save FE marginal price per sector [tr$2017/TWa]"
p_FEPrice_by_EmiMkt(ttot,all_regi,all_enty,emiMkt) "parameter to save FE marginal price per emission market [tr$2017/TWa]"
p_FEPrice_by_FE(ttot,all_regi,all_enty) "parameter to save FE marginal price [tr$2017/TWa]"

p_FEPrice_by_SE_Sector_EmiMkt_iter(iteration,ttot,all_regi,entySe,all_enty,sector,emiMkt) "parameter to save iteration FE marginal price per SE, sector and emission market [tr$2017/TWa]"
p_FEPrice_by_Sector_EmiMkt_iter(iteration,ttot,all_regi,all_enty,sector,emiMkt) "parameter to save iteration FE marginal price per sector and emission market [tr$2017/TWa]"
p_FEPrice_by_SE_Sector_iter(iteration,ttot,all_regi,entySe,all_enty,sector) "parameter to save iteration FE marginal price per SE and sector [tr$2017/TWa]"
p_FEPrice_by_SE_EmiMkt_iter(iteration,ttot,all_regi,entySe,all_enty,emiMkt) "parameter to save iteration FE marginal price per SE and emission market [tr$2017/TWa]"
p_FEPrice_by_SE_iter(iteration,ttot,all_regi,entySe,all_enty) "parameter to save iteration FE marginal price per SE [tr$2017/TWa]"
p_FEPrice_by_Sector_iter(iteration,ttot,all_regi,all_enty,sector) "parameter to save iteration FE marginal price per sector [tr$2017/TWa]"
p_FEPrice_by_EmiMkt_iter(iteration,ttot,all_regi,all_enty,emiMkt) "parameter to save iteration FE marginal price per emission market [tr$2017/TWa]"
p_FEPrice_by_FE_iter(iteration,ttot,all_regi,all_enty) "parameter to save iteration FE marginal price [tr$2017/TWa]"
;


Expand Down
Loading