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

Renamed the 'unitCapacity' parameter as 'outputCapacityTotal', and hopefully...

Renamed the 'unitCapacity' parameter as 'outputCapacityTotal', and hopefully made the description a little more helpful as well.
parent da0ced85
......@@ -131,7 +131,7 @@ param_gnu "Set of possible data parameters for grid, node, unit" /
param_unit "Set of possible data parameters for units" /
unitCount "Number of units if aggregated"
unitCapacity "A proxy for the unit size in case the maxGens cannot be just added up by default"
outputCapacityTotal "Output capacity of the unit, calculated by summing all the outputs together by default, unless defined in data"
omCosts "Variable operation and maintenance costs (/MWh)"
startupCost "Variable start-up costs excluding energy costs (/MWh)"
startupFuelCons "Consumption of start-up fuel per capacity started up (MWh_fuel/MW)"
......
......@@ -66,7 +66,7 @@ unit_elec(unit)$sum(gnu(grid, node, unit), p_gnu('elec', node, unit, 'maxGen'))
* Assume values for critical unit related parameters, if not provided by input data
p_unit(unit, 'eff00')$(not p_unit(unit, 'eff00')) = 1; // If the unit does not have efficiency set, it is 1
p_unit(unit, 'unitCount')$(not p_unit(unit, 'unitCount')) = 1; // In case number of units has not been defined it is 1.
p_unit(unit, 'unitCapacity')$(not p_unit(unit, 'unitCapacity')) = sum(gnu_output(grid, node, unit), p_gnu(grid, node, unit, 'maxGen')); // By default add outputs in order to get the total capacity of the unit
p_unit(unit, 'outputCapacityTotal')$(not p_unit(unit, 'outputCapacityTotal')) = sum(gnu_output(grid, node, unit), p_gnu(grid, node, unit, 'maxGen')); // By default add outputs in order to get the total capacity of the unit
* Generate node related sets based on input data // NOTE! These will need to change if p_gnn is required to work with only one row per link.
gn2n(grid, from_node, to_node)${p_gnn(grid, from_node, to_node, 'transferCap') OR p_gnn(grid, from_node, to_node, 'transferLoss')} = yes;
......
......@@ -70,11 +70,11 @@ q_obj ..
* {
// Startup variable costs
+ p_unit(unit, 'startupCost')
* p_unit(unit, 'unitCapacity')
* p_unit(unit, 'outputCapacityTotal')
// Start-up fuel and emission costs
+ sum(uFuel(unit_fuel, 'startup', fuel),
+ p_unit(unit, 'startupFuelCons')
* p_unit(unit, 'unitCapacity')
* p_unit(unit, 'outputCapacityTotal')
* sum(gnu_output(grid, node, unit),
// Fuel costs for start-up fuel use
+ ( + sum{tFuel$[ord(tFuel) <= ord(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