Commit 25f8dac3 authored by Tomi J. Lindroos's avatar Tomi J. Lindroos
Browse files

updating name gnnTransferMarginalValue -> gnnTransferValue

parent cffda525
......@@ -41,8 +41,8 @@ r_gnTotalStateSlackCost
r_gnStorageValueChange
r_gnnVariableTransCost
r_gnnTotalVariableTransCost
r_gnnTransferMarginalValue
r_gnnTotalTransferMarginalValue
r_gnnTransferValue
r_gnnTotalTransferValue
// Investment and Fixed Operation and Maintenance Cost Components
r_gnuFOMCost
......
......@@ -41,8 +41,8 @@ Parameters
r_gnStorageValueChange(grid, node) "Change in storage values over the simulation (MEUR)"
r_gnnVariableTransCost(grid, node_,node, f, t) "Variable Transfer costs (MEUR)"
r_gnnTotalVariableTransCost(grid, node_, node) "Total Variable Transfer costs over the simulation (MEUR)"
r_gnnTransferMarginalValue(grid, from_node, to_node, f, t) "Transfer marginal value (Me) = r_transfer (MW) * r_balanceMarginal (e/MWh)"
r_gnnTotalTransferMarginalValue(grid, from_node, to_node) "Total ransfer marginal value summed over the simulation (Me)"
r_gnnTransferValue(grid, from_node, to_node, f, t) "Transfer marginal value (Me) = r_transfer (MW) * r_balanceMarginal (e/MWh)"
r_gnnTotalTransferValue(grid, from_node, to_node) "Total ransfer marginal value summed over the simulation (Me)"
// Investment and Fixed Operation and Maintenance Cost Components
r_gnuFOMCost(grid, node, unit) "Total gnu fixed O&M costs over the simulation (MEUR)"
......
......@@ -79,7 +79,7 @@ loop(m,
* r_transferRightward(grid, node_, node, f, t)];
// Transfer marginal value (Me) calculated from r_transfer * balanceMarginal * transferLosses
r_gnnTransferMarginalValue(gn2n_directional(grid, node_, node), ft_realizedNoReset(f,startp(t)))
r_gnnTransferValue(gn2n_directional(grid, node_, node), ft_realizedNoReset(f,startp(t)))
= p_stepLengthNoReset(m, f, t)
* [ r_transferRightward(grid, node_, node, f, t)
* r_balanceMarginal(grid, node, f, t)
......@@ -137,9 +137,9 @@ loop(m,
);
// Total transfer marginal value over the simulation
r_gnnTotalTransferMarginalValue(gn2n_directional(grid, node_, node))
r_gnnTotalTransferValue(gn2n_directional(grid, node_, node))
= sum(ft_realizedNoReset(f,startp(t)),
+ r_gnnTransferMarginalValue(grid, node_, node, f, t)
+ r_gnnTransferValue(grid, node_, node, f, t)
* sum(msft_realizedNoReset(m, s, f, t), p_msProbability(m, s) * p_msWeight(m, s) * p_s_discountFactor(s))
)
;
......
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