Skip to content

Commit 2b370b7

Browse files
iantaylor-NOAARick-Methot-NOAA
authored andcommitted
revise switches for extra std inputs
- suggestion from #713 (review)
1 parent b592062 commit 2b370b7

1 file changed

Lines changed: 15 additions & 26 deletions

File tree

SS_readcontrol_330.tpl

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5585,24 +5585,21 @@
55855585
// clang-format on
55865586
Extra_Std_N = 0;
55875587
5588-
// don't read any extra std inputs
5589-
if (Do_More_Std == 0)
5590-
{
5591-
Do_Selex_Std = 0;
5592-
Selex_Std_AL = 1;
5593-
Selex_Std_Year = endyr;
5594-
Selex_Std_Cnt = 0;
5595-
Do_Growth_Std = 0;
5596-
Growth_Std_Cnt = 0;
5597-
Do_NatAge_Std = 0;
5598-
NatAge_Std_Cnt = 0;
5599-
NatAge_Std_Year = endyr;
5600-
Do_NatM_Std = 0;
5601-
NatM_Std_Cnt = 0;
5602-
Do_Dyn_Bzero = 0;
5603-
Do_se_smrybio = 0;
5604-
Do_se_LnSSB = 0;
5605-
}
5588+
// Itialize all switches for extra std inputs
5589+
Do_Selex_Std = 0;
5590+
Selex_Std_AL = 1;
5591+
Selex_Std_Year = endyr;
5592+
Selex_Std_Cnt = 0;
5593+
Do_Growth_Std = 0;
5594+
Growth_Std_Cnt = 0;
5595+
Do_NatAge_Std = 0;
5596+
NatAge_Std_Cnt = 0;
5597+
NatAge_Std_Year = endyr;
5598+
Do_NatM_Std = 0;
5599+
NatM_Std_Cnt = 0;
5600+
Do_Dyn_Bzero = 0;
5601+
Do_se_smrybio = 0;
5602+
Do_se_LnSSB = 0;
56065603
56075604
// read standard extra std inputs (only option prior to 3.30.15)
56085605
if (Do_More_Std > 0)
@@ -5636,14 +5633,6 @@
56365633
Do_Dyn_Bzero = More_Std_Input(12);
56375634
Do_se_smrybio = More_Std_Input(13);
56385635
}
5639-
else
5640-
{
5641-
// if Do_More_Std == 1, these options should be turned off
5642-
Do_NatM_Std = 0;
5643-
NatM_Std_Cnt = 0;
5644-
Do_Dyn_Bzero = 0;
5645-
Do_se_smrybio = 0;
5646-
}
56475636
// clang-format off
56485637
END_CALCS
56495638

0 commit comments

Comments
 (0)