PBL, Convection and Microphysics Update for HR2 (#1731)

* This PR is created due to the ccpp-physics update for HR2 * PBL, Convection and Microphysics Update for HR2
ufs-community · May 9, 2023 · eda0b07 · eda0b07
1 parent ee35891
commit eda0b07
Show file tree

Hide file tree

Showing 12 changed files with 4,597 additions and 4,638 deletions.
diff --git a/FV3 b/FV3
diff --git a/tests/RegressionTests_acorn.intel.log b/tests/RegressionTests_acorn.intel.log
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss2.intel.log b/tests/RegressionTests_wcoss2.intel.log
diff --git a/tests/rt.conf b/tests/rt.conf
@@ -309,4 +309,4 @@ COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DDEBUG=ON -D32BIT=ON
 RUN     | regional_atmaq_debug                                                                                                  | - jet.intel gaea.intel cheyenne.intel     | fv3 |
 
 COMPILE | -DAPP=ATMAQ -DCCPP_SUITES=FV3_GFS_v15p2 -DFASTER=ON -D32BIT=ON                                                        |                                           | fv3 |
-RUN     | regional_atmaq_faster                                                                                                 | - jet.intel                               | fv3 |
+RUN     | regional_atmaq_faster                                                                                                 | - jet.intel wcoss2.intel acorn.intel      | fv3 |
diff --git a/tests/rt.sh b/tests/rt.sh
@@ -468,7 +468,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
 fi
 
 
-BL_DATE=20230430
+BL_DATE=20230504
 
 RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
 

diff --git a/tests/rt_utils.sh b/tests/rt_utils.sh
@@ -360,13 +360,18 @@ check_results() {
             printf ".......ALT CHECK.."
             if [[ ${MACHINE_ID} =~ orion || ${MACHINE_ID} =~ hera || ${MACHINE_ID} =~ gaea || ${MACHINE_ID} =~ jet || ${MACHINE_ID} =~ cheyenne ]] ; then
               nccmp -d -f -g -B --Attribute=checksum --warn=format ${RTPWD}/${CNTL_DIR}/${i} ${RUNDIR}/${i} > ${i}_nccmp.log 2>&1 && d=$? || d=$?
+              if [[ $d -ne 0 && $d -ne 1 ]]; then
+		  echo "....ERROR" >> ${REGRESSIONTEST_LOG}
+		  echo "....ERROR"
+		  exit 1
+              fi
             else
               ${PATHRT}/compare_ncfile.py ${RTPWD}/${CNTL_DIR}/$i ${RUNDIR}/$i > compare_ncfile.log 2>&1 && d=$? || d=$?
-            fi
-            if [[ $d -eq 1 ]]; then
-              echo "....ERROR" >> ${REGRESSIONTEST_LOG}
-              echo "....ERROR"
-              exit 1
+	      if [[ $d -eq 1 ]]; then
+		  echo "....ERROR" >> ${REGRESSIONTEST_LOG}
+		  echo "....ERROR"
+		  exit 1
+              fi
             fi
           fi
         fi