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

CCPP updates: UGWPv1 decomp bug fixes, remove Julie from CODEOWNERS; bug fix in tests/run_compile.sh #835

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Submodule FV3 updated 2 files
+1 −1 ccpp/framework
+1 −1 ccpp/physics
218 changes: 109 additions & 109 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

696 changes: 348 additions & 348 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

686 changes: 343 additions & 343 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

216 changes: 108 additions & 108 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

815 changes: 387 additions & 428 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

678 changes: 339 additions & 339 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

692 changes: 346 additions & 346 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

394 changes: 197 additions & 197 deletions tests/RegressionTests_wcoss_cray.log

Large diffs are not rendered by default.

1,100 changes: 551 additions & 549 deletions tests/RegressionTests_wcoss_dell_p3.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

BL_DATE=20210924
BL_DATE=20210928
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
11 changes: 11 additions & 0 deletions tests/run_compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -eux
echo "PID=$$"
SECONDS=0

trap '[ "$?" -eq 0 ] || write_fail_test' EXIT
trap 'echo "run_compile.sh interrupted PID=$$"; cleanup' INT
trap 'echo "run_compile.sh terminated PID=$$"; cleanup' TERM

Expand All @@ -13,6 +14,14 @@ cleanup() {
exit
}

write_fail_test() {
if [[ ${UNIT_TEST} == true ]]; then
echo compile ${COMPILE_NR} >> $PATHRT/fail_unit_test
else
echo "compile_${COMPILE_NR} failed in run_compile" >> $PATHRT/fail_test
fi
exit 1
}

if [[ $# != 4 ]]; then
echo "Usage: $0 PATHRT RUNDIR_ROOT MAKE_OPT COMPILE_NR"
Expand Down Expand Up @@ -62,6 +71,8 @@ else
./job_card
fi

ls -l ${PATHTR}/tests/fv3_${COMPILE_NR}.exe

cp ${RUNDIR}/compile_*_time.log ${LOG_DIR}
cat ${RUNDIR}/job_timestamp.txt >> ${LOG_DIR}/job_${JOB_NR}_timestamp.txt
################################################################################
Expand Down