Commit 39a6bfc3 authored by Niina Helistö's avatar Niina Helistö
Browse files

Renaming equations

parent 05eb6fe3
...@@ -27,8 +27,11 @@ Model building / ...@@ -27,8 +27,11 @@ Model building /
// Unit Operation // Unit Operation
q_maxDownward q_maxDownward
* q_maxDownwardOfflineReserve
q_maxUpward q_maxUpward
* q_maxUpwardOfflineReserve
* q_reserveProvision * q_reserveProvision
* q_reserveProvisionOnline
* q_startup * q_startup
* q_startuptype * q_startuptype
* q_onlineLimit * q_onlineLimit
......
...@@ -27,11 +27,11 @@ Model invest / ...@@ -27,11 +27,11 @@ Model invest /
// Unit Operation // Unit Operation
q_maxDownward q_maxDownward
q_maxDownward2 q_maxDownwardOfflineReserve
q_maxUpward q_maxUpward
q_maxUpward2 q_maxUpwardOfflineReserve
q_reserveProvision q_reserveProvision
q_reserveProvision2 q_reserveProvisionOnline
q_startshut q_startshut
q_startuptype q_startuptype
q_onlineOnStartUp q_onlineOnStartUp
......
...@@ -27,10 +27,11 @@ Model schedule / ...@@ -27,10 +27,11 @@ Model schedule /
// Unit Operation // Unit Operation
q_maxDownward q_maxDownward
q_maxDownward2 q_maxDownwardOfflineReserve
q_maxUpward q_maxUpward
q_maxUpward2 q_maxUpwardOfflineReserve
* q_reserveProvision * q_reserveProvision
q_reserveProvisionOnline
q_startshut q_startshut
q_startuptype q_startuptype
q_onlineLimit q_onlineLimit
......
...@@ -102,11 +102,11 @@ v_help_inc ...@@ -102,11 +102,11 @@ v_help_inc
// Unit Operation // Unit Operation
q_maxDownward q_maxDownward
q_maxDownward2 q_maxDownwardOfflineReserve
q_maxUpward q_maxUpward
q_maxUpward2 q_maxUpwardOfflineReserve
q_reserveProvision q_reserveProvision
q_reserveProvision2 q_reserveProvisionOnline
q_startshut q_startshut
q_startuptype q_startuptype
q_onlineLimit q_onlineLimit
...@@ -161,3 +161,4 @@ vq_gen ...@@ -161,3 +161,4 @@ vq_gen
vq_resDemand vq_resDemand
vq_resMissing vq_resMissing
v_stateSlack v_stateSlack
vq_capacity
...@@ -56,12 +56,12 @@ equations ...@@ -56,12 +56,12 @@ equations
q_resDemand(restype, up_down, node, s, f, t) "Procurement for each reserve type is greater than demand" q_resDemand(restype, up_down, node, s, f, t) "Procurement for each reserve type is greater than demand"
q_resDemandLargestInfeedUnit(grid, restype, up_down, node, unit, s, f, t) "N-1 Reserve" q_resDemandLargestInfeedUnit(grid, restype, up_down, node, unit, s, f, t) "N-1 Reserve"
// Unit Operation // Unit Operation
q_maxDownward(grid, node, unit, mType, s, f, t) "Downward commitments will not undercut power plant minimum load constraints or maximum elec. consumption" q_maxDownward(grid, node, unit, mType, s, f, t) "Downward commitments (v_gen and online v_reserve) will not undercut minimum (online) production capacity (+) or maximum (online) consumption capacity (-)"
q_maxDownward2(grid, node, unit, mType, s, f, t) "Downward commitments will not undercut power plant maximum elec. consumption - offline Res" q_maxDownwardOfflineReserve(grid, node, unit, mType, s, f, t) "Downward commitments (v_gen and all v_reserve) will not undercut zero production (+) or maximum consumption capacity (-)"
q_maxUpward(grid, node, unit, mType, s, f, t) "Upward commitments will not exceed maximum available capacity or consumed power" q_maxUpward(grid, node, unit, mType, s, f, t) "Upward commitments (v_gen and online v_reserve) will not exceed maximum (online) production capacity (+) or minimum (online) consumption capacity (-)"
q_maxUpward2(grid, node, unit, mType, s, f, t) "Upward commitments will not exceed maximum available capacity or consumed power - offline Res" q_maxUpwardOfflineReserve(grid, node, unit, mType, s, f, t) "Upward commitments (v_gen and all v_reserve) will not exceed maximum production capacity (+) or zero consumption (-)"
q_reserveProvision(restype, up_down, node, unit, s, f, t) "Reserve provision limited for units" q_reserveProvision(restype, up_down, node, unit, s, f, t) "Reserve provision limited for units with investment possibility"
q_reserveProvision2(restype, up_down, node, unit, s, f, t) "Reserve provision limited for units offline Res capable" q_reserveProvisionOnline(restype, up_down, node, unit, s, f, t) "Reserve provision limited for units that are not capable of providing offline reserve"
q_startshut(mType, s, unit, f, t) "Online capacity now minus online capacity in the previous interval is equal to started up minus shut down capacity" q_startshut(mType, s, unit, f, t) "Online capacity now minus online capacity in the previous interval is equal to started up minus shut down capacity"
q_startuptype(mType, s, starttype, unit, f, t) "Startup type depends on the time the unit has been non-operational" q_startuptype(mType, s, starttype, unit, f, t) "Startup type depends on the time the unit has been non-operational"
q_onlineOnStartUp(s, unit, f, t) "Unit must be online after starting up" q_onlineOnStartUp(s, unit, f, t) "Unit must be online after starting up"
......
...@@ -325,7 +325,7 @@ q_maxDownward(gnu(grid, node, unit), msft(m, s, f, t)) ...@@ -325,7 +325,7 @@ q_maxDownward(gnu(grid, node, unit), msft(m, s, f, t))
* --- Maximum Downward Capacity for Production/Consumption, Online Reserves and Offline Reserves --- * --- Maximum Downward Capacity for Production/Consumption, Online Reserves and Offline Reserves ---
q_maxDownward2(gnu(grid, node, unit), msft(m, s, f, t)) q_maxDownwardOfflineReserve(gnu(grid, node, unit), msft(m, s, f, t))
${ gnuft(grid, node, unit, f, t) ${ gnuft(grid, node, unit, f, t)
and { and {
[ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is providing [ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is providing
...@@ -490,7 +490,7 @@ q_maxUpward(gnu(grid, node, unit), msft(m, s, f, t)) ...@@ -490,7 +490,7 @@ q_maxUpward(gnu(grid, node, unit), msft(m, s, f, t))
* --- Maximum Upwards Capacity for Production/Consumption, Online Reserves and Offline Reserves --- * --- Maximum Upwards Capacity for Production/Consumption, Online Reserves and Offline Reserves ---
q_maxUpward2(gnu(grid, node, unit), msft(m, s, f, t)) q_maxUpwardOfflineReserve(gnu(grid, node, unit), msft(m, s, f, t))
${ gnuft(grid, node, unit, f, t) ${ gnuft(grid, node, unit, f, t)
and { and {
[ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is providing [ ord(t) < tSolveFirst + smax(restype, p_nReserves(node, restype, 'reserve_length')) // Unit is providing
...@@ -580,7 +580,7 @@ q_reserveProvision(nuRescapable(restypeDirectionNode(restype, up_down, node), un ...@@ -580,7 +580,7 @@ q_reserveProvision(nuRescapable(restypeDirectionNode(restype, up_down, node), un
* --- Online Reserve Provision of Units with Online Variables ----------------- * --- Online Reserve Provision of Units with Online Variables -----------------
q_reserveProvision2(nuRescapable(restypeDirectionNode(restype, up_down, node), unit), sft(s, f, t)) q_reserveProvisionOnline(nuRescapable(restypeDirectionNode(restype, up_down, node), unit), sft(s, f, t))
${ ord(t) <= tSolveFirst + p_nReserves(node, restype, 'reserve_length') ${ ord(t) <= tSolveFirst + p_nReserves(node, restype, 'reserve_length')
and nuft(node, unit, f, t) and nuft(node, unit, f, t)
and not ft_reservesFixed(node, restype, f+df_reserves(node, restype, f, t), t) and not ft_reservesFixed(node, restype, f+df_reserves(node, restype, f, t), t)
......
...@@ -56,6 +56,7 @@ Option clear = v_stateSlack; ...@@ -56,6 +56,7 @@ Option clear = v_stateSlack;
Option clear = vq_gen; Option clear = vq_gen;
Option clear = vq_resDemand; Option clear = vq_resDemand;
Option clear = vq_resMissing; Option clear = vq_resMissing;
Option clear = vq_capacity;
* --- Equations --------------------------------------------------------------- * --- Equations ---------------------------------------------------------------
...@@ -66,11 +67,11 @@ Option clear = q_resDemand; ...@@ -66,11 +67,11 @@ Option clear = q_resDemand;
// Unit Operation // Unit Operation
Option clear = q_maxDownward; Option clear = q_maxDownward;
Option clear = q_maxDownward2; Option clear = q_maxDownwardOfflineReserve;
Option clear = q_maxUpward; Option clear = q_maxUpward;
Option clear = q_maxUpward2; Option clear = q_maxUpwardOfflineReserve;
Option clear = q_reserveProvision; Option clear = q_reserveProvision;
Option clear = q_reserveProvision2; Option clear = q_reserveProvisionOnline;
Option clear = q_startshut; Option clear = q_startshut;
Option clear = q_startuptype; Option clear = q_startuptype;
Option clear = q_onlineLimit; Option clear = q_onlineLimit;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment