Commit 989be5c1 authored by Juha Kiviluoma's avatar Juha Kiviluoma
Browse files

Master didn't solve. Removed ts_reserveDemand (uses only static reserves for...

Master didn't solve. Removed ts_reserveDemand (uses only static reserves for now) and removed building model solve statement (would require the definition for the building model which is not currently available in the repository). Solves now.
parent cdb75e41
......@@ -45,7 +45,7 @@ $offOrder
ts_cf_(flow, node, fSolve, t)$tInterval(t) = ts_cf(flow, node, fSolve, t+ct(t));
ts_nodeState_(gn_state(grid, node), param_gnBoundaryTypes, fSolve, t)$tInterval(t) = ts_nodeState(grid, node, param_gnBoundaryTypes, fSolve, t+ct(t));
ts_unit_(unit, param_unit, fSolve, t)$tInterval(t) = ts_unit(unit, param_unit, fSolve, t+ct(t));
ts_reserveDemand_(restype, up_down, node, fSolve, t)$tInterval(t) = ts_reserveDemand(restype, up_down, node, fSolve, t+ct(t));
ts_reserveDemand_(restype, up_down, node, fSolve, t)$tInterval(t) = p_nReserves(node, resType, up_down);
tCounter = mInterval(mSolve, 'intervalEnd', counter); // move tCounter to the next interval setting
p_stepLength(mf(mSolve, fSolve), t)$tInterval(t) = mSettings(mSolve, 'intervalInHours'); // p_stepLength will hold the length of the interval in hours in model equations
p_stepLengthNoReset(mSolve, fSolve, t)$tInterval(t) = mSettings(mSolve, 'intervalInHours');
......@@ -67,7 +67,7 @@ $offOrder
ts_cf_(flow, node, fSolve, t) = sum{t_$tInterval(t_), ts_cf(flow, node, fSolve, t_+ct(t_))} / p_stepLength(mSolve, fSolve, t); // Averages the capacity factor over the inverval
ts_nodeState_(gn_state(grid, node), param_gnBoundaryTypes, fSolve, t) = sum(t_${tInterval(t_)}, ts_nodeState(grid, node, param_gnBoundaryTypes, fSolve, t_+ct(t_))) / p_stepLength(mSolve, fSolve, t); // Averages the time-dependent node state boundary conditions over the interval
ts_unit_(unit, param_unit, fSolve, t) = sum(t_${tInterval(t_)}, ts_unit(unit, param_unit, fSolve, t_+ct(t_))) / p_steplength(mSolve, fSolve, t); // Averages the time-dependent unit parameters over the interval
ts_reservedemand_(restype, up_down, node, fSolve, t) = sum(t_${tInterval(t_)}, ts_reserveDemand(restype, up_down, node, fSolve, t_+ct(t_))) / p_steplength(mSolve, fSolve, t); // Averages the time-dependent unit parameters over the interval
ts_reservedemand_(restype, up_down, node, fSolve, t) = p_nReserves(node, resType, up_down); //Only static reserve for now
// Set the previous time step displacement
pt(t+intervalLength) = -intervalLength;
);
......
......@@ -192,7 +192,7 @@ loop(m,
);
$offtext
loop(gn(grid, node),
restypeDirectionNode(restypeDirection(restype, up_down), node)$(p_nReserves(node, restype, 'use_time_series') and sum((f,t), ts_reserveDemand(restype, up_down, node, f, t))) = yes;
//restypeDirectionNode(restypeDirection(restype, up_down), node)$(p_nReserves(node, restype, 'use_time_series') and sum((f,t), ts_reserveDemand(restype, up_down, node, f, t))) = yes;
restypeDirectionNode(restypeDirection(restype, up_down), node)$(not p_nReserves(node, restype, 'use_time_series') and p_nReserves(node, restype, up_down)) = yes;
);
......
......@@ -84,7 +84,7 @@ $offtext
);
); // END IF SCHEDULE
if (mSolve('building'),
solve building using mip minimizing v_obj;
); // END IF BUILDING
* if (mSolve('building'),
* solve building using mip minimizing v_obj;
* ); // END IF BUILDING
* if (mSolve('storage'), solve storage using lp minimizing v_obj; );
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