Skip to content

Commit 369a23a

Browse files
Rick-Methot-NOAAe-perl-NOAA
Rick-Methot-NOAA
and
e-perl-NOAA
authored
revise recr_dist output to show both sexes (#612)
* revise recr_dist output to show both sexes * try r4ss branch fix * revert back to main branch of r4ss --------- Co-authored-by: Elizabeth Perl <elizabeth.gugliotti@noaa.gov>
1 parent 1168218 commit 369a23a

File tree

1 file changed

+43
-13
lines changed

1 file changed

+43
-13
lines changed

‎SS_write_report.tpl‎

Lines changed: 43 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,51 +1035,81 @@ FUNCTION void write_bigoutput()
10351035
{
10361036
SS2out << endl
10371037
<< pick_report_name(10) << endl;
1038-
SS2out << "Settle# settle_timing# G_pattern Area Settle_Month Seas Age Time_w/in_seas Frac/sex" << endl;
1038+
SS2out << "Settle# settle_timing# G_pattern Area Settle_Month Seas Age Time_w/in_seas recr_dist_F recr_dist_M" << endl;
10391039
for (settle = 1; settle <= N_settle_assignments; settle++)
10401040
{
10411041
gp = settlement_pattern_rd(settle, 1); // growth patterns
10421042
p = settlement_pattern_rd(settle, 3); // settlement area
10431043
settle_time = settle_assignments_timing(settle);
1044-
SS2out << settle << " " << settle_time << " " << gp << " " << p << " " << Settle_month(settle_time) << " " << Settle_seas(settle_time) << " " << Settle_age(settle_time) << " " << Settle_timing_seas(settle_time) << " " << recr_dist(styr, gp, settle_time, p) << endl;
1044+
SS2out << settle << " " << settle_time << " " << gp << " " << p << " " << Settle_month(settle_time) << " " << Settle_seas(settle_time) << " " << Settle_age(settle_time) << " " << Settle_timing_seas(settle_time) << " " << recr_dist(styr, gp, settle_time, p);
1045+
if (gender == 2) {SS2out << " " << recr_dist(styr, gp + N_GP, settle_time, p) << endl;} else {SS2out << " NA" << endl; }
10451046
}
10461047
SS2out << "#" << endl
10471048
<< "RECRUITMENT_DIST_Bmark" << endl
1048-
<< "Settle# settle_timing# G_pattern Area Settle_Month Seas Age Time_w/in_seas Frac/sex" << endl;
1049+
<< "Settle# settle_timing# G_pattern Area Settle_Month Seas Age Time_w/in_seas recr_dist_F recr_dist_M" << endl;
10491050
for (settle = 1; settle <= N_settle_assignments; settle++)
10501051
{
10511052
gp = settlement_pattern_rd(settle, 1); // growth patterns
10521053
p = settlement_pattern_rd(settle, 3); // settlement area
10531054
settle_time = settle_assignments_timing(settle);
1054-
SS2out << settle << " " << settle_time << " " << gp << " " << p << " " << Settle_month(settle_time) << " " << Settle_seas(settle_time) << " " << Settle_age(settle_time) << " " << Settle_timing_seas(settle_time) << " " << recr_dist_unf(gp, settle_time, p) / (Bmark_Yr(8) - Bmark_Yr(7) + 1) << endl;
1055+
SS2out << settle << " " << settle_time << " " << gp << " " << p << " " << Settle_month(settle_time) << " " << Settle_seas(settle_time) << " " << Settle_age(settle_time) << " " << Settle_timing_seas(settle_time) << " " << recr_dist_unf(gp, settle_time, p) / (Bmark_Yr(8) - Bmark_Yr(7) + 1);
1056+
if (gender == 2) {SS2out << " " << recr_dist_unf(gp + N_GP, settle_time, p) / (Bmark_Yr(8) - Bmark_Yr(7) + 1) << endl;} else {SS2out << " NA" << endl; }
10551057
}
10561058
SS2out << "#" << endl
10571059
<< "RECRUITMENT_DIST_endyr" << endl
1058-
<< "Settle# settle_timing# G_pattern Area Settle_Month Seas Age Time_w/in_seas Frac/sex" << endl;
1060+
<< "Settle# settle_timing# G_pattern Area Settle_Month Seas Age Time_w/in_seas recr_dist_F recr_dist_M" << endl;
10591061
for (settle = 1; settle <= N_settle_assignments; settle++)
10601062
{
10611063
gp = settlement_pattern_rd(settle, 1); // growth patterns
10621064
p = settlement_pattern_rd(settle, 3); // settlement area
10631065
settle_time = settle_assignments_timing(settle);
1064-
SS2out << settle << " " << settle_time << " " << gp << " " << p << " " << Settle_month(settle_time) << " " << Settle_seas(settle_time) << " " << Settle_age(settle_time) << " " << Settle_timing_seas(settle_time) << " " << recr_dist_endyr(gp, settle_time, p) << endl;
1065-
}
1066+
SS2out << settle << " " << settle_time << " " << gp << " " << p << " " << Settle_month(settle_time) << " " << Settle_seas(settle_time) << " " << Settle_age(settle_time) << " " << Settle_timing_seas(settle_time) << " " << recr_dist_endyr(gp, settle_time, p);
1067+
if (gender == 2) {SS2out << " " << recr_dist(endyr, gp + N_GP, settle_time, p) << endl;} else {SS2out << " NA" << endl; }
1068+
}
10661069

10671070
SS2out << "#" << endl;
1068-
SS2out << "RECRUITMENT_DIST_TIMESERIES" << endl
1069-
<< "Year settle_assignment" << endl;
1070-
SS2out << "Year ";
1071-
for (settle = 1; settle <= N_settle_assignments; settle++)
1072-
SS2out << settle << " ";
1071+
SS2out << "RECRUITMENT_DIST_TIMESERIES" << endl;
1072+
SS2out << "GP: ";
1073+
for (gp = 1; gp <= N_GP; gp++)
1074+
for (settle = 1; settle <= N_settle_timings; settle++)
1075+
for (p = 1; p <= pop; p++)
1076+
for (int sex = 1; sex <= gender; sex++)
1077+
if (recr_dist_pattern(gp, settle, p) == 1) SS2out << gp << " ";
1078+
SS2out << endl;
1079+
SS2out << "settle_timing: ";
1080+
for (gp = 1; gp <= N_GP; gp++)
1081+
for (settle = 1; settle <= N_settle_timings; settle++)
1082+
for (p = 1; p <= pop; p++)
1083+
for (int sex = 1; sex <= gender; sex++)
1084+
if (recr_dist_pattern(gp, settle, p) == 1) SS2out << settle << " ";
1085+
SS2out << endl;
1086+
SS2out << "area: ";
1087+
for (gp = 1; gp <= N_GP; gp++)
1088+
for (settle = 1; settle <= N_settle_timings; settle++)
1089+
for (p = 1; p <= pop; p++)
1090+
for (int sex = 1; sex <= gender; sex++)
1091+
if (recr_dist_pattern(gp, settle, p) == 1) SS2out << p << " ";
1092+
SS2out << endl;
1093+
SS2out << "sex: ";
1094+
for (gp = 1; gp <= N_GP; gp++)
1095+
for (settle = 1; settle <= N_settle_timings; settle++)
1096+
for (p = 1; p <= pop; p++)
1097+
for (int sex = 1; sex <= gender; sex++)
1098+
{if (recr_dist_pattern(gp, settle, p) == 1) SS2out << sex << " ";}
10731099
SS2out << endl;
10741100

1101+
SS2out << "Year recr_dist" << endl;
10751102
for (y = styr; y <= YrMax; y++)
10761103
{
10771104
SS2out << y << " ";
10781105
for (gp = 1; gp <= N_GP; gp++)
10791106
for (settle = 1; settle <= N_settle_timings; settle++)
10801107
for (p = 1; p <= pop; p++)
1108+
for (int sex = 1; sex <= gender; sex++)
10811109
if (recr_dist_pattern(gp, settle, p) == 1)
1082-
SS2out << " " << recr_dist(y, gp, settle, p);
1110+
{
1111+
SS2out << " " << recr_dist(y, gp + (sex -1) * N_GP, settle, p);
1112+
}
10831113
SS2out << endl;
10841114
}
10851115
}

0 commit comments

Comments
 (0)