diff --git a/SS_param.tpl b/SS_param.tpl index d8ff05f9..00a97dbd 100644 --- a/SS_param.tpl +++ b/SS_param.tpl @@ -533,6 +533,7 @@ PARAMETER_SECTION 4darray sel_dead_bio(1,nseas,1,Nfleet,1,gmorph,0,nages); // sel * (retain + (1-retain)*discmort) * wt 4darray save_sel_num(styr-3*nseas,TimeMax_Fcast_std+nseas,1,Nfleet,1,gmorph,0,nages) // save sel_num (Asel_2) and save fecundity for output; +nseas covers no forecast setups + 4darray save_F_dead(styr-3*nseas,TimeMax_Fcast_std+nseas,1,Nfleet,1,gmorph,0,nages) // save sel_num (Asel_2) and save fecundity for output; +nseas covers no forecast setups 4darray Sel_for_tag(TG_timestart*Do_TG,TimeMax*Do_TG,1,Nfleet,1,gmorph*Do_TG,0,nages) vector TG_report(1,Nfleet*Do_TG); diff --git a/SS_selex.tpl b/SS_selex.tpl index 1806d646..9141ee67 100644 --- a/SS_selex.tpl +++ b/SS_selex.tpl @@ -2053,7 +2053,7 @@ FUNCTION void Make_FishSelex() << " " << f << " " << Wt_Age_t(tz, f, g) << " #wt_flt_" << f << endl; } } // end need to do it - save_sel_num(t, f, g) = sel_num(s, f, g); // save sel_num in save_fecundity array for output - + save_sel_num(t, f, g) = sel_num(s, f, g); // save sel_num for output in age_selex report + save_F_dead(t, f, g) = sel_dead_num(s, f, g); // save for output } // end fleet loop for mortality, retention } // end Make_FishSelex diff --git a/SS_write_report.tpl b/SS_write_report.tpl index d706a7dc..a56371b5 100644 --- a/SS_write_report.tpl +++ b/SS_write_report.tpl @@ -3096,6 +3096,7 @@ FUNCTION void write_bigoutput() SS2out << "Asel_is_age_selectivity_alone" << endl; SS2out << "Asel2_is_Asel*(selL*size_at_age(ALK)); Q and F parameters may appear higher than expected because Asel2 may have max < 1.0; " << endl; SS2out << "Aret_is_age_retention" << endl; + SS2out << "F_is_F*Asel2;_Fdead_is_F*sel_dead_so_matches_the_mortality_calculations" << endl; SS2out << "COMBINED_ALK*selL*selA*wtlen*ret*discmort_in_makefishsel_yr: " << makefishsel_yr << " With_MeanSel_From: " << Fcast_Sel_yr1 << " - " << Fcast_Sel_yr2; // SS_Label_380 SS2out << "; Year_styr-3_(" << styr - 3 << ")_stores_average_used_for_benchmark" << endl; @@ -3164,6 +3165,7 @@ FUNCTION void write_bigoutput() if (fleet_type(f) <= 2) SS2out << "F " << f << " " << y << " " << s << " " << sx(g) << " " << g << " " << y << "_" << f << "_F" << Hrate(f, t) * save_sel_num(t, f, g) << endl; + SS2out << "Fdead " << f << " " << y << " " << s << " " << sx(g) << " " << g << " " << y << "_" << f << "_Fdead" << Hrate(f, t) * save_F_dead(t, f, g) << endl; SS2out << "bodywt " << f << " " << y << " " << s << " " << sx(g) << " " << g << " " << y << "_" << f << "_bodywt" << Wt_Age_t(t, f, g) << endl; } }