Commit 0a46739f authored by Niina Helistö's avatar Niina Helistö
Browse files

Some code clean-up etc.

parent 071a228f
......@@ -33,7 +33,7 @@ Model schedule /
q_maxDownwardOfflineReserve
q_maxUpward
q_maxUpwardOfflineReserve
q_reserveProvision
* q_reserveProvision
q_reserveProvisionOnline
q_startshut
q_startuptype
......@@ -66,8 +66,8 @@ Model schedule /
q_transferLeftwardLimit
q_resTransferLimitRightward
q_resTransferLimitLeftward
q_reserveProvisionRightward
q_reserveProvisionLeftward
* q_reserveProvisionRightward
* q_reserveProvisionLeftward
// State Variables
q_stateSlack
......
......@@ -130,6 +130,8 @@ v_help_inc
q_conversionIncHRBounds
q_conversionIncHR_help1
q_conversionIncHR_help2
q_unitEqualityConstraint
q_unitGreaterThanConstraint
* q_commodityUseLimit
// Energy Transfer
......@@ -138,6 +140,8 @@ v_help_inc
q_transferLeftwardLimit
q_resTransferLimitRightward
q_resTransferLimitLeftward
q_reserveProvisionRightward
q_reserveProvisionLeftward
// State Variables
q_stateSlack
......@@ -155,6 +159,7 @@ v_help_inc
q_emissioncap
q_energyShareMax
q_energyShareMin
q_ReserveShareMax
* Dummy variables
vq_gen
......
......@@ -72,8 +72,6 @@ Sets
gnn_state(grid, node, node) "Nodes with state variables interconnected via diffusion"
gnn_boundState(grid, node, node) "Nodes with state variables bound by other nodes"
gn2gnu(grid, node, grid, node, unit) "Conversions between energy grids by specific units"
gngnu_fixedOutputRatio(grid, node, grid, node, unit) "Units with a fixed ratio between two different grids of output (e.g. backpressure)"
gngnu_constrainedOutputRatio(grid, node, grid, node, unit) "Units with a constrained ratio between two different grids of output (e.g. extraction)"
* --- Reserve types -----------------------------------------------------------
restype "Reserve types"
......
......@@ -54,8 +54,6 @@ $ifthen exist '%input_dir%/inputData.gdx'
$$loaddc p_gnPolicy
$$loaddc p_uStartupfuel
$$loaddc flowUnit
* $$loaddc gngnu_fixedOutputRatio
* $$loaddc gngnu_constrainedOutputRatio
$$loaddc emission
$$loaddc p_nEmission
$$loaddc ts_cf
......
......@@ -96,8 +96,8 @@ equations
q_transferLeftwardLimit(grid, node, node, s, f, t) "Transfer of energy and capacity reservations to the leftward direction are less than the transfer capacity"
q_resTransferLimitRightward(grid, node, node, s, f, t) "Transfer of energy and capacity reservations are less than the transfer capacity to the rightward direction"
q_resTransferLimitLeftward(grid, node, node, s, f, t) "Transfer of energy and capacity reservations are less than the transfer capacity to the leftward direction"
q_reserveProvisionRightward(restype, up_down, grid, node, node, s, f, t) "Rightward reserve provision limited"
q_reserveProvisionLeftward(restype, up_down, grid, node, node, s, f, t) "Leftward reserve provision limited"
q_reserveProvisionRightward(restype, up_down, grid, node, node, s, f, t) "Rightward reserve provision limited - needed for links with investment possibility"
q_reserveProvisionLeftward(restype, up_down, grid, node, node, s, f, t) "Leftward reserve provision limited - needed for links with investment possibility"
// State Variables
q_stateSlack(grid, node, slack, s, f, t) "Slack variable greater than the difference between v_state and the slack boundary"
......
......@@ -97,6 +97,7 @@ Option clear = q_conversionIncHRBounds;
Option clear = q_conversionIncHR_help1;
Option clear = q_conversionIncHR_help2;
Option clear = q_unitEqualityConstraint;
Option clear = q_unitGreaterThanConstraint;
*Option clear = q_commodityUseLimit;
// Energy Transfer
......
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