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

Updated result tables: changing r_gen_gnUnittype renamed to...

Updated result tables: changing r_gen_gnUnittype renamed to r_gnuTotalGen_unittype, changing sum over gnu_output to gnu in three tables. See changelog.
parent 9e210517
...@@ -15,11 +15,14 @@ All notable changes to this project will be documented in this file. ...@@ -15,11 +15,14 @@ All notable changes to this project will be documented in this file.
- Replaced q_energyMax, q_energyShareMax and q_energyShareMin with q_energyLimit and q_energyShareLimit - Replaced q_energyMax, q_energyShareMax and q_energyShareMin with q_energyLimit and q_energyShareLimit
- Removing Eps values from r_reserve results table - Removing Eps values from r_reserve results table
- Allow solver resource or iteration limit interrupt if the solution is feasible - Allow solver resource or iteration limit interrupt if the solution is feasible
- result table r_gen_gnUnittype renamed to r_gnuTotalGen_unittype. Original was not actively used in master branch.
- updated the order of generation result tables in 4b_outputInvariants
### Fixed ### Fixed
- Including start-up fuel consumption in q_balance - Including start-up fuel consumption in q_balance
- Updated start-up cost and start-up emission calculation - Updated start-up cost and start-up emission calculation
- output_dir command line argument was missing quotes in the code and directories with space did not work - output_dir command line argument was missing quotes in the code and directories with space did not work
- changing sum over gnu_output to gnu in totalVOMcost, genUnittype, and gnuUtilizationRate
## 1.5 - 2021-10-05 ## 1.5 - 2021-10-05
### Added ### Added
......
...@@ -105,6 +105,7 @@ r_totalGenFuel ...@@ -105,6 +105,7 @@ r_totalGenFuel
// Interesting energy generation results // Interesting energy generation results
r_gnuTotalGen r_gnuTotalGen
r_gnuTotalGen_unittype
r_gnuTotalGenShare r_gnuTotalGenShare
r_gnTotalGen r_gnTotalGen
r_gnTotalGenShare r_gnTotalGenShare
......
...@@ -100,7 +100,7 @@ Parameters ...@@ -100,7 +100,7 @@ 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_gen_gnUnittype(grid, node, unittype) "Energy generation for each unittype in each node (MWh)" 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)"
......
...@@ -144,7 +144,7 @@ loop(m, ...@@ -144,7 +144,7 @@ loop(m,
* --- Total Cost Components (discounted) -------------------------------------- * --- Total Cost Components (discounted) --------------------------------------
// Total VOM costs // Total VOM costs
r_gnuTotalVOMCost(gnu_output(grid, node, unit)) r_gnuTotalVOMCost(gnu(grid, node, unit))
= sum(ft_realizedNoReset(f,startp(t)), = sum(ft_realizedNoReset(f,startp(t)),
+ r_gnuVOMCost(grid, node, unit, f, t) + r_gnuVOMCost(grid, node, unit, f, t)
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s) * p_s_discountFactor(s)) * sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s) * p_s_discountFactor(s))
...@@ -266,24 +266,7 @@ loop(m, ...@@ -266,24 +266,7 @@ loop(m,
) // END sum(gnu_input) ) // END sum(gnu_input)
]; ];
* --- Total Energy Generation ------------------------------------------------- * --- Energy Generation -------------------------------------------------------
// Total energy generation
r_gnuTotalGen(gnu_output(grid, node, unit))
= sum(ft_realizedNoReset(f, startp(t)),
+ r_gen(grid, node, unit, f, t)
* p_stepLengthNoReset(m, f, t)
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
); // END sum(ft_realizedNoReset)
r_gen_gnUnittype(gn(grid, node), unittype)$sum(unit$unitUnittype(unit, unittype), 1)
= sum(gnu(grid,node,unit)$unitUnittype(unit, unittype),
sum(ft_realizedNoReset(f, startp(t)),
+ r_gen(grid, node, unit, f, t)
* p_stepLengthNoReset(m, f, t)
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
) // END sum(ft_realizedNoReset)
);
// Energy output to a node based on inputs from another node or flows // Energy output to a node based on inputs from another node or flows
r_genFuel(gn(grid, node), node_, ft_realizedNoReset(f, startp(t)))$sum(gnu_input(grid_, node_, unit)$gnu_output(grid, node, unit),r_gen(grid_, node_, unit, f, t)) r_genFuel(gn(grid, node), node_, ft_realizedNoReset(f, startp(t)))$sum(gnu_input(grid_, node_, unit)$gnu_output(grid, node, unit),r_gen(grid_, node_, unit, f, t))
...@@ -301,10 +284,42 @@ loop(m, ...@@ -301,10 +284,42 @@ loop(m,
// Energy generation for each unittype // Energy generation for each unittype
r_genUnittype(gn(grid, node), unittype, ft_realizedNoReset(f,startp(t))) r_genUnittype(gn(grid, node), unittype, ft_realizedNoReset(f,startp(t)))
= sum(gnu_output(grid, node, unit)$unitUnittype(unit, unittype), = sum(gnu(grid, node, unit)$unitUnittype(unit, unittype),
+ r_gen(grid, node, unit, f, t) + r_gen(grid, node, unit, f, t)
); // END sum(unit) ); // END sum(unit)
// Unit start-up consumption
r_nuStartupConsumption(nu_startup(node, unit), ft_realizedNoReset(f,startp(t)))
${sum(starttype, unitStarttype(unit, starttype))}
= sum(unitStarttype(unit, starttype),
+ r_startup(unit, starttype, f, t)
* p_unStartup(unit, node, starttype) // MWh/start-up
); // END sum(unitStarttype)
* --- Total Energy Generation -------------------------------------------------
// Total energy generation in gnu
r_gnuTotalGen(gnu(grid, node, unit))
= sum(ft_realizedNoReset(f, startp(t)),
+ r_gen(grid, node, unit, f, t)
* p_stepLengthNoReset(m, f, t)
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
); // END sum(ft_realizedNoReset)
// Total energy generation in gnu by unit type
r_gnuTotalGen_unittype(gn(grid, node), unittype)$sum(unit$unitUnittype(unit, unittype), 1)
= sum(gnu(grid,node,unit)$unitUnittype(unit, unittype),
+ r_gnuTotalGen(grid, node, unit)
);
// Total generation in gn
r_gnTotalGen(gn(grid, node))
= sum(unit, r_gnuTotalGen(grid, node, unit));
// Total generation in g
r_gTotalGen(grid)
= sum(gn(grid, node), r_gnTotalGen(grid, node));
// Total energy generation in gn per input type over the simulation // Total energy generation in gn per input type over the simulation
r_gnTotalGenFuel(gn(grid, node), node_) r_gnTotalGenFuel(gn(grid, node), node_)
= sum(ft_realizedNoReset(f, startp(t)), = sum(ft_realizedNoReset(f, startp(t)),
...@@ -313,7 +328,7 @@ loop(m, ...@@ -313,7 +328,7 @@ loop(m,
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s)) * sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
); // END sum(ft_realizedNoReset) ); // END sum(ft_realizedNoReset)
// Total dummy generation/consumption // Total dummy generation/consumption in gn
r_gnTotalqGen(inc_dec, gn(grid, node)) r_gnTotalqGen(inc_dec, gn(grid, node))
= sum(ft_realizedNoReset(f,startp(t)), = sum(ft_realizedNoReset(f,startp(t)),
+ r_qGen(inc_dec, grid, node, f, t) + r_qGen(inc_dec, grid, node, f, t)
...@@ -321,13 +336,15 @@ loop(m, ...@@ -321,13 +336,15 @@ loop(m,
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s)) * sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
); // END sum(ft_realizedNoReset) ); // END sum(ft_realizedNoReset)
// Unit start-up consumption // Total generation gnu/gn shares
r_nuStartupConsumption(nu_startup(node, unit), ft_realizedNoReset(f,startp(t))) r_gnuTotalGenShare(gnu_output(grid, node, unit))${ r_gnTotalGen(grid, node) > 0 }
${sum(starttype, unitStarttype(unit, starttype))} = r_gnuTotalGen(grid, node, unit)
= sum(unitStarttype(unit, starttype), / r_gnTotalGen(grid, node);
+ r_startup(unit, starttype, f, t)
* p_unStartup(unit, node, starttype) // MWh/start-up // Total generation gn/g shares
); // END sum(unitStarttype) r_gnTotalGenShare(gn(grid, node))${ r_gTotalGen(grid) > 0 }
= r_gnTotalGen(grid, node)
/ r_gTotalGen(grid);
* --- Emission Results -------------------------------------------------------- * --- Emission Results --------------------------------------------------------
...@@ -415,7 +432,7 @@ loop(m, ...@@ -415,7 +432,7 @@ loop(m,
); // END sum(ft_realizedNoReset) ); // END sum(ft_realizedNoReset)
// Approximate utilization rates for gnus over the simulation // Approximate utilization rates for gnus over the simulation
r_gnuUtilizationRate(gnu_output(grid, node, unit))${ r_gnuTotalGen(grid, node, unit) r_gnuUtilizationRate(gnu(grid, node, unit))${ r_gnuTotalGen(grid, node, unit)
and ( p_gnu(grid, node, unit, 'capacity') and ( p_gnu(grid, node, unit, 'capacity')
or r_invest(unit) or r_invest(unit)
) )
...@@ -520,26 +537,6 @@ r_resDemandMarginalAverage(restype, up_down, group) ...@@ -520,26 +537,6 @@ r_resDemandMarginalAverage(restype, up_down, group)
/ sum(t, t_realized(t)*1) // divided by number of realized time steps / sum(t, t_realized(t)*1) // divided by number of realized time steps
; ;
* --- Total Generation Results ------------------------------------------------
// Total generation in gn
r_gnTotalGen(gn(grid, node))
= sum(gnu_output(grid, node, unit), r_gnuTotalGen(grid, node, unit));
// Total generation in g
r_gTotalGen(grid)
= sum(gn(grid, node), r_gnTotalGen(grid, node));
// Total generation gnu/gn shares
r_gnuTotalGenShare(gnu_output(grid, node, unit))${ r_gnTotalGen(grid, node) > 0 }
= r_gnuTotalGen(grid, node, unit)
/ r_gnTotalGen(grid, node);
// Total generation gn/g shares
r_gnTotalGenShare(gn(grid, node))${ r_gTotalGen(grid) > 0 }
= r_gnTotalGen(grid, node)
/ r_gTotalGen(grid);
* --- Total Dummy Generation Results ------------------------------------------ * --- Total Dummy Generation Results ------------------------------------------
// Total dummy generaion in g // Total dummy generaion in g
......
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