Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions SS_readcontrol_330.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2374,16 +2374,16 @@
// SS_Label_Info_4.6.4 #Setup recruitment deviations and create parm labels for each year
if (recdev_end > retro_yr)
{
warnstream << " recdev_end: " << recdev_end << " > retro_yr: " << retro_yr << " reset ";
warnstream << " last main recdev: " << recdev_end << " to retro_yr: " << retro_yr << " reset ";
write_message (ADJUST, 0);
recdev_end = retro_yr;
}
if (recdev_end < endyr && (Fcast_Loop_Control(3) == 3 || Fcast_Loop_Control(3) == 4))
{
warnstream << "Fcast recr option is 3 or 4 and recdev_end: " << recdev_end << " < endyr: " << endyr << " reset ";
write_message (ADJUST, 0);
recdev_end = endyr;
}
// if (recdev_end < endyr && (Fcast_Loop_Control(3) == 3 || Fcast_Loop_Control(3) == 4))
// {
// warnstream << "Fcast recr option is 3 or 4 and recdev_end: " << recdev_end << " < endyr: " << endyr << " reset ";
// write_message (ADJUST, 0);
// recdev_end = endyr;
// }
if (recdev_start < (styr - nages))
{
warnstream << " recdev_start: " << recdev_start << " < styr-nages: " << styr - nages << " reset ";
Expand Down Expand Up @@ -2459,7 +2459,13 @@
}
}
}


if (int(Fcast_Loop_Control(3)) >= 4 && Fcast_Rec_yr2 > recdev_end)
{
warnstream << " last year of averaging for mean forecast recr must be <= last main recdev" << Fcast_Rec_yr2 << " > " << recdev_end;
write_message(FATAL, 1);
}

if (Do_Forecast > 0)
{
if (do_recdev != 0) {
Expand Down
2 changes: 1 addition & 1 deletion SS_readdata_330.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4884,7 +4884,7 @@
warnstream << " Error, Fcast_Rec_Yr2 must be between styr and endyr";
write_message(FATAL, 1);
}

// note: one more check will occur after recdev_end is read
did_MSY = 0;
if (Do_Forecast > 0)
*(ad_comm::global_datafile) >> fif;
Expand Down
2 changes: 1 addition & 1 deletion SS_recruit.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ FUNCTION void apply_recdev(prevariable& NewRecruits, const prevariable& Recr_vir
}
}
// note that if user requests "mean" as base forecast recr, then devs are still applied
// so, phase for forecast recdevs must be <0 to assure that forecast recr do not get added variability
// so, phase for forecast recdevs must be <0 if user wants forecast recr do not get added variability
if (do_recdev > 0)
NewRecruits *= mfexp(Fcast_recruitments(y)); // recruitment deviation
}
Expand Down
Loading