Skip to content
GitLab
Commit d38afa61 authored by Tomi J. Lindroos's avatar Tomi J. Lindroos
Browse files

Merge branch '#165_aggrUnit_maintBreaks' into 'master' 

Fixing simultaneous use of aggregated units and maintenance breaks

See merge request !22
parents 3dc603ee aba723b7
Show whitespace changes
Inline Side-by-side
inc/3b_periodicLoop.gms
View file @ d38afa61
......@@ -554,21 +554,9 @@ $macro tt_aggcircular(t, t_) tt_agg_circular(t, t_, t__)
* --- Defining unit aggregations and ramps ------------------------------------
* =============================================================================
// Units active on each ft
// Units with capacities or investment option active on each ft
Option clear = uft;
uft(unit, ft(f, t))${ ( [
ord(t) <= tSolveFirst + p_unit(unit, 'lastStepNotAggregated')
and (unit_aggregated(unit) or unit_noAggregate(unit)) // Aggregated and non-aggregate units
]
or
[
ord(t) > tSolveFirst + p_unit(unit, 'lastStepNotAggregated')
and (unit_aggregator(unit) or unit_noAggregate(unit)) // Aggregator and non-aggregate units
]
)
and not sameas(unit, 'empty')
}
// only units with capacities or investment option
uft(unit, ft(f, t))${ not sameas(unit, 'empty') }
= yes;
// Units are not active before or after their lifetime
......@@ -589,6 +577,21 @@ uft(unit, ft(f, t))${ [p_unit(unit, 'becomeAvailable') and p_unit(unit, 'becomeU
}
= yes;
// Deactivating aggregated after lastStepNotAggregated and aggregators before
uft(unit, ft(f, t))${ ( [
ord(t) > tSolveFirst + p_unit(unit, 'lastStepNotAggregated')
and unit_aggregated(unit) // Aggregated units
]
or
[
ord(t) <= tSolveFirst + p_unit(unit, 'lastStepNotAggregated')
and unit_aggregator(unit) // Aggregator units
]
)
}
= no;
// First ft:s for each aggregator unit
Option clear = uft_aggregator_first;
loop(unit${unit_aggregator(unit)},
......
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

This system is mainly used for VTT projects and partners in those projects. Default permission does not allow user to create projects / groups. If you are VTT person, please contact Kimmo Ahola for getting permissions.