Commit c9bd461f authored by jussi ikäheimo's avatar jussi ikäheimo
Browse files

Some comments added.

parent 13a516a2
......@@ -2564,14 +2564,21 @@ q_boundCyclic(gnss_bound(gn_state(grid, node), s_, s), m)
] // END * p_msWeight(m, s_)
;
* =============================================================================
* --- Equations for superposed states -------------------------------------
* =============================================================================
*--- End value for superposed states ----------------------------
* The end value here is the node state at the end of the last candidate period z
q_superposBoundEnd(gn_state(grid, node_superpos(node)), m)
$(p_gn(grid, node, 'boundEnd') )..
// Value of the superposed state of the node at the end of the last candidate
// period
sum(mz(m,z)$(ord(z) eq mSettings('invest', 'candidate_periods') ),
sum(mz(m,z)$(ord(z) eq mSettings(m, 'candidate_periods') ),
//the inter-period state at the beginning of the last candidate period
v_state_z(grid, node, z)
*
......@@ -2705,7 +2712,7 @@ q_superposStateUpwardLimit(gn_state(grid, node_superpos(node)), mz(m,z))..
=G= 0
;
*--- Upward limit for superpositioned states -----------------
*--- Downward limit for superpositioned states -----------------
q_superposStateDownwardLimit(gn_state(grid, node_superpos(node)), mz(m,z))..
......@@ -2715,7 +2722,7 @@ q_superposStateDownwardLimit(gn_state(grid, node_superpos(node)), mz(m,z))..
// State of the node at the beginning of period z
+ v_state_z(grid, node, z)
// Maximum state reached during the related sample
// Minimum state reached during the related sample
+ sum(zs(z,s_),
v_statemin(grid, node, s_)
)
......
......@@ -17,6 +17,7 @@ $offtext
* =============================================================================
* --- Variable limits ---------------------------------------------------------
*
* =============================================================================
* =============================================================================
......@@ -120,12 +121,13 @@ loop(node$(not node_superpos(node)),
); // END loop(mst_start)
); //end loop node
); //END loop node
// Next deal with bounds for the superposed node states
//
// note that boundstart is handled further below; boundend, upwardLimit and downwardLimit are handled as equations
// Note that boundstart is handled further below; boundend, upwardLimit and downwardLimit are handled as equations
loop(node_superpos(node),
// v_state for superpositioned states represents the intra-period state. It always starts from zero.
loop(mst_start(mSolve, s, t),
v_state.fx(gn_state(grid, node), s, f_solve, t+dt(t)) = 0;
......@@ -543,7 +545,9 @@ loop((mft_start(mSolve, f, t), ms_initial(mSolve, s)),
v_shutdown_LP.fx(unit_online_LP, s, f, t) = 0;
v_shutdown_MIP.fx(unit_online_LP, s, f, t) = 0;
else // For all other solves, fix the initial state values based on previous results.
else // For all other solves than first one, fix the initial state values based on previous results.
//TBC: should there be something here for superposed states?
// State and online variable initial values for the subsequent solves
v_state.fx(gn_state(grid, node), s, f, t + (1 - mInterval(mSolve, 'stepsPerInterval', 'c000')))
......@@ -608,8 +612,6 @@ if( tSolveFirst <> mSettings(mSolve, 't_start'), // Avoid rewriting the fixes on
); // END if
*v_invest_LP.fx("U75FI_02Es_wind") = 50;
* =============================================================================
* --- Fix previously realized investment results ------------------------------
* =============================================================================
......
Markdown is supported
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