Commit 264e59ef authored by Niina Helistö's avatar Niina Helistö
Browse files

Small fixes to fuel fraction calculation and sets related to start-up/shutdown trajectories

parent c5b0793c
......@@ -960,9 +960,9 @@ q_conversionSOS2IntermediateOutput(suft(effLambda(effGroup), unit, f, t)) ..
* --- Fuel Use Limitation -----------------------------------------------------
q_fuelUseLimit(fuel, uft(unit, f, t))${ uFuel(unit, 'main', fuel)
and p_uFuel(unit, 'main', fuel, 'maxFuelFraction')
} ..
q_fuelUseLimit(fuel, uft(unit_fuel(unit), f, t))${ uFuel(unit, 'main', fuel)
and p_uFuel(unit, 'main', fuel, 'maxFuelFraction')
} ..
// Use of the limited fuel
+ v_fuelUse(fuel, unit, f, t)
......@@ -1616,6 +1616,7 @@ q_emissioncap(group, emission)${ p_groupPolicy3D(group, 'emissionCap', emission
+ v_startup(unit_fuel, starttype, f+df_central(f,t), t)
* sum(uFuel(unit_fuel, 'startup', fuel),
+ p_uStartup(unit_fuel, starttype, 'consumption')
* p_uFuel(unit_fuel, 'startup', fuel, 'maxFuelFraction')
* p_fuelEmission(fuel, emission) / 1e3
* sum(gnu_output(grid, node, unit_fuel)${gnGroup(grid, node, group)},
+ p_gnu(grid, node, unit_fuel, 'unitSizeGen')
......
......@@ -474,6 +474,10 @@ loop(effLevelGroupUnit(effLevel, effGroup, unit)${ mSettingsEff(mSolve, effLeve
= smin(effSelector$effGroupSelectorUnit(effGroup, unit, effSelector), ts_effUnit(effGroup, unit, effSelector, 'slope', f, t)); // Uses maximum efficiency for the group
); // END loop(effLevelGroupUnit)
// Units with start-up and shutdown trajectories
Option clear = uft_startupTrajectory;
Option clear = uft_shutdownTrajectory;
// Determine the intervals when units need to follow start-up and shutdown trajectories.
loop(uft_online(unit, f, t)${ p_u_runUpTimeIntervals(unit) },
uft_startupTrajectory(unit, f, t)${ord(t) < tSolveFirst + mSettings(mSolve, 't_omitTrajectories')}
......
......@@ -53,6 +53,7 @@ loop(m,
// Startup fuel consumption and emissions
+ sum(uFuel(unit, 'startup', fuel),
+ p_uStartup(unit, starttype, 'consumption')
* p_uFuel(unit, 'startup', fuel, 'maxFuelFraction')
* [ // Fuel price
+ ts_fuelPrice(fuel, t)
// Emission costs
......
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