Skip to content

fix for one year models #722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rick-Methot-NOAA merged 1 commit into from
Sep 9, 2025
Merged

fix for one year models #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions SS_objfunc.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,25 +1191,25 @@ FUNCTION void Process_STDquant()
case 1:
{
depletion /= (depletion_level * SSB_virgin);
Mgmt_quant(19) = SSB_virgin;
if (Do_Benchmark > 0 ) Mgmt_quant(19) = SSB_virgin;
break;
}
case 2:
{
depletion /= (depletion_level * Bmsy);
Mgmt_quant(19) = Bmsy;
if (Do_Benchmark > 0 ) Mgmt_quant(19) = Bmsy;
break;
}
case 3:
{
depletion /= (depletion_level * SSB_yr(styr));
Mgmt_quant(19) = SSB_yr(styr);
if (Do_Benchmark > 0 ) Mgmt_quant(19) = SSB_yr(styr);
break;
}
case 4:
{
depletion /= (depletion_level * SSB_yr(endyr));
Mgmt_quant(19) = SSB_yr(endyr);
if (Do_Benchmark > 0 ) Mgmt_quant(19) = SSB_yr(endyr);
break;
}
case 5: // dynamic Bzero
Expand All @@ -1221,13 +1221,13 @@ FUNCTION void Process_STDquant()
depletion(STD_Yr_Reverse_Dep(y)) /= ( depletion_level * Extra_Std(Do_Dyn_Bzero + y - (styr - 2)));
// warning<<depletion(STD_Yr_Reverse_Dep(y))<<endl;
}
Mgmt_quant(19) = 1.;
if (Do_Benchmark > 0 ) Mgmt_quant(19) = 1.;
break;
}
case 6: // depletion based on benchmark unfished SSB
{
depletion /= (depletion_level * SSB0_4_SRR);
Mgmt_quant(19) = SSB0_4_SRR;
if (Do_Benchmark > 0 ) Mgmt_quant(19) = SSB0_4_SRR;
break;
}
}
Expand Down Expand Up @@ -1438,7 +1438,7 @@ FUNCTION void Process_STDquant()
}
}
}
}
}
}

//********************************************************************
Expand Down
4 changes: 3 additions & 1 deletion SS_popdyn.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ FUNCTION void get_initial_conditions()
Make_AgeLength_Key(s, subseas);
}
}

if ( endyr > styr )
{
// SS_Label_Info_16.2.4.3 #propagate Ave_Size from early years forward until first year that has time-vary growth
k = styr + 1;
do
Expand All @@ -147,6 +148,7 @@ FUNCTION void get_initial_conditions()
t = styr + (k - styr) * nseas;
Ave_Size(t, 1) = Ave_Size(t - nseas, 1); // prep for time-vary next yr
}
}
}
if (MG_active(3) > 0)
get_wtlen(); // stores values for all seasons
Expand Down
3 changes: 2 additions & 1 deletion SS_readcontrol_330.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1615,8 +1615,9 @@
mgp_type(Ip, Ip + N_growparms - 1) = 2; // growth parms

// check on out of bound Lmin values. Only check females because males can be offset from females
// allow for AFIX < 0 because those models are inputting the age at L=0, which must be negative

if ( gp == 1 && WTage_rd == 0)
if ( gp == 1 && WTage_rd == 0 && AFIX >= 0.0)
{
if (MGparm_1(Ip,1) < len_bins(1))
{
Expand Down
Loading