Commit 7d01d9f3 authored by Esasimo's avatar Esasimo
Browse files

Merge branch 'dev' of https://gitlab.vtt.fi/backbone/backbone into dev

parents 9378cbcf 1beb6a12
......@@ -61,7 +61,7 @@ q_obj ..
+ sum(gn(grid, node),
+ vq_gen(inc_dec, grid, node, s, f, t)
*( PENALTY_BALANCE(grid, node)${not p_gnBoundaryPropertiesForStates(grid, node, 'balancePenalty', 'useTimeSeries')}
+ ts_node(grid, node, 'balancePenalty', f, t)${p_gnBoundaryPropertiesForStates(grid, node, 'balancePenalty', 'useTimeSeries')}
+ ts_node_(grid, node, 'balancePenalty', s, f, t)${p_gnBoundaryPropertiesForStates(grid, node, 'balancePenalty', 'useTimeSeries')}
)
) // END sum(gn)
) // END sum(inc_dec)
......
......@@ -180,11 +180,12 @@ loop(m,
)
// Allocate fuel and startup costs on energy basis, but for output nodes only
+ sum(unit$gnu(grid, node, unit),
+ sum(gnu(grid, node, unit)$(gnu_output(grid, node, unit) and r_gen[grid, node, unit, f, t]),
+ abs{r_gen[grid, node, unit, f, t]} // abs is due to potential negative outputs like energy from a cooling unit. It's the energy contribution that matters, not direction.
/
sum(gnu_output(grid_output, node_output, unit)$r_gen[grid_output, node_output, unit, f, t], abs{r_gen[grid_output, node_output, unit, f, t]})
)
+ [
+ abs{r_gen(grid, node, unit, f, t)} // abs is due to potential negative outputs like energy from a cooling unit. It's the energy contribution that matters, not direction.
/ sum(gnu_output(grid_output, node_output, unit),
+ abs{r_gen(grid_output, node_output, unit, f, t)}
) // END sum(gnu_output)
]$(gnu_output(grid, node, unit) and abs{r_gen(grid, node, unit, f, t)} > eps)
*
{
+ sum(un_commodity(unit, commodity), r_uFuelEmissionCost(commodity, unit, f, t))
......
This diff is collapsed.
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