Skip to content

Commit f853067

Browse files
Merge pull request #521 from nmfs-stock-synthesis/format_forecast_report
fix MSY search output with >1 season
2 parents a771afe + c818a3f commit f853067

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

SS_benchfore.tpl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,8 +1462,9 @@ FUNCTION void Get_Benchmarks(const int show_MSY)
14621462
if (show_MSY == 1)
14631463
{
14641464
report5 << j << " " << Fmult << " " << equ_F_std << " " << MSY_SPR << " " << yld1(1) << " " << Bmsy << " " << Recr_msy << " " << Bmsy / SSB_unf << " "
1465-
<< dyld << " " << dyldp << " " << value(sum(equ_catch_fleet(3)) * Recr_msy);
1466-
report5 << value(equ_catch_fleet(3) * Recr_msy) << " " << Cost << " " << PricePerF * YPR_val_vec * Recr_msy << " " << Profit << " ";
1465+
<< dyld << " " << dyldp << " " << value(sum(equ_catch_fleet(3)) * Recr_msy) << " ";
1466+
report5 << " " << value(colsum(equ_catch_fleet(3)) * Recr_msy) << " " << Cost << " " << PricePerF * YPR_val_vec * Recr_msy << " " << Profit << " ";
1467+
// colsum above sums across seasons so reports annual catch for each fleet, including survey fleets
14671468
for (p = 1; p <= pop; p++)
14681469
for (gp = 1; gp <= N_GP; gp++)
14691470
{
@@ -1472,7 +1473,7 @@ FUNCTION void Get_Benchmarks(const int show_MSY)
14721473
for (int ff = 1; ff <= N_catchfleets(0); ff++)
14731474
{
14741475
f = fish_fleet_area(0, ff);
1475-
report5 << Hrate(f, bio_t_base + 1) << " ";
1476+
report5 << " " << Hrate(f, bio_t_base + 1) << " ";
14761477
}
14771478
report5 << endl;
14781479
}

0 commit comments

Comments
 (0)