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
1 change: 1 addition & 0 deletions .github/workflows/run-ss3-bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
sudo apt-get install --only-upgrade libstdc++6
sudo apt-get install -y libcurl4-openssl-dev
sudo apt-get install -y libfontconfig1-dev
sudo apt-get install -y libharfbuzz-dev libfribidi-dev

- name: Setup R
uses: r-lib/actions/setup-r@v2
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-r4ss-with-ss3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
sudo apt-get install --only-upgrade libstdc++6
sudo apt-get install -y libcurl4-openssl-dev
sudo apt-get install -y libfontconfig1-dev
sudo apt-get install -y libharfbuzz-dev libfribidi-dev

- name: Setup R
uses: r-lib/actions/setup-r@v2
Expand Down
4 changes: 2 additions & 2 deletions SS_benchfore.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ FUNCTION void setup_Benchmark() // and forecast
{
discmort2_a(y, f, gg) = tempvec_a / temp;
}
if (seltype(f + Nfleet, 2) > 0) // using age retention
if (seltype(f + Nfleet, 2) != 0) // using age retention
{
tempvec_a.initialize();
for (y = Fcast_Sel_yr1; y <= Fcast_Sel_yr2; y++)
Expand Down Expand Up @@ -470,7 +470,7 @@ FUNCTION void setup_Benchmark() // and forecast
tempvec_a += discmort2_a(y, f, gg);
}
discmort2_a(styr - 3, f, gg) = tempvec_a / temp;
if (seltype(f + Nfleet, 2) > 0) // using age retention
if (seltype(f + Nfleet, 2) != 0) // using age retention
{
tempvec_a.initialize();
for (y = Bmark_Yr(3); y <= Bmark_Yr(4); y++)
Expand Down
18 changes: 14 additions & 4 deletions SS_selex.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -1956,7 +1956,15 @@ FUNCTION void Make_FishSelex()
Wt_Age_t(tz, f, g) = Wt_Age_mid(s, g);
}
sel_num(s, f, g) = sel_a(yf, f, gg); // selected numbers
switch (seltype(f + Nfleet, 2)) // age-retention function
int j = seltype(f + Nfleet, 2);
int k = j;
if (j < 0) // invokes mirror
{
j = -j; // fleet number being mirrored for retention
k = seltype(j + Nfleet, 2); // discard approach for fleet j
// note that retain_a and discmort2_a have already been mirrored earlier in this fxn
}
switch (k) // age-retention function
{
case 0: // no discarding, so just copy the selected quantities
{
Expand All @@ -1981,6 +1989,7 @@ FUNCTION void Make_FishSelex()
sel_ret_num(s, f, g) = elem_prod(sel_num(s, f, g), retain_a(y, f, gg)); // retained numbers
sel_dead_bio(s, f, g) = elem_prod(Wt_Age_t(tz, f, g), discmort2_a(y, f, gg)); // dead wt
sel_dead_num(s, f, g) = discmort2_a(y, f, gg); // dead numbers
// if (y == styr) warning << f << " sel_ret " << sel_ret_bio(s, f, g) << endl << " sel_dead " << sel_dead_bio(s, f, g) << endl;
break;
}
case 3: // all selected fish are dead; use this for a discard only fleet
Expand All @@ -1992,10 +2001,11 @@ FUNCTION void Make_FishSelex()
break;
}
}
if (docheckup == 1 && y == styr)
if (docheckup == 1 && y == styr && do_once == 1)
{
echoinput << " sel_ret_bio " << sel_ret_bio(s, f, g) << endl
<< " sel_dead_bio " << sel_dead_bio(s, f, g) << endl;
echoinput << f << " sel_ret_bio " << sel_ret_bio(s, f, g) << endl
<< f << "retain_a " << retain_a(y, f, gg) << endl
<< f << " sel_dead_bio " << sel_dead_bio(s, f, g) << endl;
}
}

Expand Down
2 changes: 1 addition & 1 deletion SS_write_report.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -2924,7 +2924,7 @@ FUNCTION void write_bigoutput()
}
for (f = 1; f <= Nfleet; f++)
{
if (seltype(f + Nfleet, 2) > 0) // using age retention
if (seltype(f + Nfleet, 2) != 0) // using age retention
{
for (y = styr - 3; y <= YrMax; y++)
for (gg = 1; gg <= gender; gg++)
Expand Down
Loading