Commit 4568eb9e authored by Tomi J. Lindroos's avatar Tomi J. Lindroos
Browse files

un_commodity_in and un_commodity_out when calculating ts_vomCost

parent 2719fe93
......@@ -381,13 +381,23 @@ $offtext
// Commodity price time series
ts_vomCost_(gnu(grid, node, unit), tt_interval(t))
= + p_gnu(grid, node, unit, 'vomCosts')
+ sum(un_commodity(unit, commodity)$commodity(node),
// input commodity cost
+ sum(un_commodity_in(unit, commodity)$commodity(node),
+ p_price(commodity, 'price')$p_price(commodity, 'useConstant')
+ sum(tt_aggregate(t, t_)$p_price(commodity, 'useTimeSeries'),
+ ts_price(node, t_+dt_circular(t_))
)
/ mInterval(mSolve, 'stepsPerInterval', counter)
)
// output commodity cost
- sum(un_commodity_out(unit, commodity)$commodity(node),
+ p_price(commodity, 'price')$p_price(commodity, 'useConstant')
+ sum(tt_aggregate(t, t_)$p_price(commodity, 'useTimeSeries'),
+ ts_price(node, t_+dt_circular(t_))
)
/ mInterval(mSolve, 'stepsPerInterval', counter)
)
// emission cost
+ sum(emission$p_unitEmissionCost(unit, node, emission), // Emission taxes
+ p_unitEmissionCost(unit, node, emission)
); // END sum(emission)
......
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