Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update paths for oxygen hindcast runs #264

Merged
merged 1 commit into from
May 19, 2024
Merged

Update paths for oxygen hindcast runs #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions config/nowcast.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_archive_tarball.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions tests/workers/test_download_results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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/",
},
}
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_run_NEMO_hindcast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_split_results.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/",
},
}
Expand Down
2 changes: 1 addition & 1 deletion tests/workers/test_watch_NEMO_hindcast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down