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

Improving the performance of r_genUnittype calculations.

parent ac1840ba
...@@ -77,8 +77,8 @@ Parameters ...@@ -77,8 +77,8 @@ 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 by fuels (MW)"
r_genUnittype(grid, node, unittype, t) "Energy generation/consumption for each unittype (MW)" r_genUnittype(grid, node, unittype, f, t) "Energy generation by 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 shares" r_gnTotalGenFuelShare(grid, node, fuel) "Total energy generation fuel consumption gn shares"
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)"
......
...@@ -188,10 +188,10 @@ loop(m, ...@@ -188,10 +188,10 @@ 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 // Energy generation by unit type
r_genUnittype(gn(grid, node), unittype, t)$(sum(f,ft_realizedNoReset(f,t)) and sum(unit,gnu_output(grid, node, unit))) r_genUnittype(gn(grid, node), unittype, ft_realizedNoReset(f, t))${ sum(unitUnittype(unit, unittype), gnu_output(grid, node, unit)) }
= sum(unit${unitUnittype(unit, unittype) and gnu_output(grid, node, unit)}, = sum(gnu_output(grid, node, unit)${ unitUnittype(unit, unittype) },
+ sum(f,r_gen(grid, node, unit, f, t)) + r_gen(grid, node, unit, f, t)
); // END sum(unit) ); // END sum(unit)
// Total generation on each node by fuels // 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