diff --git a/.github/workflows/run-ss3-with-est.yml b/.github/workflows/run-ss3-with-est.yml index e4b3e361..c3224e1d 100644 --- a/.github/workflows/run-ss3-with-est.yml +++ b/.github/workflows/run-ss3-with-est.yml @@ -25,7 +25,7 @@ concurrency: jobs: run-ss3-with-est: # if: ${{ github.event_name == 'workflow_dispatch' || (github.event.pull_request.draft == 'false'}} - runs-on: macos-latest + runs-on: ubuntu-latest env: R_REMOTES_NO_ERRORS_FROM_WARNINGS: true RSPM: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" @@ -39,8 +39,13 @@ jobs: with: repository: 'nmfs-ost/ss3-test-models' path: test-models-repo - - - name: Update Ubuntu packages + + - name: Install software-properties-common + run: | + sudo apt-get update + sudo apt-get install -y software-properties-common + + - name: Update and install other Ubuntu packages run: | sudo add-apt-repository ppa:ubuntu-toolchain-r/test sudo apt-get update diff --git a/SS_readcontrol_330.tpl b/SS_readcontrol_330.tpl index e63d24fa..52e3eaa2 100644 --- a/SS_readcontrol_330.tpl +++ b/SS_readcontrol_330.tpl @@ -368,12 +368,12 @@ k++; } } - if (j != Settle_age(settle_time)) - { - warnstream << "settle_month is less than spawn_month, so logical age at settlement calculated to be: " << j - << " for settle_time " << settle_time << ". Does not match read value of " << Settle_age(settle_time) << " are you sure? "; - write_message (NOTE, 0); - } +// if (j != Settle_age(settle_time)) +// { +// warnstream << "settle_month is less than spawn_month, so logical age at settlement calculated to be: " << j +// << " for settle_time " << settle_time << ". Does not match read value of " << Settle_age(settle_time) << " are you sure? "; +// write_message (NOTE, 0); +// } Settle_seas(settle_time) = k; Settle_seas_offset(settle_time) = Settle_seas(settle_time) - spawn_seas + j * nseas + Settle_age(settle_time) * nseas; // number of seasons between spawning and the season in which settlement occurs Settle_timing_seas(settle_time) -= temp; // timing from beginning of this season; needed for mortality calculation