Commit c40e31b3 authored by Topi Rasku's avatar Topi Rasku
Browse files

Fixing a few instances of hard-coded 'schedule' into *mSolve*.

parent c6529b72
......@@ -237,7 +237,7 @@ loop(cc(counter),
mft(mf(mSolve, f_solve), tt_interval(t))
${ord(t) > tSolveFirst + mSettings(mSolve, 't_jump')
and (mf_central(mSolve, f_solve)
or mSettings('schedule', 'forecasts') = 0)
or mSettings(mSolve, 'forecasts') = 0)
} = yes;
// Include up to forecastLength for remaining forecasts
......@@ -406,7 +406,7 @@ dt(t)${sum(ms(mSolve, s)$(not ms_central(mSolve, s)), mst_start(mSolve, s, t))}
df(f_solve(f), t_active(t))${ ord(t) <= tSolveFirst + mSettings(mSolve, 't_jump') }
= sum(mf_realization(mSolve, f_), ord(f_) - ord(f));
// If using scenarios, central forecast will be using realized data
if(mSettings('schedule', 'scenarios'),
if(mSettings(mSolve, 'scenarios'),
loop(ms_initial(mSolve, s),
df_scenario(f_solve(f), t_active(t))${ord(t) > msEnd(mSolve, s)}
= sum(mf_realization(mSolve, f_), ord(f_) - ord(f));
......
......@@ -43,7 +43,7 @@ if (ord(tSolve) = tForecastNext(mSolve) - mSettings(mSolve, 't_forecastJump'), /
execute_load ts_unit_update=ts_unit;
ts_unit(unit_timeseries(unit), param_unit, f_solve(f), tt_forecast(t)) // Only update if time series enabled for the unit
${not mf_realization(mSolve, f) // Realization not updated
and (mSettings('schedule', 'onlyExistingForecasts')
and (mSettings(mSolve, 'onlyExistingForecasts')
-> ts_unit_update(unit, param_unit, f, t)) // Update only existing values (zeroes need to be EPS)
}
= ts_unit_update(unit, param_unit, f, t);
......@@ -80,7 +80,7 @@ $offtext
execute_load ts_influx_update=ts_influx;
ts_influx(gn(grid, node), f_solve(f), tt_forecast(t))
${ not mf_realization(mSolve, f) // Realization not updated
and (mSettings('schedule', 'onlyExistingForecasts')
and (mSettings(mSolve, 'onlyExistingForecasts')
-> ts_influx_update(grid, node, f, t)) // Update only existing values (zeroes need to be EPS)
}
= ts_influx_update(grid, node, f, t);
......@@ -92,7 +92,7 @@ $offtext
execute_load ts_cf_update=ts_cf;
ts_cf(flowNode(flow, node), f_solve(f), tt_forecast(t))
${ not mf_realization(mSolve, f) // Realization not updated
and (mSettings('schedule', 'onlyExistingForecasts')
and (mSettings(mSolve, 'onlyExistingForecasts')
-> ts_cf_update(flow, node, f, t)) // Update only existing values (zeroes need to be EPS)
}
= ts_cf_update(flow, node, f, t);
......@@ -104,7 +104,7 @@ $offtext
execute_load ts_reserveDemand_update=ts_reserveDemand;
ts_reserveDemand(restypeDirectionNode(restype, up_down, node), f_solve(f), tt_forecast(t))
${ not mf_realization(mSolve, f) // Realization not updated
and (mSettings('schedule', 'onlyExistingForecasts')
and (mSettings(mSolve, 'onlyExistingForecasts')
-> ts_reserveDemand_update(restype, up_down, node, f, t)) // Update only existing values (zeroes need to be EPS)
}
= ts_reserveDemand_update(restype, up_down, node, f, t);
......@@ -116,7 +116,7 @@ $offtext
execute_load ts_node_update=ts_node;
ts_node(gn(grid, node), param_gnBoundaryTypes, f_solve(f), tt_forecast(t))
${ not mf_realization(mSolve, f) // Realization not updated
and (mSettings('schedule', 'onlyExistingForecasts')
and (mSettings(mSolve, 'onlyExistingForecasts')
-> ts_node_update(grid, node, param_gnBoundaryTypes, f ,t)) // Update only existing values (zeroes need to be EPS)
}
= ts_node_update(grid, node, param_gnBoundaryTypes, f, t);
......
......@@ -7,7 +7,7 @@ p_sProbability(s_active(s)) = p_msProbability(mSolve, s);
* SCENRED2 parameters
ScenRedParms('red_num_leaves') = min(mSettings(mSolve, 'red_num_leaves'),
mSettings('schedule', 'scenarios'));
mSettings(mSolve, 'scenarios'));
ScenRedParms('red_percentage') = mSettings(mSolve, 'red_percentage');
ScenRedParms('scen_red') = 1$mSettings(mSolve, 'red_num_leaves'); // Reduce scenarios
ScenRedParms('tree_con') = 1$mSettings(mSolve, 'red_percentage'); // Tree construction
......
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