Commit e5584755 authored by Juha Kiviluoma's avatar Juha Kiviluoma
Browse files

Output r_genUnittype

parent 688d8cf3
...@@ -73,6 +73,7 @@ r_gen ...@@ -73,6 +73,7 @@ r_gen
// Fuel use results // Fuel use results
r_fuelUse r_fuelUse
r_genFuel r_genFuel
r_genUnittype
r_gnTotalGenFuel r_gnTotalGenFuel
r_gnTotalGenFuelShare r_gnTotalGenFuelShare
r_gTotalGenFuel r_gTotalGenFuel
......
...@@ -75,6 +75,7 @@ Parameters ...@@ -75,6 +75,7 @@ Parameters
// Fuel use results // Fuel use results
r_fuelUse(fuel, unit, f, t) "Fuel use of units" r_fuelUse(fuel, unit, f, t) "Fuel use of units"
r_genFuel(grid, node, fuel, f, t) "Energy generation/consumption based on fuels / flows (MW)" r_genFuel(grid, node, fuel, f, t) "Energy generation/consumption based on fuels / flows (MW)"
r_genUnittype(grid, node, unittype, t) "Energy generation/consumption for each unittype (MW)"
r_gnTotalGenFuel(grid, node, fuel) "Total energy generation in gn per fuel over the simulation (MWh)" r_gnTotalGenFuel(grid, node, fuel) "Total energy generation in gn per fuel over the simulation (MWh)"
r_gnTotalGenFuelShare(grid, node, fuel) "Total energy generation fuel consumption gn/g share" r_gnTotalGenFuelShare(grid, node, fuel) "Total energy generation fuel consumption gn/g share"
r_gTotalGenFuel(grid, fuel) "Total energy generation in g per fuel over the simulation (MWh)" r_gTotalGenFuel(grid, fuel) "Total energy generation in g per fuel over the simulation (MWh)"
......
...@@ -161,6 +161,12 @@ loop(m, ...@@ -161,6 +161,12 @@ loop(m,
+ r_gen(grid, node, unit, f, t) + r_gen(grid, node, unit, f, t)
); // END sum(uFuel) ); // END sum(uFuel)
// Energy generation by fuels
r_genUnittype(gn(grid, node), unittype, t)$(sum(f,ft_realizedNoReset(f,t)) and sum(unit,gnu_output(grid, node, unit)))
= sum(unit${unitUnittype(unit, unittype) and gnu_output(grid, node, unit)},
+ sum(f,r_gen(grid, node, unit, f, t))
); // END sum(unit)
// Total generation on each node by fuels // Total generation on each node by fuels
r_gnTotalGenFuel(gn(grid, node), fuel) r_gnTotalGenFuel(gn(grid, node), fuel)
= sum(ft_realizedNoReset(f, t), = sum(ft_realizedNoReset(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