Skip to content

CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts #962

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

Merged
junwang-noaa merged 20 commits into from
Dec 20, 2021
Merged

CCPP cloud cover change for Thompson MP associated with Xu Randall, several bug fixes for regression testing scripts #962

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
ac0dd10
Update .gitmodules and submodule pointer for fv3atm
climbfuji Dec 15, 2021
8106d3d
Update submodule pointer for fv3atm
climbfuji Dec 16, 2021
da0d41f
Update submodule pointer for fv3atm
climbfuji Dec 17, 2021
29da6e8
Add skip_check_results to run_test_${TEST_NR}.env file
DusanJovic-NOAA Dec 17, 2021
96c33d1
Use run_compile.sh instead of compile.sh for sequential rt.sh runs
DusanJovic-NOAA Dec 17, 2021
f20741a
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Dec 17, 2021
be9968d
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Dec 17, 2021
dd6ab96
Merge branch 'rt_logs' of https://github.com/dusanjovic-noaa/ufs-weat…
climbfuji Dec 17, 2021
49725c4
Update BL_DATE in tests/rt.sh
climbfuji Dec 17, 2021
c6ace98
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Dec 18, 2021
d3f91a8
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Dec 18, 2021
1fbb1bf
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Dec 18, 2021
b4a273e
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Dec 18, 2021
aa89ea3
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Dec 18, 2021
69a2662
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Dec 18, 2021
67ffe60
Regression test log for wcoss_cray
climbfuji Dec 18, 2021
4adb23b
Regression test log for jet.intel
BrianCurtis-NOAA Dec 19, 2021
e0325d1
Regression test log for wcoss_dell_p3
climbfuji Dec 19, 2021
1705a6f
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Dec 20, 2021
ef01a28
Merge branch 'cloud_cover_xr' of https://github.com/climbfuji/ufs-wea…
climbfuji Dec 20, 2021
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
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 6c27fd to 71f27b
246 changes: 117 additions & 129 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

732 changes: 352 additions & 380 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

730 changes: 352 additions & 378 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

248 changes: 117 additions & 131 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

752 changes: 361 additions & 391 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

733 changes: 372 additions & 361 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

738 changes: 355 additions & 383 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

472 changes: 228 additions & 244 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

748 changes: 360 additions & 388 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

BL_DATE=20211214
BL_DATE=20211220
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down Expand Up @@ -708,8 +708,7 @@ EOF
elif [[ $ECFLOW == true ]]; then
ecflow_create_compile_task
else
./compile.sh $MACHINE_ID "${MAKE_OPT}" $COMPILE_NR > ${LOG_DIR}/compile_${COMPILE_NR}.log 2>&1
mv compile_${COMPILE_NR}_time.log ${LOG_DIR}
./run_compile.sh ${PATHRT} ${RUNDIR_ROOT} "${MAKE_OPT}" ${COMPILE_NR} > ${LOG_DIR}/compile_${COMPILE_NR}.log 2>&1
fi

# Set RT_SUFFIX (regression test run directories and log files) and BL_SUFFIX
Expand Down Expand Up @@ -798,6 +797,7 @@ EOF
export REGRESSIONTEST_LOG=${REGRESSIONTEST_LOG}
export LOG_DIR=${LOG_DIR}
export DEP_RUN=${DEP_RUN}
export skip_check_results=${skip_check_results}
EOF

if [[ $ROCOTO == true ]]; then
Expand Down
11 changes: 2 additions & 9 deletions tests/rt_utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ submit_and_wait() {
echo "Slurm unknown status ${status}. Check sacct ..."
sacct -n -j ${slurm_id} --format=JobID,state%20,Jobname%20
status_label=$( sacct -n -j ${slurm_id} --format=JobID,state%20,Jobname%20 | grep "^${slurm_id}" | grep ${JBNME} | awk '{print $2}' )
if [[ $status_label = 'FAILED' ]] || [[ $status_label = 'TIMEOUT' ]]; then
if [[ $status_label = 'FAILED' ]] || [[ $status_label = 'TIMEOUT' ]] || [[ $status_label = 'CANCELLED' ]] ; then
test_status='FAIL'
fi
fi
Expand All @@ -178,7 +178,7 @@ submit_and_wait() {
test_status='DONE'
exit_status=$( bjobs ${bsub_id} 2>/dev/null | grep ${bsub_id} | awk '{print $3}' ); status=${status:--}
if [[ $exit_status = 'EXIT' ]]; then
status_label='failed'
status_label='failed'
test_status='FAIL'
fi
fi
Expand All @@ -202,7 +202,6 @@ submit_and_wait() {

if [[ $test_status = 'FAIL' ]]; then
if [[ ${OPNREQ_TEST} == false ]]; then
echo "${TEST_NAME} ${TEST_NR}" >> $PATHRT/fail_test_${TEST_NR}
echo "Test ${TEST_NR} ${TEST_NAME} FAIL" >> ${REGRESSIONTEST_LOG}
echo;echo;echo >> ${REGRESSIONTEST_LOG}
echo "Test ${TEST_NR} ${TEST_NAME} FAIL"
Expand All @@ -215,12 +214,6 @@ submit_and_wait() {
fi
fi

if [[ $test_status = 'PASS' || $test_status = 'DONE' ]]; then
echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS" >> ${REGRESSIONTEST_LOG}
echo;echo;echo >> ${REGRESSIONTEST_LOG}
echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS"
fi

eval "$set_x"
}

Expand Down
5 changes: 5 additions & 0 deletions tests/run_test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ else
fi
export REGRESSIONTEST_LOG

rm -f ${REGRESSIONTEST_LOG}

echo "Test ${TEST_NR} ${TEST_NAME} ${TEST_DESCR}"

source rt_utils.sh
Expand Down Expand Up @@ -239,6 +241,9 @@ fi

if [[ $skip_check_results = false ]]; then
check_results
else
echo "Test ${TEST_NR} ${TEST_NAME} RUN_SUCCESS" > ${REGRESSIONTEST_LOG}
echo;echo;echo >> ${REGRESSIONTEST_LOG}
fi

if [[ $SCHEDULER != 'none' ]]; then
Expand Down