Commit 140b64e3 authored by Niina Helistö's avatar Niina Helistö
Browse files

Replacing the "*" dimension with "param_policy" in some reserve parameters to...

Replacing the "*" dimension with "param_policy" in some reserve parameters to avoid any typos and mistakes in input data
parent 9c609d10
......@@ -127,8 +127,6 @@ Sets
// Directional Sets
input_output "Designating nodes as either inputs or outputs"
/ input, output /
up_down "Direction set used by some variables, e.g. reserve provisions and generation ramps"
/ up, down /
inc_dec "Increase or decrease in dummy, or slack variables"
/ increase, decrease /
min_max "Minimum and maximum"
......@@ -372,6 +370,8 @@ param_policy "Set of possible data parameters for groups or grid, node, regulati
offlineReserveCapability "Proportion of an offline unit which can contribute to a category of reserve"
ReserveShareMax "Maximum reserve share of a group of units"
LossOfTrans "A flag to tell that N-1 reserve is needed due to a possibility that an interconnector to/from the node group fails"
up "Upward direction, e.g. for reserve provisions"
down "Downward direction, e.g. for reserve provisions"
/
* --- Efficiency Approximation Related Sets -----------------------------------
......@@ -387,6 +387,7 @@ hrop(param_unit) "Operating points in the incremental heat rate curves, also fun
/hrop00*hrop12/ // IMPORTANT! Has to equal the same param_unit!
hr(param_unit) "Heat rate for the corresponding operating point ('hrop') in the heat rate curves, also used for data indexing"
/hr00*hr12/ // IMPORTANT! Has to equal the same param_unit!
* --- Counters and Directional Sets -------------------------------------------
// Slack categories
......@@ -404,4 +405,8 @@ spillLimits(param_gnBoundaryTypes) "set of upward and downward state limits"
/ maxSpill, minSpill /
useConstantOrTimeSeries(param_gnBoundaryProperties) "useTimeSeries and useConstant property together"
/ useTimeSeries, useConstant /
// Directional sets that are subsets of others
up_down(param_policy) "Direction set used by some variables, e.g. reserve provisions and generation ramps"
/ up, down /
; // END parameter set declarations
......@@ -54,11 +54,11 @@ Parameters
p_unit(unit, param_unit) "Unit data where energy type does not matter"
p_unitConstraint(unit, constraint) "Constant for constraints (eq1-9, gt1-9) between inputs and outputs"
p_unitConstraintNode(unit, constraint, node) "Coefficients for constraints (eq1-9, gt1-9) between inputs and outputs"
p_gnReserves(grid, node, restype, *) "Data defining the reserve rules in each node"
p_groupReserves(group, restype, *) "Data defining the reserve rules in each node group"
p_gnReserves(grid, node, restype, param_policy) "Data defining the reserve rules in each node"
p_groupReserves(group, restype, param_policy) "Data defining the reserve rules in each node group"
p_groupReserves3D(group, restype, up_down, param_policy) "Reserve policy in each node group separately for each reserve type and direction"
p_groupReserves4D(group, restype, up_down, group, param_policy) "Reserve policy in each node group separately for each reserve type and direction, also linking to another group"
p_gnuReserves(grid, node, unit, restype, *) "Reserve provision data for units"
p_gnuReserves(grid, node, unit, restype, param_policy) "Reserve provision data for units"
p_gnnReserves(grid, node, node, restype, up_down) "Reserve provision data for node node connections"
p_gnuRes2Res(grid, node, unit, restype, up_down, restype) "The first type of reserve can be used also in the second reserve category (with a possible multiplier)"
p_gnPolicy(grid, node, param_policy, *) "Policy data for grid, node"
......
......@@ -393,7 +393,6 @@ flowNode(flow, node)${ sum((f, t), ts_cf(flow, node, f, t))
// Copy data from p_groupReserves to p_gnReserves
loop(gnGroup(grid, node, group)${sum(restype, p_groupReserves(group, restype, 'reserve_length'))},
p_gnReserves(grid, node, restype, param_policy) = p_groupReserves(group, restype, param_policy);
p_gnReserves(grid, node, restype, up_down) = p_groupReserves(group, restype, up_down);
);
// Units with reserve provision capabilities
......
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