streamline and clarify code for recruit to natage

Author: Rick-Methot-NOAA

SS_benchfore.tpl

@@ -2761,11 +2761,9 @@ FUNCTION void Get_Forecast()
                   //                  if(y==endyr+1) natage(t+Settle_seas_offset(settle),p,g,Settle_age(settle))=0.0;  //  to negate the additive code
                   natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) = Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g)) *
                       mfexp(natM(t, p, GP3(g), Settle_age(settle)) * Settle_timing_seas(settle));
-                      warning<<y << " " <<s<<" put recruits_here: "<<t + Settle_seas_offset(settle) << " " << natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle))<< endl;
 
                       if (Fcast_Loop1 == jloop && ABC_Loop == ABC_Loop_end)
                   {
-//                    if (Settle_seas(settle) == s)  // delete because logic is flawed
                       Recr(p, t + Settle_seas_offset(settle)) += Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g));
                   }
                   //  the adjustment for mortality increases recruit value for elapsed time since begin of season because M will then be applied from beginning of season
@@ -3406,7 +3404,6 @@ FUNCTION void Get_Forecast()
                       mfexp(natM(t, p, GP3(g), Settle_age(settle)) * Settle_timing_seas(settle));
                   if (Fcast_Loop1 == jloop && ABC_Loop == ABC_Loop_end)
                   {
-//                    if (Settle_seas(settle) == s)  // delete because logic is flawed
                       Recr(p, t + Settle_seas_offset(settle)) += Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g));
                   }
                 }

SS_popdyn.tpl

@@ -1080,13 +1080,11 @@ FUNCTION void get_time_series()
             settle = settle_g(g);
             for (p = 1; p <= pop; p++)
             {
-              if (y == styr)
-                natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) = 0.0; //  to negate the additive code
-              natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) +=
+              natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) =
                   Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g)) *
                   mfexp(natM(t, p, GP3(g), Settle_age(settle)) * Settle_timing_seas(settle));
-                Recr(p, t + Settle_seas_offset(settle)) += Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g));
-              //  the adjustment for mortality increases recruit value for elapsed time since begin of season because M will then be applied from beginning of season
+              //  the adjustment for mortality increases stored value for elapsed time since begin of season because M will then be applied from beginning of season
+              Recr(p, t + Settle_seas_offset(settle)) += Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g));
               if (docheckup == 1)
                 echoinput << y << " Recruits, dist, surv, result  " << Recruits << " " << recr_dist(y, GP(g), settle, p) << " " << mfexp(natM(t, p, GP3(g), Settle_age(settle)) * Settle_timing_seas(settle)) << " " << natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) << " M "<<natM(t, p, GP3(g), Settle_age(settle)) * Settle_timing_seas(settle)<<endl;
             }
@@ -1539,10 +1537,9 @@ FUNCTION void get_time_series()
             settle = settle_g(g);
             for (p = 1; p <= pop; p++)
             {
-              if (y == styr)
-                natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) = 0.0; //  to negate the additive code
-
-              natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) += Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g)) *
+//  previous code zero'ed out the natage then used += to add recruits to natage.
+//  that is unnecessary, because each p,g,settle_age is unique
+              natage(t + Settle_seas_offset(settle), p, g, Settle_age(settle)) = Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g)) *
                   mfexp(natM(t, p, GP3(g), Settle_age(settle)) * Settle_timing_seas(settle));
                 Recr(p, t + Settle_seas_offset(settle)) += Recruits * recr_dist(y, GP(g), settle, p) * platoon_distr(GP2(g));
               if (docheckup == 1)