diff --git a/core/declarations.gms b/core/declarations.gms index 99fa4ac30d..b0cc9d022a 100644 --- a/core/declarations.gms +++ b/core/declarations.gms @@ -196,7 +196,7 @@ q_emiGHG_exclLULUCF_exclBunkers(ttot,all_regi) "calculate total GHG emissi parameters *** general technoeconomic parameters -pm_eta_conv(tall,all_regi,all_te) "conversion efficiency of all energy technologies, only applying to technologies that do not have explicit time-dependant conversion efficiencies, still eta converges until 2050 to dataglob_values. [efficiency (0..1)]" +pm_eta_conv(tall,all_regi,all_te) "conversion efficiency of all energy technologies, only applying to technologies that do not have explicit time-dependant conversion efficiencies, still eta converges until 2050 to dataglob_values. [efficiency (0..1), nuclear: TWa_elec/Mt_Ur]" pm_dataeta(tall,all_regi,all_te) "read-in parameter for conversion efficiency of technologies that vary exogenously over time based on generisdata_varying_eta.prn file [efficiency (0..1)]" pm_data(all_regi,char,all_te) "Large array for most technical parameters of technologies, more detail on the individual technical parameters and their units can be found in the declaration of the set 'char' " pm_cf(tall,all_regi,all_te) "read-in parameter for capacity factor (fraction of the year that a plant is running) [share]" @@ -334,7 +334,7 @@ $endif.scaleDemandIndTable 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]" +pm_PEPrice(ttot,all_regi,all_enty) "parameter to capture all PE prices [tr$2017/TWa, Uranium: tr$2017/Mt_Ur]" 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]" diff --git a/modules/31_fossil/grades2poly/declarations.gms b/modules/31_fossil/grades2poly/declarations.gms index 9e732d4a13..a17b8e44b0 100644 --- a/modules/31_fossil/grades2poly/declarations.gms +++ b/modules/31_fossil/grades2poly/declarations.gms @@ -23,13 +23,13 @@ p31_rentdisc(all_enty) "discount factor for the rent, p31_rentdisc2(all_enty) "discount factor for the rent achieved in 2100, used for the sensitivity analysis" p31_rentconv(all_enty) "number of year that the convergence to rentdisc2 takes" p31_rentdisctot(ttot, all_enty) "rent discount factor applied to the model" -p31_fuExtrCumMaxBound(all_regi,all_enty,rlf) "value of regional uranium extraction bound" +p31_fuExtrCumMaxBound(all_regi,all_enty,rlf) "value of regional uranium extraction bound [Mt_Ur]" ; positive variables -v31_fuExtrCum(ttot,all_regi,all_enty,rlf) "cumulated extraction of exhaustible resources [Mt]" -v31_fuExtrCumMax(all_regi,all_enty,rlf) "maximum of cumulated extraction of exhaustible resources [Mt]" -v31_fuExtrMC(all_enty,rlf) "MC exhaustible resources [Mt]" +v31_fuExtrCum(ttot,all_regi,all_enty,rlf) "cumulated extraction of exhaustible resources [TWa, Uranium: Mt_Ur]" +v31_fuExtrCumMax(all_regi,all_enty,rlf) "maximum of cumulated extraction of exhaustible resources [Mt_Ur]" +v31_fuExtrMC(all_enty,rlf) "MC exhaustible uranium resources [T$/Mt_Ur]" ; variables diff --git a/modules/31_fossil/timeDepGrades/declarations.gms b/modules/31_fossil/timeDepGrades/declarations.gms index 98c489f25d..5aa35d27c6 100644 --- a/modules/31_fossil/timeDepGrades/declarations.gms +++ b/modules/31_fossil/timeDepGrades/declarations.gms @@ -89,9 +89,9 @@ $ENDIF.mofex *------------------------------------------- positive variables *** Others -v31_fuExtrCum(ttot,all_regi,all_enty,rlf) "cumulated extraction of exhaustible resources" -v31_fuExtrCumMax(all_regi,all_enty,rlf) "maximum of cumulated extraction of exhaustible resources" -v31_fuExtrMC(all_enty,rlf) "MC exhaustible resources" +v31_fuExtrCum(ttot,all_regi,all_enty,rlf) "cumulated extraction of exhaustible resources [TWa, Uranium: Mt_Ur]" +v31_fuExtrCumMax(all_regi,all_enty,rlf) "maximum of cumulated extraction of exhaustible resources [Mt_Ur]" +v31_fuExtrMC(all_enty,rlf) "MC exhaustible uranium resources [T$/Mt_Ur]" v31_fuSlack(ttot,all_regi,all_enty,rlf) "Amount of oil that is not extracted but put aside never to be used again. Unit: TWa/a" ;