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

#127 !8 Fixing a couple of bugs.

parent 917fb953
......@@ -116,7 +116,7 @@ q_obj ..
// Cost of energy storage change (note: not discounted)
+ sum(gn_state(grid, node),
+ sum(mft_start(m, f, t)${ active(m, 'storageValue') },
* sum(ms(m, s)${ p_msft_probability(m, s, f, t) },
+ sum(ms(m, s)${ p_msft_probability(m, s, f, t) },
+ [
+ p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+ ts_storageValue_(grid, node, s, f+df_central(f,t), t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
......@@ -126,7 +126,7 @@ q_obj ..
) // END sum(s)
) // END sum(mftStart)
- sum(mft_lastSteps(m, f, t)${ active(m, 'storageValue') },
* sum(ms(m, s)${p_msft_probability(m, s, f, t)},
+ sum(ms(m, s)${p_msft_probability(m, s, f, t)},
+ [
+ p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+ ts_storageValue_(grid, node, s, f+df_central(f,t), t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
......
......@@ -423,7 +423,7 @@ $offtext
+ sum((nu(node, unit), emission)$p_unitEmissionCost(unit, node, emission),
+ p_unStartup(unit, node, starttype) // MWh/start-up
* p_unitEmissionCost(unit, node, emission) // CUR/MWh
) // END sum(nu, emission)
); // END sum(nu, emission)
// `storageValue`
ts_storageValue_(gn_state(grid, node), sft(s, f, tt_interval(t)))
......
......@@ -83,14 +83,14 @@ loop(m,
* [
+ sum(ft_realizedNoReset(f,t)${ ord(t) = mSettings(m, 't_end') + 1 },
+ [
+ p_storageValue(grid, node, t)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+ p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+ ts_storageValue(grid, node, f, t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
]
* r_state(grid, node, f, t)
) // END sum(ft_realizedNoReset)
- sum(ft_realizedNoReset(f,t)${ ord(t) = mSettings(m, 't_start') + mSettings(m, 't_initializationPeriod') }, // INITIAL v_state NOW INCLUDED IN THE RESULTS
+ [
+ p_storageValue(grid, node, t)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+ p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+ ts_storageValue(grid, node, f, t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
]
* r_state(grid, node, f, t)
......
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