Commit 30cde1d2 authored by Tomi J. Lindroos's avatar Tomi J. Lindroos
Browse files

Converting emissions from outputs to negative values

parent 7f7101f5
...@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file. ...@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
### Changed ### Changed
- result table r_gen_gnUnittype renamed to r_gnuTotalGen_unittype. Original was not actively used in master branch. - result table r_gen_gnUnittype renamed to r_gnuTotalGen_unittype. Original was not actively used in master branch.
- updated the order of generation result tables in 4b_outputInvariants - updated the order of generation result tables in 4b_outputInvariants
- changed emissions from output result table to print negative numbers signifying emissions bound to manufactured product
### Fixed ### Fixed
- changing sum over gnu_output to gnu in totalVOMcost, genUnittype, and gnuUtilizationRate - changing sum over gnu_output to gnu in totalVOMcost, genUnittype, and gnuUtilizationRate
......
...@@ -141,7 +141,7 @@ r_uTotalShutdown ...@@ -141,7 +141,7 @@ r_uTotalShutdown
* --- Emissions Results ----------------------------------------------- * --- Emissions Results -----------------------------------------------
// Unit level emissions from normal operation // Unit level emissions from normal operation inputs
r_emissions r_emissions
// Unit level emissions from outputs, not considered in the equations // Unit level emissions from outputs, not considered in the equations
......
...@@ -113,7 +113,7 @@ Parameters ...@@ -113,7 +113,7 @@ Parameters
r_gnuTotalGen(grid, node, unit) "Total energy generation in gnu over the simulation (MWh)" r_gnuTotalGen(grid, node, unit) "Total energy generation in gnu over the simulation (MWh)"
r_gnuTotalGen_unittype(grid, node, unittype) "Energy generation for each unittype in each node (MWh)" r_gnuTotalGen_unittype(grid, node, unittype) "Energy generation for each unittype in each node (MWh)"
r_gnuTotalGenShare(grid, node, unit) "Total energy generation gnu/gn share" r_gnuTotalGenShare(grid, node, unit) "Total energy generation gnu/gn share"
r_gnGen(grid, node, f, t) "energy generation for each gridnode (MW)" r_gnGen(grid, node, f, t) "energy generation for each gridnode (MW)"
r_gnTotalGen(grid, node) "Total energy generation in gn over the simulation (MWh)" r_gnTotalGen(grid, node) "Total energy generation in gn over the simulation (MWh)"
r_gnTotalGenShare(grid, node) "Total energy generation gn/g share" r_gnTotalGenShare(grid, node) "Total energy generation gn/g share"
r_gTotalGen(grid) "Total energy generation in g over the simulation (MWh)" r_gTotalGen(grid) "Total energy generation in g over the simulation (MWh)"
...@@ -133,7 +133,7 @@ Parameters ...@@ -133,7 +133,7 @@ Parameters
* --- Emissions Results ------------------------------------------------------- * --- Emissions Results -------------------------------------------------------
// Unit level emissions from normal operation // Unit level emissions from normal operation inputs
r_emissions(grid, node, emission, unit, f, t) "Emissions from units (tCO2)" r_emissions(grid, node, emission, unit, f, t) "Emissions from units (tCO2)"
// Unit level emissions from outputs, not considered in the equations // Unit level emissions from outputs, not considered in the equations
......
...@@ -352,7 +352,7 @@ loop(m, ...@@ -352,7 +352,7 @@ loop(m,
* --- Emission Results -------------------------------------------------------- * --- Emission Results --------------------------------------------------------
// Emissions of units (not including start-up fuels) // Emissions of unit inputs (not including start-up fuels).
// Only taking into account emissions from input because emissions from output // Only taking into account emissions from input because emissions from output
// do not cause costs and are not considered in emission cap // do not cause costs and are not considered in emission cap
r_emissions(grid, node, emission, unit, ft_realizedNoReset(f,startp(t))) r_emissions(grid, node, emission, unit, ft_realizedNoReset(f,startp(t)))
...@@ -363,10 +363,10 @@ loop(m, ...@@ -363,10 +363,10 @@ loop(m,
/ 1e3 // NOTE!!! Conversion to t/MWh from kg/MWh in data / 1e3 // NOTE!!! Conversion to t/MWh from kg/MWh in data
; ;
// Emissions from unit outputs // Emissions from unit outputs. Negative value signifying emissions bound to product
r_emissionsFromOutput(grid, node, emission, unit, ft_realizedNoReset(f,startp(t))) r_emissionsFromOutput(grid, node, emission, unit, ft_realizedNoReset(f,startp(t)))
$gnu_output(grid, node, unit) $gnu_output(grid, node, unit)
= + p_stepLengthNoReset(m, f, t) = - p_stepLengthNoReset(m, f, t)
* r_gen(grid, node, unit, f, t) * r_gen(grid, node, unit, f, t)
* p_nEmission(node, emission) * p_nEmission(node, emission)
/ 1e3 // NOTE!!! Conversion to t/MWh from kg/MWh in data / 1e3 // NOTE!!! Conversion to t/MWh from kg/MWh in data
......
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