From 67f209ab6121166499bee1020e9b2fa16c60701b Mon Sep 17 00:00:00 2001 From: MinsukJi-NOAA Date: Tue, 15 Mar 2022 19:51:36 +0000 Subject: [PATCH 1/4] Docker container library updated. CI input data updated. Add chm_petlist_bounds. --- tests/ci/Dockerfile | 2 +- tests/ci/ci.sh | 4 ++-- tests/opnReqTest | 4 ++-- tests/opnReqTests/thr.sh | 2 ++ tests/opnReqTests/wrt_env.sh | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/ci/Dockerfile b/tests/ci/Dockerfile index 7ee24a4c6f..5a243fa2fd 100644 --- a/tests/ci/Dockerfile +++ b/tests/ci/Dockerfile @@ -1,4 +1,4 @@ -From noaaemc/ubuntu-hpc:v1.8b +From noaaemc/ubuntu-hpc:v1.9b ENV HOME=/home/builder COPY --chown=builder:builder . $HOME/ufs-weather-model diff --git a/tests/ci/ci.sh b/tests/ci/ci.sh index b843f8baf1..79b674fbe7 100755 --- a/tests/ci/ci.sh +++ b/tests/ci/ci.sh @@ -75,13 +75,13 @@ if [ $BUILD = "true" ]; then elif [ $RUN == "true" ]; then docker volume rm -f DataVolume >/dev/null && - docker run -d --rm -v DataVolume:/tmp minsukjinoaa/input-data:20211203 + docker run -d --rm -v DataVolume:/tmp minsukjinoaa/input-data:20211210 docker create -u builder -e "CI_TEST=true" -e "USER=builder" \ -e "RT_MACHINE=linux.gnu" -e "RT_COMPILER=gnu" \ -w "/home/builder/ufs-weather-model/tests" \ -v DataVolume:/home/builder/data/NEMSfv3gfs \ - --shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.8b \ + --shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.9b \ /bin/bash -c "./opnReqTest -n ${TEST_NAME} -c ${TEST_CASE} -x" cd $GITHUB_WORKSPACE diff --git a/tests/opnReqTest b/tests/opnReqTest index 78e47ac869..81acecf140 100755 --- a/tests/opnReqTest +++ b/tests/opnReqTest @@ -624,9 +624,9 @@ fi mkdir -p ${STMP}/${USER} NEW_BASELINE=${STMP}/${USER}/FV3_OPNREQ_TEST/OPNREQ_TEST RTPWD=${NEW_BASELINE} -INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20211203} +INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20211210} INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20211113/ -INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210717} +INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207} rm -rf $NEW_BASELINE mkdir -p $NEW_BASELINE diff --git a/tests/opnReqTests/thr.sh b/tests/opnReqTests/thr.sh index 53e3eab0de..cbafc7876c 100644 --- a/tests/opnReqTests/thr.sh +++ b/tests/opnReqTests/thr.sh @@ -20,6 +20,7 @@ elif [[ $application == 'cpld' ]]; then INPES=3 JNPES=4 med_petlist_bounds="0 71" + chm_petlist_bounds="0 71" atm_petlist_bounds="0 77" ocn_petlist_bounds="78 107" ice_petlist_bounds="108 119" @@ -29,6 +30,7 @@ elif [[ $application == 'cpld' ]]; then INPES=3 JNPES=4 med_petlist_bounds="0 71" + chm_petlist_bounds="0 71" atm_petlist_bounds="0 77" ocn_petlist_bounds="78 97" ice_petlist_bounds="98 107" diff --git a/tests/opnReqTests/wrt_env.sh b/tests/opnReqTests/wrt_env.sh index 42d86ca4cf..76bc7a28c4 100644 --- a/tests/opnReqTests/wrt_env.sh +++ b/tests/opnReqTests/wrt_env.sh @@ -12,6 +12,7 @@ export WRITE_GROUP=${WRITE_GROUP} export WRTTASK_PER_GROUP=${WRTTASK_PER_GROUP} export NPROC_ICE=${NPROC_ICE:-} export med_petlist_bounds="${med_petlist_bounds:-}" +export chm_petlist_bounds="${chm_petlist_bounds:-}" export atm_petlist_bounds="${atm_petlist_bounds:-}" export ocn_petlist_bounds="${ocn_petlist_bounds:-}" export ice_petlist_bounds="${ice_petlist_bounds:-}" From 2f46ca0193e057e397d8f1c52726b9bae52fcdf5 Mon Sep 17 00:00:00 2001 From: MinsukJi-NOAA Date: Wed, 16 Mar 2022 14:55:12 +0000 Subject: [PATCH 2/4] Change gocart output file name for debug test --- tests/opnReqTests/dbg.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/opnReqTests/dbg.sh b/tests/opnReqTests/dbg.sh index 918bb15553..d5f31b3c58 100644 --- a/tests/opnReqTests/dbg.sh +++ b/tests/opnReqTests/dbg.sh @@ -29,6 +29,7 @@ elif [[ $application == 'cpld' ]]; then | sed -E "s/2021-03-23-21600/2021-03-22-43200/g" \ | sed -E "s/sfcf021.tile[1-6].nc ?//g" \ | sed -E "s/atmf021.tile[1-6].nc ?//g" \ + | sed -E "s/(gocart.inst_aod.202103)23_0600z.nc4/\122_1200z.nc4/g" \ | sed -e "s/^ *//" -e "s/ *$//") fi From b7bb26f630bbe89adadb925d2b0c5e66d5d53d53 Mon Sep 17 00:00:00 2001 From: MinsukJi-NOAA Date: Wed, 16 Mar 2022 16:58:29 +0000 Subject: [PATCH 3/4] Changes for opnReqTest to also scan rt_gnu.conf --- tests/opnReqTest | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/opnReqTest b/tests/opnReqTest index 81acecf140..d6e5c379e6 100755 --- a/tests/opnReqTest +++ b/tests/opnReqTest @@ -53,6 +53,7 @@ cleanup() { } find_build() { + cat rt.conf rt_gnu.conf >rt.temp local compile_line='' local run_line='' while read -r line || [ "$line" ]; do @@ -70,7 +71,7 @@ find_build() { break fi fi - done <'rt.conf' + done <'rt.temp' } build_opnReqTests() { From 181d476ad6543e20f69d94da94552864afb937f9 Mon Sep 17 00:00:00 2001 From: MinsukJi-NOAA Date: Wed, 16 Mar 2022 20:01:38 +0000 Subject: [PATCH 4/4] Change CI tests to noaero --- tests/ci/ci.test | 2 +- tests/opnReqTests/thr.sh | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/ci/ci.test b/tests/ci/ci.test index ac4bb63e08..2fea94f8fc 100644 --- a/tests/ci/ci.test +++ b/tests/ci/ci.test @@ -2,5 +2,5 @@ control thr mpi dcp rst bit dbg regional_control thr dcp -cpld_control_c96_p8 +cpld_control_c96_noaero_p8 rst dbg diff --git a/tests/opnReqTests/thr.sh b/tests/opnReqTests/thr.sh index cbafc7876c..af0f9bf0b1 100644 --- a/tests/opnReqTests/thr.sh +++ b/tests/opnReqTests/thr.sh @@ -26,6 +26,15 @@ elif [[ $application == 'cpld' ]]; then ice_petlist_bounds="108 119" TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 30 + 12)) NODES=$(((TASKS+TPN-1)/TPN)) + elif [[ $TEST_NAME == 'cpld_control_c96_noaero_p8' ]]; then + INPES=3 + JNPES=4 + med_petlist_bounds="0 71" + atm_petlist_bounds="0 77" + ocn_petlist_bounds="78 107" + ice_petlist_bounds="108 119" + TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 30 + 12)) + NODES=$(((TASKS+TPN-1)/TPN)) elif [[ $TEST_NAME == 'cpld_control_p8' ]]; then INPES=3 JNPES=4