age-based calc of sel_dead_num and bio is repaired

Rick-Methot-NOAA · Rick-Methot-NOAA · commit a26ea630d749 · 2025-04-01T12:11:45.000-07:00
diff --git a/SS_selex.tpl b/SS_selex.tpl
@@ -1973,10 +1973,11 @@ FUNCTION void Make_FishSelex()
           }
           case 2:
           {
+            // details of retention and mortality already taken into account with calc of discmort2_a
             sel_ret_bio(s, f, g) = elem_prod(sel_bio(s, f, g), retain_a(y, f, gg)); //  retained wt-at-age
             sel_ret_num(s, f, g) = elem_prod(sel_num(s, f, g), retain_a(y, f, gg)); //  retained numbers
-            sel_dead_bio(s, f, g) = elem_prod(sel_ret_bio(s, f, g), discmort_a(y, f, gg)); //  dead wt
-            sel_dead_num(s, f, g) = elem_prod(sel_ret_num(s, f, g), discmort_a(y, f, gg)); //  dead numbers
+            sel_dead_bio(s, f, g) = elem_prod(Wt_Age_t(tz, f, g), discmort2_a(y, f, gg)); //  dead wt
+            sel_dead_num(s, f, g) = discmort2_a(y, f, gg); //  dead numbers
             break;
           }
           case 3: //  all selected fish are dead
@@ -1988,6 +1989,11 @@ FUNCTION void Make_FishSelex()
             break;
           }
         }
+        if (docheckup == 1 && y == styr)
+        {
+          echoinput << " sel_ret_bio " << sel_ret_bio(s, f, g) << endl
+                    << " sel_dead_bio " << sel_dead_bio(s, f, g) << endl;
+        }
       }
 
       else //  size_selectivity and possible size retention

Original file line number	Diff line number	Diff line change
`@@ -1973,10 +1973,11 @@ FUNCTION void Make_FishSelex()`
`1973`	`1973`	`}`
`1974`	`1974`	`case 2:`
`1975`	`1975`	`{`
	`1976`	`+ // details of retention and mortality already taken into account with calc of discmort2_a`
`1976`	`1977`	`sel_ret_bio(s, f, g) = elem_prod(sel_bio(s, f, g), retain_a(y, f, gg)); // retained wt-at-age`
`1977`	`1978`	`sel_ret_num(s, f, g) = elem_prod(sel_num(s, f, g), retain_a(y, f, gg)); // retained numbers`
`1978`		`- sel_dead_bio(s, f, g) = elem_prod(sel_ret_bio(s, f, g), discmort_a(y, f, gg)); // dead wt`
`1979`		`- sel_dead_num(s, f, g) = elem_prod(sel_ret_num(s, f, g), discmort_a(y, f, gg)); // dead numbers`
	`1979`	`+ sel_dead_bio(s, f, g) = elem_prod(Wt_Age_t(tz, f, g), discmort2_a(y, f, gg)); // dead wt`
	`1980`	`+ sel_dead_num(s, f, g) = discmort2_a(y, f, gg); // dead numbers`
`1980`	`1981`	`break;`
`1981`	`1982`	`}`
`1982`	`1983`	`case 3: // all selected fish are dead`
`@@ -1988,6 +1989,11 @@ FUNCTION void Make_FishSelex()`
`1988`	`1989`	`break;`
`1989`	`1990`	`}`
`1990`	`1991`	`}`
	`1992`	`+ if (docheckup == 1 && y == styr)`
	`1993`	`+ {`
	`1994`	`+ echoinput << " sel_ret_bio " << sel_ret_bio(s, f, g) << endl`
	`1995`	`+ << " sel_dead_bio " << sel_dead_bio(s, f, g) << endl;`
	`1996`	`+ }`
`1991`	`1997`	`}`
`1992`	`1998`
`1993`	`1999`	`else // size_selectivity and possible size retention`