Commit 0e29fb31 authored by Dana Kirchem's avatar Dana Kirchem
Browse files

added 'fixedFuelFraction' for start-up fuels in param_unitFuel and replaced...

added 'fixedFuelFraction' for start-up fuels in param_unitFuel and replaced 'maxFuelFraction' for start-up fuels
parent 0329eebf
......@@ -325,7 +325,8 @@ param_fuel "Parameters for fuels" /
param_unitFuel "Parameters for fuel limits in units" /
maxFuelCons "Maximum absolute fuel consumption in a unit - not used for start-up fuels"
maxFuelFraction "Maximum share of a fuel in the consumption mix - exact share for start-up fuels"
maxFuelFraction "Maximum share of a fuel in the consumption mix" //only for main fuels
fixedFuelFraction "Fixed share of a fuel in the consumption mix" //only for start-up fuels
/
param_policy "Set of possible data parameters for grid, node, regulation" /
......
......@@ -274,7 +274,7 @@ p_unitFuelEmissionCost(unit_fuel, fuel, emission)${ sum(param_fuel, uFuel(unit_f
;
// If the start-up fuel fraction is not defined, it equals 1
p_uFuel(uFuel(unit_fuel, 'startup', fuel), 'maxFuelFraction')${ not p_uFuel(unit_fuel, 'startup', fuel, 'maxFuelFraction') }
p_uFuel(uFuel(unit_fuel, 'startup', fuel), 'fixedFuelFraction')${ not p_uFuel(unit_fuel, 'startup', fuel, 'fixedFuelFraction') }
= 1;
* =============================================================================
......@@ -443,8 +443,8 @@ loop( unit,
* Check the start-up fuel fraction related data
loop( unit_fuel(unit)${sum(fuel, uFuel(unit_fuel, 'startup', fuel))},
tmp = ord(unit)
if(sum(fuel, p_uFuel(unit, 'startup', fuel, 'maxFuelFraction')) <> 1,
if(sum(fuel, p_uFuel(unit, 'startup', fuel, 'fixedFuelFraction')) <> 1,
put log '!!! Error occurred on unit #' tmp;
abort "The sum of 'maxFuelFraction' over start-up fuels needs to be one for all units using start-up fuels!"
abort "The sum of 'fixedFuelFraction' over start-up fuels needs to be one for all units using start-up fuels!"
);
);
......@@ -88,7 +88,7 @@ q_obj ..
// Start-up fuel and emission costs
+ sum(uFuel(unit, 'startup', fuel),
+ p_uStartup(unit, starttype, 'consumption')
* p_uFuel(unit, 'startup', fuel, 'maxFuelFraction')
* p_uFuel(unit, 'startup', fuel, 'fixedFuelFraction')
* [
+ ts_fuelPrice_(fuel, t)
+ sum(emission, // Emission taxes of startup fuel use
......
......@@ -1650,7 +1650,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_uFuel(unit_fuel, 'startup', fuel, 'fixedFuelFraction')
* p_fuelEmission(fuel, emission) / 1e3
* sum(gnu_output(grid, node, unit_fuel)${gnGroup(grid, node, group)},
+ p_gnu(grid, node, unit_fuel, 'unitSizeGen')
......
......@@ -53,7 +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')
* p_uFuel(unit, 'startup', fuel, 'fixedFuelFraction')
* [ // 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