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.

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

Add Derecho to supported platforms #1836

Merged
merged 57 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
3e2750f
Updates for derecho with fixes for mpi
mark-a-potts Aug 31, 2023
6af7f80
updated module files
mark-a-potts Aug 31, 2023
933b6b7
Merge branch 'develop' into feature/derecho
mark-a-potts Sep 13, 2023
f5f39cf
Removing ufs_cheyenne.gnu.lua
zach1221 Nov 14, 2023
bb0ec87
Removing ufs_cheyenne.intel.lua
zach1221 Nov 14, 2023
c08a892
Update compile.sh replacing cheyenne with derecho
zach1221 Nov 14, 2023
cb0a8ce
Update default_vars.sh to remove cheyenne
zach1221 Nov 14, 2023
7ae37ba
Update detect_machine.sh remove cheyenne
zach1221 Nov 14, 2023
2a49b2b
Removing compile_qsub.IN_cheyenne
zach1221 Nov 14, 2023
7060a34
Removing fv3_qsub.IN_cheyenne
zach1221 Nov 14, 2023
82ab4b2
Update module-setup.sh removing cheyenne
zach1221 Nov 14, 2023
3d97a06
Update rt.conf to remove cheyenne
zach1221 Nov 14, 2023
ffebb85
Update rt.sh remove cheyenne add Derecho DISKNM
zach1221 Nov 14, 2023
2dca991
Update rt_utils.sh add derecho / remove cheyenne
zach1221 Nov 14, 2023
3703ef4
Update run_test.sh add derecho / remove cheyenne
zach1221 Nov 14, 2023
86ac3a7
Merge branch 'develop' into feature/derecho
RatkoVasic-NOAA Nov 15, 2023
7a1d152
Update modulefiles and rt.sh
RatkoVasic-NOAA Nov 15, 2023
7c59845
Update pull_request_template.md to add Derecho
zach1221 Nov 15, 2023
4ad444b
Update pull_request_template.md hercules correction
zach1221 Nov 15, 2023
3989359
Replace Cheyenne with Derecho
RatkoVasic-NOAA Nov 15, 2023
9502180
Remove special TPN for Derecho.
RatkoVasic-NOAA Nov 15, 2023
57b6bda
Remove rest of special TPNs for Derecho.
RatkoVasic-NOAA Nov 15, 2023
be0e247
Update rt.conf removing derecho from gnu
zach1221 Nov 16, 2023
d740e9e
add derecho RT logs: passed
zach1221 Nov 17, 2023
9c8e0fc
sync up rt.conf
jkbk2004 Nov 28, 2023
1441ddd
Merge remote-tracking branch 'upstream/develop' into feature/derecho
jkbk2004 Nov 28, 2023
633e5bc
update rt.conf
jkbk2004 Nov 28, 2023
b2de514
Add ufs_derecho.gnu modulefile.
RatkoVasic-NOAA Nov 28, 2023
b22514c
Change environment variable from stack_impi_ver to stack_cray_mpich_ver.
RatkoVasic-NOAA Nov 28, 2023
fab0557
Change environment variable to stack_cray_mpich_ver.
RatkoVasic-NOAA Nov 28, 2023
aa5cb12
Merge branch 'develop' into feature/derecho
RatkoVasic-NOAA Dec 6, 2023
4455578
Update rt.sh fix dprefix path
zach1221 Dec 7, 2023
cf73fde
Update regional_atmaq removing typos from branch sync
zach1221 Dec 7, 2023
bf320e9
Merge branch 'ufs-community:develop' into feature/derecho
jkbk2004 Dec 8, 2023
2b04d0e
reset PPN for derecho
jkbk2004 Dec 8, 2023
eb681f9
Update rt.sh
jkbk2004 Dec 11, 2023
203cd82
Update run_test.sh
jkbk2004 Dec 11, 2023
6e393f5
Update run_test.sh
jkbk2004 Dec 11, 2023
68b3f5e
Update fv3_qsub.IN_derecho
jkbk2004 Dec 11, 2023
200215c
Update run_test.sh
jkbk2004 Dec 11, 2023
693f409
Update cpld_control_c192_p8
jkbk2004 Dec 13, 2023
9612f58
remove gnu for derecho
jkbk2004 Dec 13, 2023
5889075
increase resource for cpld_control_p8 cases and remove gnu/derecho rt…
jkbk2004 Dec 13, 2023
3905a24
sync with develop
jkbk2004 Dec 13, 2023
377d33e
Merge pull request #3 from jkbk2004/fix/derecho
jkbk2004 Dec 13, 2023
096ba2f
merge with the updated develop branch, remove cheyenne from tests/tes…
Dec 13, 2023
3e0bb78
updates from ufs-weather-model/develop
Dec 13, 2023
9351928
Merge branch 'ufs-community:develop' into feature/derecho
jkbk2004 Dec 13, 2023
9080074
turn off 2thread cases on hercules
jkbk2004 Dec 13, 2023
1e4d7df
add derecho RT log: passed
jkbk2004 Dec 14, 2023
1c9ae27
Update rt_auto_jenkins.py account and hostname
zach1221 Dec 14, 2023
87f3508
Update rt_auto_jenkins.py
zach1221 Dec 14, 2023
b5f68eb
Update rt_auto_jenkins.py
jkbk2004 Dec 14, 2023
0c74ee6
Update start_rt_auto_jenkins.sh
jkbk2004 Dec 14, 2023
8538436
Update rt.sh rmove second user
zach1221 Dec 14, 2023
b07ed17
Update start_rt_auto_jenkins.sh
jkbk2004 Dec 14, 2023
af58116
Update AutomatedTesting.rst add possible derecho label
zach1221 Dec 14, 2023
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
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
<!-- Please complete all items in list. -->
- [ ] I have linked PR's from all sub-components involved in section below. <!-- PLEASE DO NOT LINK SUBCOMPONENT ISSUES -->
- [ ] I am confirming reviews are completed in ALL sub-component PR's.
- [ ] I have run the full RT suite on either Hera/Cheyenne AND have attached the log to this PR below this line:
- [ ] I have run the full RT suite on either Hera/Hercules AND have attached the log to this PR below this line:
- LOG:
- [ ] I have added the list of all failed regression tests to "Anticipated changes" section.
- [ ] I have filled out all sections of the template.
Expand Down Expand Up @@ -79,7 +79,7 @@ PLEASE DO NOT MODIFY THE TEMPLATE BEYOND FILLING OUT THE PROPER SECTIONS -->
- [ ] Hercules
- [ ] Jet
- [ ] Gaea
- [ ] Cheyenne
- [ ] Derecho
- WCOSS2
- [ ] Dogwood/Cactus
- [ ] Acorn
Expand Down
2 changes: 1 addition & 1 deletion doc/UsersGuide/source/AutomatedTesting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ On supported HPC systems, a :term:`cron job` runs the ``start_rt_auto.sh`` bash
This script checks the HPC name and sets certain python paths. Then, it runs ``rt_auto.py``,
which uses the Github API (through pyGitHub) to check the labels on pull requests to
``ufs-weather-model``. If a PR label matches the HPC name
(e.g., hera-intel-RT or cheyenne-gnu-BL), the label provides the HPC
(e.g., hera-intel-RT or derecho), the label provides the HPC
zach1221 marked this conversation as resolved.
Show resolved Hide resolved
with the compiler and job information to run a test or task on the machine.
If no PR label matches HPC name, the script exits.

Expand Down
36 changes: 18 additions & 18 deletions doc/UsersGuide/source/BuildingAndRunning.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Supported Platforms & Compilers
Before running the Weather Model (:term:`WM`), users should determine which of the
:ref:`levels of support <SupportedPlatforms>`
is applicable to their system. Generally, Level 1 & 2 systems are restricted to those with access
through NOAA and its affiliates. These systems are named (e.g., Hera, Orion, Cheyenne).
through NOAA and its affiliates. These systems are named (e.g., Hera, Orion, Derecho).
Level 3 & 4 systems include certain personal computers or non-NOAA-affiliated HPC systems.
The prerequisite software libraries for building the WM already exist in a centralized location on Level 1/preconfigured
systems, so users may skip directly to :ref:`getting the data <GetData>` and downloading the code.
Expand Down Expand Up @@ -89,23 +89,23 @@ the data required to run the WM RTs are already available in the following locat
.. _DataLocations:
.. table:: Data Locations for Level 1 & 2 Systems

+--------------+-----------------------------------------------------+
| Machine | File location |
+==============+=====================================================+
| Cheyenne | /glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT |
+--------------+-----------------------------------------------------+
| Gaea | /lustre/f2/pdata/ncep_shared/emc.nemspara/RT |
+--------------+-----------------------------------------------------+
| Hera | /scratch1/NCEPDEV/nems/emc.nemspara/RT |
+--------------+-----------------------------------------------------+
| Jet | /mnt/lfs4/HFIP/hfv3gfs/role.epic/RT |
+--------------+-----------------------------------------------------+
| Orion | /work/noaa/nems/emc.nemspara/RT |
+--------------+-----------------------------------------------------+
| S4 | /data/prod/emc.nemspara/RT |
+--------------+-----------------------------------------------------+
| WCOSS2 | /lfs/h2/emc/nems/noscrub/emc.nems/RT |
+--------------+-----------------------------------------------------+
+--------------+--------------------------------------------------------+
| Machine | File location |
+==============+========================================================+
| Derecho | /glade/derecho/scratch/epicufsrt/ufs-weather-model/RT |
+--------------+--------------------------------------------------------+
| Gaea | /lustre/f2/pdata/ncep_shared/emc.nemspara/RT |
+--------------+--------------------------------------------------------+
| Hera | /scratch1/NCEPDEV/nems/emc.nemspara/RT |
+--------------+--------------------------------------------------------+
| Jet | /mnt/lfs4/HFIP/hfv3gfs/role.epic/RT |
+--------------+--------------------------------------------------------+
| Orion | /work/noaa/nems/emc.nemspara/RT |
+--------------+--------------------------------------------------------+
| S4 | /data/prod/emc.nemspara/RT |
+--------------+--------------------------------------------------------+
| WCOSS2 | /lfs/h2/emc/nems/noscrub/emc.nems/RT |
+--------------+--------------------------------------------------------+

For Level 3-4 systems, the data must be added to the user's system.
Publicly available RT data is available in the `UFS WM Data Bucket <https://registry.opendata.aws/noaa-ufs-regtests/>`__.
Expand Down
12 changes: 6 additions & 6 deletions doc/UsersGuide/source/FAQ.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ The steps are:
cd tests

#. Find a configure (``*.conf``) file that contains the machine and compiler you are using. For this
example, the Intel compiler on Cheyenne is used. To create a custom configure file, two lines are
example, the Intel compiler on Derecho is used. To create a custom configure file, two lines are
needed: a ``COMPILE`` line and a ``RUN`` line. The ``COMPILE`` line should contain the name
of the machine and compiler ``cheyenne.intel`` and the desired ``SUITES`` for the build. Choose a
of the machine and compiler ``derecho.intel`` and the desired ``SUITES`` for the build. Choose a
``RUN`` line under this ``COMPILE`` command that uses the desired ``SUITE``. For example:

.. code-block:: console

COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst | standard | cheyenne.intel | fv3
COMPILE | 32BIT=Y CCPP=Y STATIC=Y SUITES=FV3_GFS_v15p2,FV3_GFS_v16beta,FV3_GFS_v15p2_no_nsst,FV3_GFS_v16beta_no_nsst | standard | derecho.intel | fv3
RUN | fv3_ccpp_gfs_v16beta | standard | | fv3 |

Put these two lines into a file called ``my_test.conf``. The parameters used in this run can be
Expand All @@ -49,16 +49,16 @@ The steps are:

.. code-block:: console

if [[ $MACHINE_ID = cheyenne.* ]]; then stanza:
if [[ $MACHINE_ID = derecho.* ]]; then stanza:
...
dprefix=/glade/scratch

This works for Cheyenne, since ``$USER/FV3_RT`` will be appended. Also check that ``RTPWD``
This works for Derecho, since ``$USER/FV3_RT`` will be appended. Also check that ``RTPWD``
points to a diretory that exists:

.. code-block:: console

if [[ $MACHINE_ID = cheyenne.* ]]; then
if [[ $MACHINE_ID = derecho.* ]]; then
RTPWD=${RTPWD:-$DISKNM/ufs-public-release-20200224/${COMPILER^^}}

#. Run the ``rt.sh`` script from the ``tests`` directory:
Expand Down
4 changes: 2 additions & 2 deletions doc/UsersGuide/source/Introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ for those elements, are listed below:

The UFS Weather Model is currently included in two UFS Application releases: The UFS Short-Range Weather (:term:`SRW`) Application v2.0.0 release (June 2022) and the UFS Medium Range Weather Application (:term:`MRW`) v1.1.0 release (October 2020). These UFS Apps also contain pre- and post-processing components, a comprehensive build system, and workflows for configuration and execution of the application. The SRW App v2.0.0 documentation and details can be found `here <https://ufs-srweather-app.readthedocs.io/en/release-public-v2/>`__. The MRW App v1.1.0 documentation and details can be found `here <https://ufs-mrweather-app.readthedocs.io/en/ufs-v1.1.0>`__.

The UFS WM code is portable and can be used with Linux or Mac operating systems and with Intel or GNU compilers. It has been tested on a variety of platforms widely used by atmospheric scientists, such as the NOAA Research Hera system, the National Center for Atmospheric Research (:term:`NCAR`) Cheyenne system, the National Science Foundation Stampede system, and Mac laptops.
The UFS WM code is portable and can be used with Linux or Mac operating systems and with Intel or GNU compilers. It has been tested on a variety of platforms widely used by atmospheric scientists, such as the NOAA Research Hera system, the National Center for Atmospheric Research (:term:`NCAR`) Derecho system, the National Science Foundation Stampede system, and Mac laptops.

.. note::

Expand Down Expand Up @@ -66,4 +66,4 @@ This WM User's Guide is organized as follows:

Finally, :numref:`Chapters %s <Acronyms>` and :numref:`%s <Glossary>` contain a list of acronyms and a glossary, respectively.

.. bibliography:: references.bib
.. bibliography:: references.bib
60 changes: 0 additions & 60 deletions modulefiles/ufs_cheyenne.gnu.lua

This file was deleted.

61 changes: 0 additions & 61 deletions modulefiles/ufs_cheyenne.intel.lua

This file was deleted.

30 changes: 30 additions & 0 deletions modulefiles/ufs_derecho.intel.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
help([[
loads UFS Model prerequisites for NOAA Parallelworks/Intel
]])

setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles")
load("ecflow/5.8.4")
load("mysql/8.0.33")

setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")

unload("ncarcompilers")
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_impi_ver=os.getenv("stack_impi_ver") or "8.1.25"
load(pathJoin("stack-cray-mpich", stack_impi_ver))
DusanJovic-NOAA marked this conversation as resolved.
Show resolved Hide resolved

cmake_ver=os.getenv("cmake_ver") or "3.26.3"
load(pathJoin("cmake", cmake_ver))

stack_python_ver=os.getenv("stack_python_ver") or "3.10.8"
load(pathJoin("stack-python", stack_python_ver))

setenv("CMAKE_Platform", "derecho.intel")
load("ufs-weather-model-env")

whatis("Description: UFS build environment")
8 changes: 4 additions & 4 deletions tests/auto-jenkins/jobs/bl.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ def set_directories(job_obj):
blstore = '/work/noaa/epic/hercules/UFS-WM_RT'
rtbldir = '/work/noaa/stmp/role-epic/stmp/role-epic/FV3_RT/'\
f'REGRESSION_TEST'
elif job_obj.machine == 'cheyenne':
workdir = '/glade/scratch/epicufsrt/autort/jenkins/autort/pr'
blstore = '/glade/scratch/epicufsrt/GMTB/ufs-weather-model/RT/NEMSfv3gfs'
rtbldir = '/glade/scratch/epicufsrt/FV3_RT/'\
elif job_obj.machine == 'derecho':
workdir = '/glade/derecho/scratch/epicufsrt/autort/jenkins/autort/pr'
blstore = '/glade/derecho/scratch/epicufsrt/ufs-weather-model/RT/NEMSfv3gfs'
rtbldir = '/glade/derecho/scratch/epicufsrt/FV3_RT/'\
f'REGRESSION_TEST'
else:
logger.critical(f'Machine {job_obj.machine} is not supported for this job')
Expand Down
4 changes: 2 additions & 2 deletions tests/auto-jenkins/jobs/rt.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def set_directories(job_obj):
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/tests/auto/pr'
elif job_obj.machine == 'hercules':
workdir = '/work/noaa/epic/role-epic/autort/tests/auto/pr'
elif job_obj.machine == 'cheyenne':
workdir = '/glade/scratch/epicufsrt/autort/jenkins/autort/pr'
elif job_obj.machine == 'derecho':
workdir = '/glade/derecho/scratch/epicufsrt/autort/jenkins/autort/pr'
else:
print(f'Machine {job_obj.machine} is not supported for this job')
raise KeyError
Expand Down
14 changes: 7 additions & 7 deletions tests/auto-jenkins/rt_auto_jenkins.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def delete_pr_dirs(each_pr, machine):
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/pr'
elif machine == 'hercules':
workdir = '/work/noaa/epic/role-epic/autort/pr'
elif machine == 'cheyenne':
workdir = '/glade/scratch/epicufsrt/autort/jenkins/autort/pr'
elif machine == 'derecho':
workdir = '/glade/derecho/scratch/epicufsrt/autort/jenkins/autort/pr'
else:
logging.error(f'Machine {machine} is not supported for this job')
raise KeyError
Expand Down Expand Up @@ -120,8 +120,8 @@ def delete_rt_dirs(in_dir, machine, workdir):
rt_dir = '/work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT'
elif machine == 'hercules':
rt_dir = '/work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT'
elif machine == 'cheyenne':
rt_dir = '/glade/scratch/epicufsrt/FV3_RT'
elif machine == 'derecho':
rt_dir = '/glade/derecho/scratch/epicufsrt/FV3_RT'
else:
logging.error(f'Machine {machine} is not supported for this job')
raise KeyError
Expand Down Expand Up @@ -301,11 +301,11 @@ def setup_env():
elif bool(re.match(re.compile('Hercules-login.+'), hostname)):
machine = 'hercules'
os.environ['ACCNR'] = 'epic'
elif bool(re.match(re.compile('cheyenne.+'), hostname)):
machine = 'cheyenne'
elif bool(re.match(re.compile('derecho.+'), hostname)):
machine = 'derecho'
os.environ['ACCNR'] = 'SCSG0002'
elif bool(re.match(re.compile('chadmin.+'), hostname)):
machine = 'cheyenne'
machine = 'derecho'
os.environ['ACCNR'] = 'SCSG0002'
else:
raise KeyError(f'Hostname: {hostname} does not match '\
Expand Down
5 changes: 3 additions & 2 deletions tests/auto-jenkins/start_rt_auto_jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ elif [[ $HOSTNAME == tfe* ]]; then
elif [[ $HOSTNAME == gaea* ]]; then
export PATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/ufs-weather-model/bin:$PATH
export PYTHONPATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/lib/python3.8/site-packages
elif [[ $HOSTNAME == *chadmin* ]] || [[ $HOSTNAME == *cheyenne* ]]; then
export MACHINE_ID=cheyenne
elif [[ $HOSTNAME == *chadmin* ]] || [[ $HOSTNAME == *derecho* ]]; then
BrianCurtis-NOAA marked this conversation as resolved.
Show resolved Hide resolved
jkbk2004 marked this conversation as resolved.
Show resolved Hide resolved
export MACHINE_ID=derecho
export PATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin:/glade/p/ral/jntp/tools/miniconda3/4.8.3/bin:$PATH
export PATH=/glade/work/epicufsrt/contrib/derecho/rocoto/bin:$PATH
export PYTHONPATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/glade/p/ral/jntp/tools/miniconda3/4.8.3/lib/python3.8/site-packages
else
echo "No Python Path for this machine."
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/jobs/bl.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def set_directories(job_obj):
blstore = '/work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs'
rtbldir = '/work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT/'\
f'REGRESSION_TEST_{job_obj.compiler.upper()}'
elif job_obj.machine == 'cheyenne':
elif job_obj.machine == 'derecho':
workdir = '/glade/scratch/dtcufsrt/autort/tests/auto/pr'
blstore = '/glade/p/ral/jntp/GMTB/ufs-weather-model/RT/NEMSfv3gfs'
rtbldir = '/glade/scratch/dtcufsrt/FV3_RT/'\
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/jobs/rt.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ def set_directories(job_obj):
workdir = '/lustre/f2/pdata/ncep/emc.nemspara/autort/pr'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/nems/emc.nemspara/autort/pr'
elif job_obj.machine == 'cheyenne':
elif job_obj.machine == 'derecho':
workdir = '/glade/scratch/dtcufsrt/autort/tests/auto/pr'
else:
print(f'Machine {job_obj.machine} is not supported for this job')
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/rt_auto.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ def setup_env():
elif bool(re.match(re.compile('Orion-login.+'), hostname)):
machine = 'orion'
elif bool(re.match(re.compile('chadmin.+'), hostname)):
machine = 'cheyenne'
machine = 'derecho'
os.environ['ACCNR'] = 'P48503002'
else:
raise KeyError(f'Hostname: {hostname} does not match '\
Expand Down
3 changes: 2 additions & 1 deletion tests/auto/start_rt_auto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ elif [[ $HOSTNAME == gaea* ]]; then
export PATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/ufs-weather-model/bin:$PATH
export PYTHONPATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/lib/python3.8/site-packages
elif [[ $HOSTNAME == *chadmin* ]]; then
export MACHINE_ID=cheyenne
export MACHINE_ID=derecho
export PATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/bin:/glade/p/ral/jntp/tools/miniconda3/4.8.3/bin:$PATH
export PATH=/glade/work/epicufsrt/contrib/derecho/rocoto/bin:$PATH
export PYTHONPATH=/glade/p/ral/jntp/tools/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/glade/p/ral/jntp/tools/miniconda3/4.8.3/lib/python3.8/site-packages
else
echo "No Python Path for this machine."
Expand Down
Loading