Commit fe7e461d authored by Topi Rasku's avatar Topi Rasku
Browse files

Making "r_genUnittype" dimensions consistent with other result vectors, along...

Making "r_genUnittype" dimensions consistent with other result vectors, along with a minor performance improvement.
parent ee7a4383
......@@ -89,7 +89,7 @@ Parameters
// Fuel use results
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_genUnittype(grid, node, unittype, t) "Energy generation/consumption for each unittype (MW)"
r_genUnittype(grid, node, unittype, f, 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_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)"
......
......@@ -199,12 +199,12 @@ loop(m,
); // 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))
and [ord(t) > mSettings(m, 't_start') + mSettings(m, 't_initializationPeriod')]
}
r_genUnittype(gn(grid, node), unittype, ft_realizedNoReset(f,t))
${ sum(unit,gnu_output(grid, node, unit))
and [ord(t) > mSettings(m, 't_start') + mSettings(m, 't_initializationPeriod')]
}
= sum(unit${unitUnittype(unit, unittype) and gnu_output(grid, node, unit)},
+ sum(f,r_gen(grid, node, unit, f, t))
+ r_gen(grid, node, unit, f, t)
); // END sum(unit)
// Total generation on each node by fuels
......
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