diff --git a/.github/workflows/test-simple-with-ss3-artifacts.yml b/.github/workflows/test-simple-with-ss3-artifacts.yml index b4393e82..862800f2 100644 --- a/.github/workflows/test-simple-with-ss3-artifacts.yml +++ b/.github/workflows/test-simple-with-ss3-artifacts.yml @@ -107,7 +107,7 @@ jobs: fi - name: Archive Simple model output - uses: actions/upload-artifact@v5 + uses: actions/upload-artifact@v6 with: name: simple-model-output-${{ matrix.os }} path: ss3-test-models/models/Simple/ diff --git a/SS_benchfore.tpl b/SS_benchfore.tpl index 0b746046..a66eded9 100644 --- a/SS_benchfore.tpl +++ b/SS_benchfore.tpl @@ -2131,7 +2131,6 @@ FUNCTION void Get_Forecast() {HCR_anchor = SSB_unf;} else if (Fcast_Loop_Control(5) == 3) {HCR_anchor = Bmsy;} // so H4010_top_rd should be 1.0; - echoinput << "HCR_anchor " << Fcast_Loop_Control(5) << HCR_anchor << endl; if (H4010_top_rd < 0.0) // legacy approach. This has already been converted to new approach in readdata { diff --git a/SS_expval.tpl b/SS_expval.tpl index df6fb5eb..ef9184e7 100644 --- a/SS_expval.tpl +++ b/SS_expval.tpl @@ -704,7 +704,7 @@ FUNCTION void Get_expected_values(const int y, const int t); { case (1): // units are biomass, so accumulate body weight into the bins; Assume that bin demarcations are also in biomass { - if (SzFreq_Omit_Small(SzFreqMethod) == 1) + if (SzFreq_Omit_Small(SzFreqMethod) == 1) { while (wt_len_low(s, 1, z1 + 1) < SzFreq_bins(SzFreqMethod, 1) && z1 < z2) { @@ -776,6 +776,7 @@ FUNCTION void Get_expected_values(const int y, const int t); { if (SzFreq_scale(SzFreqMethod) <= 2) // bin demarcations are in weight units (1=kg, 2=lbs), so uses wt_len to compare to bins { + warning<<"process_szfreq"<=topbin, so incr ibin "< 1) { botbin = SzFreq_bins2(SzFreqMethod, ibin); + warning<<" incr botbin to "<= topbin) { + // this should have the fish in z size range distributed across all bins >= size(z) until get to overlap + warning<<" size > current bin, increment bin index "<= 3 && Grow_type <= 5) {