Generalize the scripts and start testing them from chgres_cube.

Fixes ufs-community#574.
GeorgeGayno-NOAA · Oct 14, 2021 · 4ef2152 · 4ef2152
1 parent c07db3a
commit 4ef2152
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 6 deletions.
diff --git a/reg_tests/global_cycle/check.sh → reg_tests/check.sh b/reg_tests/global_cycle/check.sh → reg_tests/check.sh
diff --git a/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.grib2.sh
@@ -80,6 +80,9 @@ done
 set +x
 if [ $test_failed -ne 0 ]; then
   echo "<<< 25-KM CONUS GFS GRIB2 TEST FAILED. >>>"
+  if [ "$UPDATE_BASELINE" = "TRUE" ]; then
+    $HOMEufs/reg_tests/update.sh $HOMEreg "25km_conus_gfs_grib2" $commit_num
+  fi
 else
   echo "<<< 25-KM CONUS GFS GRIB2 TEST PASSED. >>>"
 fi

diff --git a/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh b/reg_tests/chgres_cube/25km.conus.gfs.pbgrib2.sh
@@ -79,6 +79,9 @@ done
 set +x
 if [ $test_failed -ne 0 ]; then
   echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST FAILED. >>>"
+  if [ "$UPDATE_BASELINE" = "TRUE" ]; then
+    $HOMEufs/reg_tests/update.sh $HOMEreg "25km_conus_gfs_pbgrib2" $commit_num
+  fi
 else
   echo "<<< 25-KM CONUS GFS PGRIB2+BGRIB2 TEST PASSED. >>>"
 fi

diff --git a/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh b/reg_tests/chgres_cube/driver.wcoss_dell_p3.sh
@@ -40,9 +40,14 @@ PROJECT_CODE="${PROJECT_CODE:-GFS-DEV}"
 # and baseline data for each test.
 #-----------------------------------------------------------------------------
 
+#export UPDATE_BASELINE="FALSE"
+export UPDATE_BASELINE="TRUE"
+
+source ../check.sh
+
 export HOMEufs=$PWD/../..
 
-export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube
+export HOMEreg=/gpfs/dell2/emc/modeling/noscrub/George.Gayno/ufs_utils.git/reg_tests/chgres_cube.test
 
 SUM_FILE=summary.log
 
@@ -63,6 +68,9 @@ export OMP_NUM_THREADS=1
 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J chgres01 -W 0:05 -x -n 6 \
         -R "span[ptile=6]" -R "affinity[core(${OMP_NUM_THREADS}):distribute=balance]" "$PWD/25km.conus.gfs.grib2.sh"
 
+
+exit
+
 #-----------------------------------------------------------------------------
 # Initialize CONUS 3-KM USING HRRR GRIB2 file WITH GFS PHYSICS.
 #-----------------------------------------------------------------------------

diff --git a/reg_tests/global_cycle/C768.fv3gfs.sh b/reg_tests/global_cycle/C768.fv3gfs.sh
@@ -71,7 +71,7 @@ if [ $test_failed -ne 0 ]; then
   echo "<<< C768 GLOBAL CYCLE TEST FAILED. >>>"
   echo "*********************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.fv3gfs" $commit_num
+    $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.fv3gfs" $commit_num
   fi
 else
   echo

diff --git a/reg_tests/global_cycle/C768.lndincsnow.sh b/reg_tests/global_cycle/C768.lndincsnow.sh
@@ -76,7 +76,7 @@ if [ $test_failed -ne 0 ]; then
   echo "<<< C768 LANDINC SNOW CYCLE TEST FAILED. >>>"
   echo "****************************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.lndincsnow" $commit_num
+    $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.lndincsnow" $commit_num
   fi
 else
   echo

diff --git a/reg_tests/global_cycle/C768.lndincsoil.sh b/reg_tests/global_cycle/C768.lndincsoil.sh
@@ -78,7 +78,7 @@ if [ $test_failed -ne 0 ]; then
   echo "<<< C768 LANDINC SOILT CYCLE TEST FAILED. >>>"
   echo "*****************************************"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $BASE_GSM/reg_tests/global_cycle/update.sh $HOMEreg "c768.lndincsoil" $commit_num
+    $BASE_GSM/reg_tests/update.sh $HOMEreg "c768.lndincsoil" $commit_num
   fi
 else
   echo

diff --git a/reg_tests/global_cycle/driver.wcoss_dell_p3.sh b/reg_tests/global_cycle/driver.wcoss_dell_p3.sh
@@ -37,7 +37,7 @@ QUEUE="${QUEUE:-dev}"
 #export UPDATE_BASELINE="FALSE"
 export UPDATE_BASELINE="TRUE"
 
-source check.sh
+source ../check.sh
 
 DATA_DIR="${WORK_DIR}/reg-tests/global-cycle"
 

diff --git a/reg_tests/global_cycle/update.sh → reg_tests/update.sh b/reg_tests/global_cycle/update.sh → reg_tests/update.sh
@@ -18,7 +18,7 @@ fi
 
 mkdir -p $base_dir_commit
 
-for files in *tile*.nc
+for files in *.nc
 do
   if [ -f $files ]; then
     cp $files $base_dir_commit