From 963d89825e8470bb8ba8fab0e6dc8e8782f6050d Mon Sep 17 00:00:00 2001
From: Richard Methot <richard.methot@noaa.gov>
Date: Fri, 8 Aug 2025 20:04:14 -0700
Subject: [PATCH 1/2] remove unneeded natatage()=0

---
 SS_benchfore.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/SS_benchfore.tpl b/SS_benchfore.tpl
index 80b25c3e..67b0c707 100644
--- a/SS_benchfore.tpl
+++ b/SS_benchfore.tpl
@@ -2676,7 +2676,6 @@ FUNCTION void Get_Forecast()
                   //                SSB_pop_gp(y,p,GP4(g)) += fec(g)*elem_prod(natage(t,p,g),mfexp(-Z_rate(t,p,g)*spawn_time_seas));   // accumulates SSB by area and by growthpattern
                   //                SSB_B_yr(y) += make_mature_bio(GP4(g))*elem_prod(natage(t,p,g),mfexp(-Z_rate(t,p,g)*spawn_time_seas));
                   //                SSB_N_yr(y) += make_mature_numbers(GP4(g))*elem_prod(natage(t,p,g),mfexp(-Z_rate(t,p,g)*spawn_time_seas));
-                  natage(t, p, g, 0) = 0.0; // these fish should not exist at beginning of year.  They are created after spawning.  Are here in array only due to Fcast_Loop1
                   SSB_pop_gp(y, p, GP4(g)) += fracfemale_mult * fec(g) * natage(t, p, g); // accumulates SSB by area and by growthpattern
                   SSB_B_yr(y) += fracfemale_mult * make_mature_bio(GP4(g)) * natage(t, p, g);
                   SSB_N_yr(y) += fracfemale_mult * make_mature_numbers(GP4(g)) * natage(t, p, g);
@@ -2762,7 +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));
-                  if (Fcast_Loop1 == jloop && ABC_Loop == ABC_Loop_end)
+                      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));
@@ -3691,7 +3692,6 @@ FUNCTION void Get_Forecast()
             //            report5<<" numbers "<<natage(t,p,g)<<"  Zrate "<<Z_rate(t,p,g);
             report5 << endl;
           }
-
         } //  end loop of seasons
 
         if (ABC_Loop == 2) //  apply caps and store catches to allow calc of adjusted F to match this catch when doing ABC_loop=3, and then when doing Fcast_loop1=3

From ebb2980697359a8d37db1f12a7ec3ad8efcb3c19 Mon Sep 17 00:00:00 2001
From: Richard Methot <richard.methot@noaa.gov>
Date: Mon, 11 Aug 2025 15:33:29 -0700
Subject: [PATCH 2/2] streamline and clarify code for recruit to natage

---
 SS_benchfore.tpl |  3 ---
 SS_popdyn.tpl    | 15 ++++++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/SS_benchfore.tpl b/SS_benchfore.tpl
index 67b0c707..0044edd3 100644
--- a/SS_benchfore.tpl
+++ b/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));
                   }
                 }
diff --git a/SS_popdyn.tpl b/SS_popdyn.tpl
index 90e8cf2e..3a65b37b 100644
--- a/SS_popdyn.tpl
+++ b/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)