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

Two new result tables for easier graph drawing and debugging

parent 3dc603ee
...@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file. ...@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
- Result tables for annual reserve results (gn, resTransfer) - Result tables for annual reserve results (gn, resTransfer)
- Two additional constraints to make transfer constraints tighter - Two additional constraints to make transfer constraints tighter
- New set for the m, s, f, t combinations including the previous sample - New set for the m, s, f, t combinations including the previous sample
- two new result tables (gnGen, groupReserves) for easier graph drawing and debugging
### Changed ### Changed
- Replaced commodity set with a parameter usePrice and updated results calculation related to it - Replaced commodity set with a parameter usePrice and updated results calculation related to it
......
...@@ -105,8 +105,9 @@ r_totalGenFuel ...@@ -105,8 +105,9 @@ r_totalGenFuel
// Interesting energy generation results // Interesting energy generation results
r_gnuTotalGen r_gnuTotalGen
r_gnuTotalGen_unittype r_gnuTotalGen_unittype
r_gnuTotalGenShare r_gnuTotalGenShare
r_gnGen
r_gnTotalGen r_gnTotalGen
r_gnTotalGenShare r_gnTotalGenShare
r_gTotalGen r_gTotalGen
...@@ -174,8 +175,9 @@ r_gnuTotalReserveShare ...@@ -174,8 +175,9 @@ r_gnuTotalReserveShare
r_gnTotalReserve r_gnTotalReserve
r_gnnTotalResTransferRightward r_gnnTotalResTransferRightward
r_gnnTotalResTransferLeftward r_gnnTotalResTransferLeftward
r_groupTotalReserve
r_resDemandLargestInfeedUnit r_resDemandLargestInfeedUnit
r_groupReserve
r_groupTotalReserve
* --- Investment Result Symbols ----------------------------------------------- * --- Investment Result Symbols -----------------------------------------------
......
...@@ -100,7 +100,6 @@ Parameters ...@@ -100,7 +100,6 @@ Parameters
// Results required for model structure // Results required for model structure
r_gen(grid, node, unit, f, t) "Energy generation for a unit (MW)" r_gen(grid, node, unit, f, t) "Energy generation for a unit (MW)"
r_gnuTotalGen_unittype(grid, node, unittype) "Energy generation for each unittype in each node (MWh)"
// Energy output results based on input types or unittypes // Energy output results based on input types or unittypes
r_genFuel(grid, node, *, f, t) "Energy output to a node based on inputs from another node or flows (MW)" r_genFuel(grid, node, *, f, t) "Energy output to a node based on inputs from another node or flows (MW)"
...@@ -112,7 +111,9 @@ Parameters ...@@ -112,7 +111,9 @@ Parameters
// Interesting energy generation results // Interesting energy generation results
r_gnuTotalGen(grid, node, unit) "Total energy generation in gnu over the simulation (MWh)" r_gnuTotalGen(grid, node, unit) "Total energy generation in gnu over the simulation (MWh)"
r_gnuTotalGen_unittype(grid, node, unittype) "Energy generation for each unittype in each node (MWh)"
r_gnuTotalGenShare(grid, node, unit) "Total energy generation gnu/gn share" r_gnuTotalGenShare(grid, node, unit) "Total energy generation gnu/gn share"
r_gnGen(grid, node, f, t) "energy generation for each gridnode (MW)"
r_gnTotalGen(grid, node) "Total energy generation in gn over the simulation (MWh)" r_gnTotalGen(grid, node) "Total energy generation in gn over the simulation (MWh)"
r_gnTotalGenShare(grid, node) "Total energy generation gn/g share" r_gnTotalGenShare(grid, node) "Total energy generation gn/g share"
r_gTotalGen(grid) "Total energy generation in g over the simulation (MWh)" r_gTotalGen(grid) "Total energy generation in g over the simulation (MWh)"
...@@ -180,10 +181,12 @@ Parameters ...@@ -180,10 +181,12 @@ Parameters
r_gnuTotalReserve(restype, up_down, grid, node, unit) "Total gnu reserve provision over the simulation (MW*h)" r_gnuTotalReserve(restype, up_down, grid, node, unit) "Total gnu reserve provision over the simulation (MW*h)"
r_gnuTotalReserveShare(restype, up_down, grid, node, unit) "Total gnu/group reserve provision share over the simulation" r_gnuTotalReserveShare(restype, up_down, grid, node, unit) "Total gnu/group reserve provision share over the simulation"
r_gnTotalReserve(restype, up_down, grid, node) "Total gn reserve provision over the simulation (MW*h)" r_gnTotalReserve(restype, up_down, grid, node) "Total gn reserve provision over the simulation (MW*h)"
r_groupTotalReserve(restype, up_down, group) "Total reserve provisions in groups over the simulation (MW*h)"
r_gnnTotalResTransferRightward(restype, up_down, grid, node, node) "Total electricity transmission capacity from the first node to the second node reserved for providing reserves (MW*h)" r_gnnTotalResTransferRightward(restype, up_down, grid, node, node) "Total electricity transmission capacity from the first node to the second node reserved for providing reserves (MW*h)"
r_gnnTotalResTransferLeftward(restype, up_down, grid, node, node) "Total electricity transmission capacity from the second node to the first node reserved for providing reserves (MW*h)" r_gnnTotalResTransferLeftward(restype, up_down, grid, node, node) "Total electricity transmission capacity from the second node to the first node reserved for providing reserves (MW*h)"
r_resDemandLargestInfeedUnit(restype, up_down, group, f, t) "Reserve Demand from the loss of largest infeed unit" r_resDemandLargestInfeedUnit(restype, up_down, group, f, t) "Reserve Demand from the loss of largest infeed unit"
r_groupReserve(restype, up_down, group, f, t) "Group sum of reserves of specific types (MW)"
r_groupTotalReserve(restype, up_down, group) "Total reserve provisions in groups over the simulation (MW*h)"
* --- Investment Results ------------------------------------------------------ * --- Investment Results ------------------------------------------------------
......
...@@ -173,7 +173,7 @@ q_resDemand(restypeDirectionGroup(restype, up_down, group), sft(s, f, t)) ...@@ -173,7 +173,7 @@ q_resDemand(restypeDirectionGroup(restype, up_down, group), sft(s, f, t))
}, },
+ v_gen(grid, node, unit, s, f, t) + v_gen(grid, node, unit, s, f, t)
* p_gnuReserves(grid, node, unit, restype, 'reserve_increase_ratio') * p_gnuReserves(grid, node, unit, restype, 'reserve_increase_ratio')
) // END sum(nuft) ) // END sum(gnuft)
// Reserve provisions to other groups via transfer links // Reserve provisions to other groups via transfer links
+ sum(gn2n_directional(grid, node, node_)${ gnGroup(grid, node, group) + sum(gn2n_directional(grid, node, node_)${ gnGroup(grid, node, group)
......
...@@ -312,6 +312,10 @@ loop(m, ...@@ -312,6 +312,10 @@ loop(m,
+ r_gnuTotalGen(grid, node, unit) + r_gnuTotalGen(grid, node, unit)
); );
// energy generation for each gridnode (MW)
r_gnGen(grid, node, f, t)
= sum(unit, r_gen(grid, node, unit, f, t));
// Total generation in gn // Total generation in gn
r_gnTotalGen(gn(grid, node)) r_gnTotalGen(gn(grid, node))
= sum(unit, r_gnuTotalGen(grid, node, unit)); = sum(unit, r_gnuTotalGen(grid, node, unit));
...@@ -692,6 +696,14 @@ r_reserve2Reserve(gnuRescapable(restype, up_down, grid, node, unit), restype_, f ...@@ -692,6 +696,14 @@ r_reserve2Reserve(gnuRescapable(restype, up_down, grid, node, unit), restype_, f
* --- Total Reserve Provision Results ----------------------------------------- * --- Total Reserve Provision Results -----------------------------------------
// Group sum of reserves of specific types (MW)
r_groupReserve(restype, up_down, group, f, t)
= sum(gnuft(grid, node, unit, f, t)${ gnGroup(grid, node, group)
and groupRestype(group, restype)
},
+ r_reserve(restype, up_down, grid, node, unit, f, t)
); // END sum(gnuft)
// Total reserve provision in groups over the simulation // Total reserve provision in groups over the simulation
r_groupTotalReserve(restypeDirectionGroup(restype, up_down, group)) r_groupTotalReserve(restypeDirectionGroup(restype, up_down, group))
= sum(gnuRescapable(restype, up_down, grid, node, unit)${gnGroup(grid, node, group)}, = sum(gnuRescapable(restype, up_down, grid, node, unit)${gnGroup(grid, node, group)},
......
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