Clear data from removed samples

Also minor edits to smoothing calculation

inc/3c_periodicLoop.gms

@@ -466,7 +466,7 @@ if(active(mSolve, 'scenred'),
     $$include 'inc/scenred.gms'
 );
 
-* --- Smooting of stochastic sceanrios  ---------------------------------------
+* --- Smooting of stochastic scenarios ----------------------------------------
 $ontext
 First calculate standard deviation for over all samples, then smoothen the scenarios
 following the methodology presented in [1, p. 443]. This avoids a discontinuity
@@ -491,9 +491,9 @@ loop(gn(grid, node)$p_autocorrelation(grid, node, 'ts_influx'),
 
     // Do smoothing
     loop(mst_end(ms_initial(mSolve, s_), t_),
-        ts_influx_(grid, node, ft(f, t), s)$(ts_influx_std(grid, node, f, t_+dt_circular(t_))
-                                             and sft(s, f, t)
-                                             and not ms_initial(mSolve, s))
+        ts_influx_(grid, node, f, t, s)$(ts_influx_std(grid, node, f, t_+dt_circular(t_))
+                                         and sft(s, f, t)
+                                         and not ms_initial(mSolve, s))
             = min(p_tsMaxValue(node, 'ts_influx'), max(p_tsMinValue(node, 'ts_influx'),
               ts_influx_(grid, node, f, t, s)
               + (ts_influx_(grid, node, f, t_, s_)
@@ -519,9 +519,9 @@ loop(flowNode(flow, node)$p_autocorrelation(flow, node, 'ts_cf'),
 
     // Do smoothing
     loop(mst_end(ms_initial(mSolve, s_), t_),
-        ts_cf_(flow, node, ft(f, t), s)$(ts_cf_std(flow, node, f, t_+dt_circular(t_))
-                                         and sft(s, f, t)
-                                         and not ms_initial(mSolve, s))
+        ts_cf_(flow, node, f, t, s)$(ts_cf_std(flow, node, f, t_+dt_circular(t_))
+                                     and sft(s, f, t)
+                                     and not ms_initial(mSolve, s))
             = min(p_tsMaxValue(node, 'ts_cf'), max(p_tsMinValue(node, 'ts_cf'),
               ts_cf_(flow, node, f, t, s)
               + (ts_cf_(flow, node, f, t_, s_)

inc/scenred.gms

@@ -34,6 +34,11 @@ s_active(s) = p_sProbability(s);
 msft(mSolve, s, f, t)$msft(mSolve, s, f, t) = s_active(s);
 sft(s, f, t)$sft(s, f, t) = s_active(s);
 
+* Clear data from removed samples
+ts_influx_(gn, ft, s)$(not s_active(s)) = 0;
+ts_cf_(flowNode, ft, s)$(not s_active(s)) = 0;
+
+
 else
     put log "!!! No scenario reduction setting given, skipping scenario reduction!"/;
 );