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

Merge branch 'master' of https://gitlab.vtt.fi/backbone/backbone into master

parents bb2034e4 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