Use scenarios with positive probability

Only use scenarios with positive probability in building the long-term
stochastic tree. Previously this was limited to the number of scenarios,
but this allows excluding a scenario (setting its prob. to zero).

inc/3b_periodicLoop.gms

@@ -288,7 +288,7 @@ $ifthen defined scenario
 loop((ms_initial(mSolve, s_), mf_central(mSolve, f)),
     s_active(s_) = yes;
     p_msProbability(mSolve, s_)$mSettings(mSolve, 'scenarios') = 1;
-    loop(scenario$(ord(scenario) <= mSettings(mSolve, 'scenarios')),
+    loop(scenario $p_scenProbability(scenario),
         s_scenario(s_, scenario) = yes;
         if(mSettings(mSolve, 'scenarios') > 1,
             loop(ft(f, t)$(ord(t) >= msEnd(mSolve, s_) + tSolveFirst),
@@ -338,7 +338,7 @@ fts(ft(f, t), s)$sft(s, f, t) = yes;
 * Build stochastic tree by definfing previous samples
 $ifthen defined scenario
 Option clear = s_prev;
-loop(scenario$(ord(scenario) <= mSettings(mSolve, 'scenarios')),
+loop(scenario $p_scenProbability(scenario),
     loop(s_scenario(s, scenario),
         if(not ms_initial(mSolve, s), ss(s, s_prev) = yes);
         Option clear = s_prev; s_prev(s) = yes;