Skip to content

Use Jet's ecflow server on tfe1 while running regression tests from fe## #1067

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

Closed
BrianCurtis-NOAA wants to merge 15 commits into from
Closed

Use Jet's ecflow server on tfe1 while running regression tests from fe## #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1b3f28c
use Jet's ecflow server
BrianCurtis-NOAA Feb 25, 2022
536eafe
Use env var for host after loading ecflow module
BrianCurtis-NOAA Feb 25, 2022
eb12dab
Merge branch 'ufs-community:develop' into bug/jetecflow
BrianCurtis-NOAA Mar 11, 2022
e82abff
Trying something else for debugging
BrianCurtis-NOAA Mar 23, 2022
e5ad9a0
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
BrianCurtis-NOAA Mar 23, 2022
b079a5f
Move commands for ECFLOW into rt_utils.sh
BrianCurtis-NOAA Mar 23, 2022
3144408
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
BrianCurtis-NOAA Mar 28, 2022
f431594
Need to add python to path in rt_utils.sh due to way jet has ecflow node
BrianCurtis-NOAA Mar 29, 2022
364811b
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Mar 29, 2022
8c6cee1
Bring python changes into rt.sh to export in run dir instead
BrianCurtis-NOAA Mar 29, 2022
93c29cc
Merge branch 'bug/jetecflow' of github.com:BrianCurtis-NOAA/ufs-weath…
BrianCurtis-NOAA Mar 29, 2022
c00fb98
Revert jet log
BrianCurtis-NOAA Mar 29, 2022
27e1880
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
BrianCurtis-NOAA Mar 29, 2022
8d29de3
[AutoRT] jet.intel Job Completed.
BrianCurtis-NOAA Mar 30, 2022
dcba5db
Revert jet log to upstream/develop
BrianCurtis-NOAA Mar 30, 2022
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
10 changes: 8 additions & 2 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,8 @@ elif [[ $MACHINE_ID = jet.* ]]; then

export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH
export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages
ECFLOW_START=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))
module load ecflow
ECFLOW_START=/apps/ecflow/5.5.3/bin/ecflow_start.sh

QUEUE=batch
COMPILE_QUEUE=batch
Expand Down Expand Up @@ -815,6 +815,12 @@ EOF
export skip_check_results=${skip_check_results}
export delete_rundir=${delete_rundir}
EOF
if [[ $MACHINE_ID = jet.* ]]; then
cat << EOF >> ${RUNDIR_ROOT}/run_test_${TEST_NR}.env
export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH
export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages
EOF
fi

if [[ $ROCOTO == true ]]; then
rocoto_create_run_task
Expand Down
9 changes: 7 additions & 2 deletions tests/rt_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ check_results() {
if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ wcoss_dell_p3 || ${MACHINE_ID} =~ wcoss_cray || ${MACHINE_ID} =~ cheyenne || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ s4 ]] ; then
printf ".......ALT CHECK.." >> ${REGRESSIONTEST_LOG}
printf ".......ALT CHECK.."
${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i >/dev/null 2>&1 && d=$? || d=$?
${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i > compare_ncfile.log 2>&1 && d=$? || d=$?
if [[ $d -eq 1 ]]; then
echo "....ERROR" >> ${REGRESSIONTEST_LOG}
echo "....ERROR"
Expand Down Expand Up @@ -534,7 +534,7 @@ ecflow_run() {
# in rare instances when UID is greater then 58500 (like Ratko's UID on theia)
[[ $ECF_PORT -gt 49151 ]] && ECF_PORT=12179

ECF_HOST=$( hostname )
ECF_HOST="${ECF_HOST:-$HOSTNAME}"

set +e
ecflow_client --ping --host=${ECF_HOST} --port=${ECF_PORT}
Expand All @@ -544,6 +544,11 @@ ecflow_run() {
if [[ ${MACHINE_ID} == wcoss2 ]]; then
# Annoying "Has NCO assigned port $ECF_PORT for use by this account? (yes/no) ".
echo yes | ${ECFLOW_START} -p ${ECF_PORT} -d ${RUNDIR_ROOT}/ecflow_server
elif [[ ${MACHINE_ID} == jet.* ]]; then
module load ecflow
echo "Using special Jet ECFLOW start procedure"
MYCOMM="bash -l -c \"module load ecflow && ${ECFLOW_START} -d ${RUNDIR_ROOT}/ecflow_server\""
ssh $ECF_HOST "${MYCOMM}"
else
${ECFLOW_START} -p ${ECF_PORT} -d ${RUNDIR_ROOT}/ecflow_server
fi
Expand Down