From f010da8096f0ecc457652422a622fd9eaad79b68 Mon Sep 17 00:00:00 2001 From: Doug Latornell Date: Sun, 19 May 2024 12:42:24 -0700 Subject: [PATCH] Update paths for oxygen hindcast runs The paths for storing and accessing Tall & Susan's oxygen hindcast files have been updated across multiple files. This includes changes in the configuration file, and test files. --- config/nowcast.yaml | 8 ++++---- tests/workers/test_archive_tarball.py | 2 +- tests/workers/test_download_results.py | 4 ++-- tests/workers/test_run_NEMO_hindcast.py | 2 +- tests/workers/test_split_results.py | 2 +- tests/workers/test_watch_NEMO_hindcast.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/config/nowcast.yaml b/config/nowcast.yaml index b47d9faf..b1b772d5 100644 --- a/config/nowcast.yaml +++ b/config/nowcast.yaml @@ -400,11 +400,11 @@ results archive: nowcast-green: /results2/SalishSea/nowcast-green.202111/ nowcast-agrif: /results/SalishSea/nowcast-agrif.201702/ hindcast: - localhost: /ocean/sallen/timbucktwo/rivers/ + localhost: /ocean/sallen/timbucktwo/oxygen/ robot.graham: /nearline/rrg-allen/SalishSea/nowcast-green.202111/ -# Config for archival storage of month-long tarballs of results +# Config for archival storage for month-long tarballs of results # on a remote host; e.g. graham:/nearline/ results tarballs: # Should hindcast results be archived? @@ -744,7 +744,7 @@ run: # Comma separated list of compute host user ids to use in queue and accounting queries users: sallen,dlatorne # Directory on compute host where temporary run directories and run results are stored - scratch dir: /scratch/sallen/dlatorne/rivers/ + scratch dir: /scratch/sallen/dlatorne/oxygen/ # Directory on compute host where files (e.g. namelist.time) necessary to prepare # the NEMO runs are stored run prep dir: /home/sallen/dlatorne/SalishSeaCast/hindcast-sys/runs @@ -764,7 +764,7 @@ run: run types: hindcast: # Directory on compute host where results are stored - results: /scratch/sallen/dlatorne/rivers/ + results: /scratch/sallen/dlatorne/oxygen/ sockeye-hindcast: ssh key: SalishSeaNEMO-nowcast_id_rsa diff --git a/tests/workers/test_archive_tarball.py b/tests/workers/test_archive_tarball.py index 4e7e2561..df716150 100644 --- a/tests/workers/test_archive_tarball.py +++ b/tests/workers/test_archive_tarball.py @@ -143,7 +143,7 @@ def test_results_archive(self, run_type, results_path, prod_config): assert prod_config["results archive"][run_type] == results_path def test_hindcast_results_archive(self, prod_config): - expected = "/ocean/sallen/timbucktwo/rivers/" + expected = "/ocean/sallen/timbucktwo/oxygen/" assert prod_config["results archive"]["hindcast"]["localhost"] == expected @pytest.mark.parametrize( diff --git a/tests/workers/test_download_results.py b/tests/workers/test_download_results.py index 659021c7..78912722 100644 --- a/tests/workers/test_download_results.py +++ b/tests/workers/test_download_results.py @@ -232,7 +232,7 @@ def test_enabled_host_run_types(self, host, run_types, prod_config): "hindcast hosts", "optimum-hindcast", "hindcast", - "/scratch/sallen/dlatorne/rivers/", + "/scratch/sallen/dlatorne/oxygen/", ), ( "hindcast hosts", @@ -259,7 +259,7 @@ def test_results_archive(self, prod_config): "nowcast-green": "/results2/SalishSea/nowcast-green.202111/", "nowcast-agrif": "/results/SalishSea/nowcast-agrif.201702/", "hindcast": { - "localhost": "/ocean/sallen/timbucktwo/rivers/", + "localhost": "/ocean/sallen/timbucktwo/oxygen/", "robot.graham": "/nearline/rrg-allen/SalishSea/nowcast-green.202111/", }, } diff --git a/tests/workers/test_run_NEMO_hindcast.py b/tests/workers/test_run_NEMO_hindcast.py index 7d3167b9..23446f10 100644 --- a/tests/workers/test_run_NEMO_hindcast.py +++ b/tests/workers/test_run_NEMO_hindcast.py @@ -151,7 +151,7 @@ def test_optimum_hindcast_section(self, prod_config): assert optimum_hindcast["ssh key"] == "SalishSeaNEMO-nowcast_id_rsa" assert optimum_hindcast["queue info cmd"] == "/usr/bin/qstat" assert optimum_hindcast["users"] == "sallen,dlatorne" - assert optimum_hindcast["scratch dir"] == "/scratch/sallen/dlatorne/rivers/" + assert optimum_hindcast["scratch dir"] == "/scratch/sallen/dlatorne/oxygen/" assert ( optimum_hindcast["run prep dir"] == "/home/sallen/dlatorne/SalishSeaCast/hindcast-sys/runs" diff --git a/tests/workers/test_split_results.py b/tests/workers/test_split_results.py index 296876c8..e233ee64 100644 --- a/tests/workers/test_split_results.py +++ b/tests/workers/test_split_results.py @@ -105,7 +105,7 @@ def test_results_archive(self, prod_config): "nowcast-green": "/results2/SalishSea/nowcast-green.202111/", "nowcast-agrif": "/results/SalishSea/nowcast-agrif.201702/", "hindcast": { - "localhost": "/ocean/sallen/timbucktwo/rivers/", + "localhost": "/ocean/sallen/timbucktwo/oxygen/", "robot.graham": "/nearline/rrg-allen/SalishSea/nowcast-green.202111/", }, } diff --git a/tests/workers/test_watch_NEMO_hindcast.py b/tests/workers/test_watch_NEMO_hindcast.py index d06ff447..10f4d5c3 100644 --- a/tests/workers/test_watch_NEMO_hindcast.py +++ b/tests/workers/test_watch_NEMO_hindcast.py @@ -119,7 +119,7 @@ def test_optimum_hindcast_section(self, prod_config): assert optimum_hindcast["ssh key"] == "SalishSeaNEMO-nowcast_id_rsa" assert optimum_hindcast["queue info cmd"] == "/usr/bin/qstat" assert optimum_hindcast["users"] == "sallen,dlatorne" - assert optimum_hindcast["scratch dir"] == "/scratch/sallen/dlatorne/rivers/" + assert optimum_hindcast["scratch dir"] == "/scratch/sallen/dlatorne/oxygen/" @pytest.mark.parametrize("host_name", ("cedar", "optimum"))