Merge branch '#127_p_storageValue_circulation' into 'dev'

#127 `p_storageValue` separated into constant and timeseries `ts_storageValue` versions.

See merge request !8

inc/1a_definitions.gms

@@ -174,6 +174,7 @@ Sets
         ts_priceChange
         ts_price
         ts_unavailability
+        ts_storageValue
         /
 
 ; // END Sets
@@ -221,6 +222,7 @@ param_gn  "Possible parameters for grid, node" /
     boundStartToEnd  "Force the last states to equal the first state"
 *    forecastLength "Length of forecasts in use for the node (hours). After this, the node will use the central forecast."  // NOT IMPLEMENTED
     capacityMargin "Capacity margin used in invest mode (MW)"
+    storageValueUseTimeSeries "A flag to determine whether to use time series form `storageValue`"
 /
 
 param_gnBoundaryTypes "Types of boundaries that can be set for a node with a state variable" /

inc/1c_parameters.gms

@@ -47,6 +47,7 @@ Scalars
 Parameters
     p_gn(grid, node, param_gn) "Properties for energy nodes"
     p_gnBoundaryPropertiesForStates(grid, node, param_gnBoundaryTypes, param_gnBoundaryProperties) "Properties of different state boundaries and limits"
+    p_storageValue(grid, node) "Constant value of stored something at the end of a time step (EUR/<v_state_unit>)"
     p_gnn(grid, node, node, param_gnn) "Data for interconnections between energy nodes"
     p_gnu(grid, node, unit, param_gnu) "Unit data where energy type matters"
     p_gnu_io(grid, node, unit, input_output, param_gnu) "Unit data where energy type matters"
@@ -162,6 +163,7 @@ Parameters
     ts_cf(flow, node, f, t) "Available capacity factor time series (p.u.)"
     ts_reserveDemand(restype, up_down, group, f, t) "Reserve demand in region in the time step (MW)"
     ts_node(grid, node, param_gnBoundaryTypes, f, t) "Fix the states of a node according to time-series form exogenous input ([v_state])"
+    ts_storageValue(grid, node, f, t) "Timeseries value of stored something at the end of a time step (EUR/<v_state_unit>)"
     ts_priceChange(node, t) "Initial commodity price and consequent changes in commodity price (EUR/MWh)"
     ts_price(node, t) "Commodity price time series (EUR/MWh)"
     ts_unavailability(unit, t) "Unavailability of a unit in the time step (p.u.)"
@@ -171,6 +173,7 @@ Parameters
     ts_cf_(flow, node, s, f, t) "Mean available capacity factor time series (p.u.)"
     ts_reserveDemand_(restype, up_down, group, f, t) "Mean reserve demand in region in the time step (MW)"
     ts_node_(grid, node, param_gnBoundaryTypes, s, f, t) "Mean value of ts_node"
+    ts_storageValue_(grid, node, s, f, t) "Mean value of ts_storageValue"
     ts_vomCost_(grid, node, unit, t) "Calculated variable O&M cost that includes O&M cost, fuel cost and emission cost"
     ts_startupCost_(unit, starttype, t) "Calculated variable startup cost that includes startup cost, fuel cost and emission cost"
 
@@ -201,7 +204,6 @@ Parameters
 
 * --- Other time dependent parameters -----------------------------------------
 Parameters
-    p_storageValue(grid, node, t) "Value of stored something at the end of a time step"
     p_stepLength(mType, f, t) "Length of an interval in hours"
     p_stepLengthNoReset(mType, f, t) "Length of an interval in hours - includes also lengths of previously realized intervals"
     p_s_discountFactor(s) "Discount factor for samples when using a multi-year horizon"

inc/1e_inputs.gms

@@ -37,9 +37,9 @@ $ifthen exist '%input_dir%/inputData.gdx'
     $$loaddc p_gnu_io
     $$loaddc p_gnuBoundaryProperties
     $$loaddc p_unit
+	$$loaddc ts_unit
     $$loaddc p_unitConstraint
     $$loaddc p_unitConstraintNode
-    $$loaddc ts_unit
     $$loaddc restype
     $$loaddc restypeDirection
     $$loaddc restypeReleasedForRealization
@@ -66,6 +66,7 @@ $ifthen exist '%input_dir%/inputData.gdx'
     $$loaddc t_invest
     $$loaddc utAvailabilityLimits
     $$loaddc p_storageValue
+    $$loaddc ts_storageValue
     $$loaddc uGroup
     $$loaddc gnuGroup
     $$loaddc gn2nGroup

inc/1e_scenChanges.gms

@@ -206,6 +206,30 @@ $ifthen exist '%input_dir%/ts_unit3.gdx'
     $$gdxin
 $endif
 
+$ifthen exist '%input_dir%/p_unitConstraint2.gdx'
+    $$gdxin '%input_dir%/p_unitConstraint2.gdx'
+    $$loaddcm p_unitConstraint
+    $$gdxin
+$endif
+
+$ifthen exist '%input_dir%/p_unitConstraint3.gdx'
+    $$gdxin '%input_dir%/p_unitConstraint3.gdx'
+    $$loaddcm p_unitConstraint
+    $$gdxin
+$endif
+
+$ifthen exist '%input_dir%/p_unitConstraintNode2.gdx'
+    $$gdxin '%input_dir%/p_unitConstraintNode2.gdx'
+    $$loaddcm p_unitConstraintNode
+    $$gdxin
+$endif
+
+$ifthen exist '%input_dir%/p_unitConstraintNode3.gdx'
+    $$gdxin '%input_dir%/p_unitConstraintNode3.gdx'
+    $$loaddcm p_unitConstraintNode
+    $$gdxin
+$endif
+
 $ifthen exist '%input_dir%/restype2.gdx'
     $$gdxin '%input_dir%/restype2.gdx'
     $$loaddcm restype
@@ -386,30 +410,6 @@ $ifthen exist '%input_dir%/flowUnit3.gdx'
     $$gdxin
 $endif
 
-$ifthen exist '%input_dir%/p_unitConstraint2.gdx'
-    $$gdxin '%input_dir%/p_unitConstraint2.gdx'
-    $$loaddcm p_unitConstraint
-    $$gdxin
-$endif
-
-$ifthen exist '%input_dir%/p_unitConstraint3.gdx'
-    $$gdxin '%input_dir%/p_unitConstraint3.gdx'
-    $$loaddcm p_unitConstraint
-    $$gdxin
-$endif
-
-$ifthen exist '%input_dir%/p_unitConstraintNode2.gdx'
-    $$gdxin '%input_dir%/p_unitConstraintNode2.gdx'
-    $$loaddcm p_unitConstraintNode
-    $$gdxin
-$endif
-
-$ifthen exist '%input_dir%/p_unitConstraintNode3.gdx'
-    $$gdxin '%input_dir%/p_unitConstraintNode3.gdx'
-    $$loaddcm p_unitConstraintNode
-    $$gdxin
-$endif
-
 $ifthen exist '%input_dir%/emission2.gdx'
     $$gdxin '%input_dir%/emission2.gdx'
     $$loaddcm emission
@@ -530,6 +530,18 @@ $ifthen exist '%input_dir%/p_storageValue3.gdx'
     $$gdxin
 $endif
 
+$ifthen exist '%input_dir%/ts_storageValue2.gdx'
+    $$gdxin '%input_dir%/ts_storageValue2.gdx'
+    $$loaddcm ts_storageValue
+    $$gdxin
+$endif
+
+$ifthen exist '%input_dir%/ts_storageValue3.gdx'
+    $$gdxin '%input_dir%/ts_storageValue3.gdx'
+    $$loaddcm ts_storageValue
+    $$gdxin
+$endif
+
 $ifthen exist '%input_dir%/uGroup2.gdx'
     $$gdxin '%input_dir%/uGroup2.gdx'
     $$loaddcm uGroup

inc/2c_objective.gms

@@ -115,23 +115,25 @@ q_obj ..
 
     // Cost of energy storage change (note: not discounted)
     + sum(gn_state(grid, node),
-        + sum(mft_start(m, f, t)${  p_storageValue(grid, node, t)
-                                    and active(m, 'storageValue')
-                                    },
-            + p_storageValue(grid, node, t)
-                * sum(ms(m, s)${ p_msft_probability(m, s, f, t) },
-                    + p_msft_probability(m, s, f, t)
-                      * v_state(grid, node, s, f+df_central(f,t), t)
-                    ) // END sum(s)
+        + sum(mft_start(m, f, t)${ active(m, 'storageValue') },
+            + sum(ms(m, s)${ p_msft_probability(m, s, f, t) },
+                + [
+                    + p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+                    + ts_storageValue_(grid, node, s, f+df_central(f,t), t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
+                  ]
+                    * p_msft_probability(m, s, f, t)
+                    * v_state(grid, node, s, f+df_central(f,t), t)
+               ) // END sum(s)
             ) // END sum(mftStart)
-        - sum(mft_lastSteps(m, f, t)${  p_storageValue(grid, node, t)
-                                        and active(m, 'storageValue')
-                                        },
-            + p_storageValue(grid, node, t)
-                * sum(ms(m, s)${p_msft_probability(m, s, f, t)},
-                    + p_msft_probability(m, s, f, t)
-                      * v_state(grid, node, s, f+df_central(f,t), t)
-                    ) // END sum(s)
+        - sum(mft_lastSteps(m, f, t)${ active(m, 'storageValue') },
+            + sum(ms(m, s)${p_msft_probability(m, s, f, t)},
+                + [
+                    + p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+                    + ts_storageValue_(grid, node, s, f+df_central(f,t), t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
+                  ]
+                    * p_msft_probability(m, s, f, t)
+                    * v_state(grid, node, s, f+df_central(f,t), t)
+                ) // END sum(s)
             ) // END sum(mftLastSteps)
         ) // END sum(gn_state)
 

inc/3c_inputsLoop.gms

@@ -423,7 +423,19 @@ $offtext
         + sum((nu(node, unit), emission)$p_unitEmissionCost(unit, node, emission),
             + p_unStartup(unit, node, starttype) // MWh/start-up
               * p_unitEmissionCost(unit, node, emission) // CUR/MWh
-          ) // END sum(nu, emission)
+          ); // END sum(nu, emission)
+
+    // `storageValue`
+    ts_storageValue_(gn_state(grid, node), sft(s, f, tt_interval(t)))${ p_gn(grid, node, 'storageValueUseTimeSeries') }
+        = sum(tt_aggregate(t, t_),
+            ts_storageValue(grid, node,
+                f + (  df_realization(f, t)$(not gn_forecasts(grid, node, 'ts_storageValue'))
+                     + df_scenario(f, t)$gn_scenarios(grid, node, 'ts_storageValue')),
+                t_+ (+ dt_scenarioOffset(grid, node, 'ts_storageValue', s)
+                     + dt_circular(t_)$(not gn_scenarios(grid, node, 'ts_storageValue'))))
+            )
+            / mInterval(mSolve, 'stepsPerInterval', counter);
+
 ); // END loop(counter)
 
 

inc/4b_outputInvariant.gms

@@ -78,15 +78,21 @@ loop(m,
                 ); // END sum(slack)
 
     // Storage Value Change
-    r_gnStorageValueChange(gn_state(grid, node))${ sum(t_full(t), p_storageValue(grid, node, t)) }
+    r_gnStorageValueChange(gn_state(grid, node))${ active(m, 'storageValue') }
         = 1e-6
             * [
                 + sum(ft_realizedNoReset(f,t)${ ord(t) = mSettings(m, 't_end') + 1 },
-                    + p_storageValue(grid, node, t)
+                    + [
+                        + p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+                        + ts_storageValue(grid, node, f, t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
+                      ]
                         * r_state(grid, node, f, t)
                     ) // END sum(ft_realizedNoReset)
                 - sum(ft_realizedNoReset(f,t)${ ord(t) = mSettings(m, 't_start') + mSettings(m, 't_initializationPeriod') }, // INITIAL v_state NOW INCLUDED IN THE RESULTS
-                    + p_storageValue(grid, node, t)
+                    + [
+                        + p_storageValue(grid, node)${ not p_gn(grid, node, 'storageValueUseTimeSeries') }
+                        + ts_storageValue(grid, node, f, t)${ p_gn(grid, node, 'storageValueUseTimeSeries') }
+                      ]
                         * r_state(grid, node, f, t)
                     ) // END sum(ft_realizedNoReset)
                 ]; // END * 1e-6