From 944dfc7a5ff3dd3374b1cd64fec46f8aa1741402 Mon Sep 17 00:00:00 2001 From: Erik Kluzek Date: Thu, 19 Oct 2023 01:50:33 -0600 Subject: [PATCH] Add derecho in --- python/ctsm/machine_defaults.py | 19 +++++++++++++++++++ python/ctsm/machine_utils.py | 2 ++ 2 files changed, 21 insertions(+) diff --git a/python/ctsm/machine_defaults.py b/python/ctsm/machine_defaults.py index 7486237323..0ca414eb98 100644 --- a/python/ctsm/machine_defaults.py +++ b/python/ctsm/machine_defaults.py @@ -66,6 +66,25 @@ ) }, ), + "derecho": MachineDefaults( + job_launcher_type=JOB_LAUNCHER_QSUB, + scratch_dir=os.path.join(os.path.sep, "glade", "derecho", "scratch", get_user()), + baseline_dir=os.path.join(os.path.sep, "glade", "p", "cgd", "tss", "ctsm_baselines"), + account_required=True, + create_test_retry=0, + create_test_queue="regular", + job_launcher_defaults={ + JOB_LAUNCHER_QSUB: QsubDefaults( + queue="regular", + walltime="11:50:00", + extra_args="", + # The following assumes a single node, with a single mpi proc; we may want + # to add more flexibility in the future, making the node / proc counts + # individually selectable + required_args="-l select=1:ncpus=128:mpiprocs=1 -V -r n -l inception=login -k oed", + ) + }, + ), "hobart": MachineDefaults( job_launcher_type=JOB_LAUNCHER_QSUB, scratch_dir=os.path.join(os.path.sep, "scratch", "cluster", get_user()), diff --git a/python/ctsm/machine_utils.py b/python/ctsm/machine_utils.py index da5c8b9c6a..970d2e9080 100644 --- a/python/ctsm/machine_utils.py +++ b/python/ctsm/machine_utils.py @@ -41,6 +41,8 @@ def _machine_from_hostname(hostname): """ if re.match(r"cheyenne\d+", hostname): machine = "cheyenne" + elif re.match(r"derecho\d+", hostname): + machine = "derecho" else: machine = hostname