Ci fix

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

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

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

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() {
@@ -623,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

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
 

tests/opnReqTests/thr.sh

@@ -17,6 +17,16 @@ elif [[ $application == 'regional' ]]; then
 elif [[ $application == 'cpld' ]]; then
   if [[ $CI_TEST != 'true' ]]; then
     if [[ $TEST_NAME == 'cpld_control_c96_p8' ]]; 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"
+      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"
@@ -29,6 +39,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"

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:-}"