Commit 4c826901 authored by Niina Helistö's avatar Niina Helistö
Browse files

Changed the constraints for emission cap, minimum energy share, and maximum...

Changed the constraints for emission cap, minimum energy share, and maximum energy share so that they can be defined for a group of samples as well.
parent a4bbd7fb
......@@ -117,8 +117,6 @@ Sets
/ increase, decrease /
min_max "Minimum and maximum"
/ min, max /
start_end "Start and end, e.g. of unit lifetime"
/ start, end /
* --- Model Feature Sets ------------------------------------------------------
......@@ -302,6 +300,8 @@ param_unit "Set of possible data parameters for units" /
investMIP "Choice of making integer investment instead of continous investment (number of units versus MW)"
maxUnitCount "Maximum number of units when making integer investments"
minUnitCount "Minimum number of units when making integer investments"
start "The relative position of the time step when the unit becomes available (calculated from ut(unit, t, start_end))"
end "The relative position of the time step when the unit becomes unavailable (calculated from ut(unit, t, start_end))"
/
param_fuel "Parameters for fuels" /
......@@ -357,4 +357,8 @@ spillLimits(param_gnBoundaryTypes) "set of upward and downward state limits"
/ maxSpill, minSpill /
useConstantOrTimeSeries(param_gnBoundaryProperties) "useTimeSeries and useConstant property together"
/ useTimeSeries, useConstant /
// Other
start_end(param_unit) "Start and end, e.g. of unit lifetime"
/ start, end /
; // END parameter set declarations
......@@ -121,6 +121,7 @@ Sets
gnuGroup(grid, node, unit, group) "Grid, node, unit combinations in particular groups"
gn2nGroup(grid, node, node, group) "Transfer links in particular groups"
gnGroup(grid, node, group) "Grid, node combinations in particular gngroups"
sGroup(s, group) "Samples in particular groups"
;
* Set initial values to avoid errors when checking if parameter contents have been loaded from input data
Option clear = modelSolves;
......
......@@ -58,6 +58,7 @@ $loaddc uGroup
$loaddc gnuGroup
$loaddc gn2nGroup
$loaddc gnGroup
$loaddc sGroup
$loaddc p_groupPolicy
$loaddc p_groupPolicy3D
$gdxin
......
......@@ -1541,7 +1541,7 @@ q_constrainedCapMultiUnit(group)${ p_groupPolicy(group, 'constrainedCapTotalMa
q_emissioncap(group, emission)${ p_groupPolicy3D(group, 'emissionCap', emission)
} ..
+ sum(msft(m, s, f, t),
+ sum(msft(m, s, f, t)${sGroup(s, group)},
+ p_msft_Probability(m,s,f,t)
* [
// Time step length dependent emissions
......@@ -1587,7 +1587,7 @@ q_emissioncap(group, emission)${ p_groupPolicy3D(group, 'emissionCap', emission
q_energyShareMax(group)${ p_groupPolicy(group, 'energyShareMax')
} ..
+ sum(msft(m, s, f, t),
+ sum(msft(m, s, f, t)${sGroup(s, group)},
+ p_msft_Probability(m,s,f,t)
* p_stepLength(m, f, t)
* [
......@@ -1626,7 +1626,7 @@ q_energyShareMax(group)${ p_groupPolicy(group, 'energyShareMax')
q_energyShareMin(group)${ p_groupPolicy(group, 'energyShareMin')
} ..
+ sum(msft(m, s, f, t),
+ sum(msft(m, s, f, t)${sGroup(s, group)},
+ p_msft_Probability(m,s,f,t)
* p_stepLength(m, 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