Commit 3446c578 authored by Niina Helistö's avatar Niina Helistö
Browse files

Clarifying result parameter descriptions after removing the commodity set

Issue #161
parent d27a27bf
......@@ -94,7 +94,7 @@ r_gnnDiffusion
// Results required for model structure !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
r_gen
// Fuel use results
// Energy output results based on input types or unittypes
r_genFuel
r_genUnittype
r_gnTotalGenFuel
......
......@@ -101,13 +101,13 @@ Parameters
r_gen(grid, node, unit, f, t) "Energy generation for a unit (MW)"
r_gen_gnUnittype(grid, node, unittype) "Energy generation for each unittype in each node (MWh)"
// Fuel use results
r_genFuel(grid, node, *, f, t) "Energy generation/consumption based on fuels / flows (MW)"
r_genUnittype(grid, node, unittype, f, t) "Energy generation/consumption for each unittype (MW)"
r_gnTotalGenFuel(grid, node, node) "Total energy generation in gn per input over the simulation (MWh)"
r_gnTotalGenFuelShare(grid, node, node) "Total energy generation input consumption gn/g share"
r_gTotalGenFuel(grid, node) "Total energy generation in g per input over the simulation (MWh)"
r_totalGenFuel(node) "Total overall energy generation/consumption per input over the simulation (MWh)"
// Energy output results based on input types or unittypes
r_genFuel(grid, node, *, f, t) "Energy output to a node based on inputs from another node or flows (MW)"
r_genUnittype(grid, node, unittype, f, t) "Energy generation for each unittype (MW)"
r_gnTotalGenFuel(grid, node, node) "Total energy generation in gn per input type over the simulation (MWh)"
r_gnTotalGenFuelShare(grid, node, node) "Total energy generation in gn per input type as a share of total energy generation in gn"
r_gTotalGenFuel(grid, node) "Total energy generation in g per input type over the simulation (MWh)"
r_totalGenFuel(node) "Total overall energy generation per input type over the simulation (MWh)"
// Interesting energy generation results
r_gnuTotalGen(grid, node, unit) "Total energy generation in gnu over the simulation (MWh)"
......
......@@ -286,7 +286,7 @@ loop(m,
) // END sum(ft_realizedNoReset)
);
// Energy generation by fuels
// Energy output to a node based on inputs from another node or flows
r_genFuel(gn(grid, node), node_, ft_realizedNoReset(f, startp(t)))$sum(gnu_input(grid_, node_, unit)$gnu_output(grid, node, unit),r_gen(grid_, node_, unit, f, t))
= sum(gnu_output(grid, node, unit)$sum(gnu_input(grid_, node_, unit), 1),
+ r_gen(grid, node, unit, f, t)
......@@ -300,13 +300,13 @@ loop(m,
= sum(gnu_output(grid, node, unit)$flowUnit(flow, unit),
+ r_gen(grid, node, unit, f, t));
// Energy generation by fuels
// Energy generation for each unittype
r_genUnittype(gn(grid, node), unittype, ft_realizedNoReset(f,startp(t)))
= sum(gnu_output(grid, node, unit)$unitUnittype(unit, unittype),
+ r_gen(grid, node, unit, f, t)
); // END sum(unit)
// Total generation on each node by fuels
// Total energy generation in gn per input type over the simulation
r_gnTotalGenFuel(gn(grid, node), node_)
= sum(ft_realizedNoReset(f, startp(t)),
+ r_genFuel(grid, node, node_, f, t)
......@@ -354,8 +354,7 @@ loop(m,
// Emissions from unit start-ups
r_emissionsStartup(node, emission, unit, ft_realizedNoReset(f,startp(t)))
${sum(starttype, unitStarttype(unit, starttype))
and sum(starttype, p_unStartup(unit, node, starttype))
${sum(starttype, p_unStartup(unit, node, starttype))
and p_nEmission(node, emission)}
= sum(unitStarttype(unit, starttype),
+ r_startup(unit, starttype, f, t)
......@@ -365,7 +364,7 @@ loop(m,
); // END sum(starttype)
// Emission sums from normal operation input
r_nuTotalEmissionsOperation(node, unit, emission)$nu(node, unit)
r_nuTotalEmissionsOperation(nu(node, unit), emission)
= sum(ft_realizedNoReset(f, startp(t)),
+ sum(gn(grid, node), r_emissions(grid, node, emission, unit, f, t))
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
......@@ -373,7 +372,7 @@ loop(m,
;
// Emission sums from unit outputs
r_nuTotalEmissionsFromOutput(node, unit, emission)$nu(node, unit)
r_nuTotalEmissionsFromOutput(nu(node, unit), emission)
= sum(ft_realizedNoReset(f, startp(t)),
+ sum(gn(grid, node), r_emissionsFromOutput(grid, node, emission, unit, f, t))
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
......@@ -381,7 +380,7 @@ loop(m,
;
// Emission sums from start-ups
r_nuTotalEmissionsStartup(node, unit, emission)$nu_startup(node, unit)
r_nuTotalEmissionsStartup(nu_startup(node, unit), emission)
= sum(ft_realizedNoReset(f, startp(t)),
+ r_emissionsStartup(node, emission, unit, f, t)
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s))
......@@ -523,17 +522,17 @@ r_gnTotalConsumptionShare(gn(grid, node))${ r_gTotalConsumption(grid) > 0 }
= r_gnTotalConsumption(grid, node)
/ r_gTotalConsumption(grid);
* --- Total Fuel Consumption Results ------------------------------------------
* --- Total Energy Generation Results Per Input Type --------------------------
// Total fuel consumption in grids over the simulation
// Total energy generation in grids per input type over the simulation
r_gTotalGenFuel(grid, node_)
= sum(gn(grid, node), r_gnTotalGenFuel(grid, node, node_));
// Total fuel consumption over the simulation
// Total overall energy generation per input type over the simulation
r_totalGenFuel(node_)
= sum(gn(grid, node), r_gnTotalGenFuel(grid, node, node_));
// Total fuel consumption gn/g shares
// Total energy generation in gn per input type as a share of total energy generation in gn across all input types
r_gnTotalGenFuelShare(gn(grid, node), node_)${ r_gnTotalGen(grid, node) }
= r_gnTotalGenFuel(grid, node, node_)
/ r_gnTotalGen(grid, node);
......
Markdown is supported
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