Skip to content

Commit 9753686

Browse files
improve Fdetail info in ssnew for Fmethod 4
1 parent 3f26fa7 commit 9753686

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

SS_readcontrol_330.tpl

+1-1
Original file line numberDiff line numberDiff line change
@@ -2663,7 +2663,7 @@
26632663
echoinput << "hybrid tuning loops as read: " << F_Tune << endl;
26642664
if (ender == -9998) // flag to trigger reading F_detail for f x t specific F values
26652665
{
2666-
echoinput << "# now read List of fleet-time specific F related values to read; enter -Yr to fill remaining years&seasons; -999 for phase or catch_se keeps base value for the run" << endl;
2666+
echoinput << "# now read List of fleet-time specific F related values to read; enter -Yr to fill remaining years&seasons; -999 for phase or catch_se keeps base value for the run; end that list with -1 for fleet" << endl;
26672667
echoinput << "#Fleet Yr Seas F_value catch_se phase" << endl;
26682668
26692669
dvector tempvec(1, 6);

SS_write_ssnew.tpl

+5-4
Original file line numberDiff line numberDiff line change
@@ -2327,7 +2327,8 @@ FUNCTION void write_nucontrol()
23272327
report4 << "# Read list of fleets that do F as parameter; unlisted fleets stay hybrid, bycatch fleets must be included with start_PH=1, high F fleets should switch early" << endl;
23282328
report4 << "# (A) fleet;" << endl <<"# (B) F_starting_value (ignored if start_PH=1 or reading from ss3.par);" <<
23292329
endl << "# (C) start_PH for fleet's Fparms (99 to stay in hybrid, <0 to stay at starting value)" << endl <<
2330-
"# Terminate list with -9999 for fleet (use -9998 to read fleet-time specific F values after reading N hybrid tune loops)" << endl;
2330+
"# Terminate list with -9999 for fleet" << endl <<
2331+
"# or terminate with -9998 to invoke reading fleet-time specific F values after first reading N hybrid tune loops)" << endl;
23312332
report4 << "# (A) (B) (C)" << endl;
23322333
for (unsigned j = 1; j <= F_Method_4_input.size() - 2; j++)
23332334
{
@@ -2337,14 +2338,14 @@ FUNCTION void write_nucontrol()
23372338
{report4 << -9999 << " 1 1 # end of list" << endl <<
23382339
"#F_detail template: fleet year seas F_value catch_se phase" << endl; }
23392340
else
2340-
{report4 << -9998 << " 1 1 # end of list, trigger reading F_detail" << endl; }
2341+
{report4 << -9998 << " 1 1 # end of list, triggers reading F_detail" << endl; }
23412342
report4 << F_Tune << " #_number of loops for hybrid tuning; 4 precise; 3 faster; 2 enough if switching to parms is enabled" << endl;
23422343
if (F_detail > 0)
23432344
{
2344-
report4 << " # F_detail: List of fleet-time specific F related values to read; enter -Yr to fill remaining years&seasons; -999 for phase or catch_se keeps base value for the run" << endl;
2345+
report4 << "# F_detail: List of fleet-time specific F related values to read; enter -Yr to fill remaining years&seasons; -999 for phase or catch_se keeps base value for the run" << endl;
23452346
report4 << "#fleet year seas F_value catch_se phase" << endl;
23462347
report4 << F_setup2 << endl;
2347-
report4 << "-9999 1 1 1 1 1 # end of F_detail: time-specific F inputs " << endl;
2348+
report4 << "-9999 1 1 1 1 1 # end of F_detail" << endl;
23482349
}
23492350
}
23502351

0 commit comments

Comments
 (0)