From 0ab3e3621a0d4ba7a3e7e075574e0b791b9a8722 Mon Sep 17 00:00:00 2001 From: Rick-Methot-NOAA Date: Fri, 22 Aug 2025 13:33:47 -0700 Subject: [PATCH 1/3] remove settlement warning that can be misleading --- SS_readcontrol_330.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 From 01065a2a9ebc4bf7e42eb138d89243da2a997b4b Mon Sep 17 00:00:00 2001 From: Elizabeth Perl Date: Mon, 25 Aug 2025 11:41:05 -0400 Subject: [PATCH 2/3] Install software-properties-common in workflow --- .github/workflows/run-ss3-with-est.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-ss3-with-est.yml b/.github/workflows/run-ss3-with-est.yml index e4b3e361..948d3249 100644 --- a/.github/workflows/run-ss3-with-est.yml +++ b/.github/workflows/run-ss3-with-est.yml @@ -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 From 2946ec37e064254cf530dccfc9f694c8144e9c66 Mon Sep 17 00:00:00 2001 From: Elizabeth Perl Date: Mon, 25 Aug 2025 11:44:25 -0400 Subject: [PATCH 3/3] Change runner from macOS to Ubuntu for workflow --- .github/workflows/run-ss3-with-est.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-ss3-with-est.yml b/.github/workflows/run-ss3-with-est.yml index 948d3249..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"