Rename "c96.viirs.vegt" test to "c96.viirs.bnu".

Fixes ufs-community#821.
GeorgeGayno-NOAA · Aug 18, 2023 · cf4cda9 · cf4cda9
1 parent 54b88b6
commit cf4cda9
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 22 deletions.
diff --git a/reg_tests/grid_gen/c96.viirs.vegt.sh → reg_tests/grid_gen/c96.viirs.bnu.sh b/reg_tests/grid_gen/c96.viirs.vegt.sh → reg_tests/grid_gen/c96.viirs.bnu.sh
@@ -2,15 +2,15 @@
 
 #-----------------------------------------------------------------------
 # Create a C96 global uniform grid using VIIRS-based vegetation type
-# data.  Compare output to a set of baseline files using the
-# 'nccmp' utility.  This script is run by the machine specific
-# driver script.
+# data and BNU soil type data.  Compare output to a set of baseline 
+# files using the 'nccmp' utility.  This script is run by the machine
+# specific driver script.
 #-----------------------------------------------------------------------
 
 set -x
 
-export TEMP_DIR=${WORK_DIR}/c96.viirs.vegt.work
-export out_dir=${WORK_DIR}/c96.viirs.vegt
+export TEMP_DIR=${WORK_DIR}/c96.viirs.bnu.work
+export out_dir=${WORK_DIR}/c96.viirs.bnu
 
 export res=96
 export gtype=uniform
@@ -30,7 +30,7 @@ $home_dir/ush/fv3gfs_driver_grid.sh
 iret=$?
 if [ $iret -ne 0 ]; then
   set +x
-  echo "<<< C96 VIIRS VEGT FAILED. <<<"
+  echo "<<< C96 VIIRS BNU FAILED. <<<"
   exit $iret
 fi
 
@@ -47,7 +47,7 @@ for files in *tile*.nc ./fix_sfc/*tile*.nc
 do
   if [ -f $files ]; then
     echo CHECK $files
-    $NCCMP -dmfqS $files $HOMEreg/c96.viirs.vegt/$files
+    $NCCMP -dmfqS $files $HOMEreg/c96.viirs.bnu/$files
     iret=$?
     if [ $iret -ne 0 ]; then
       test_failed=1
@@ -57,12 +57,12 @@ done
 
 set +x
 if [ $test_failed -ne 0 ]; then
-  echo "<<< C96 VIIRS VEGT TEST FAILED. >>>"
+  echo "<<< C96 VIIRS BNU TEST FAILED. >>>"
   if [ "$UPDATE_BASELINE" = "TRUE" ]; then
-    $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "c96.viirs.vegt" $commit_num
+    $home_dir/reg_tests/update_baseline.sh "${HOMEreg}/.." "c96.viirs.bnu" $commit_num
   fi
 else
-  echo "<<< C96 VIIRS VEGT TEST PASSED. >>>"
+  echo "<<< C96 VIIRS BNU TEST PASSED. >>>"
 fi
 
 exit 0
diff --git a/reg_tests/grid_gen/driver.hera.sh b/reg_tests/grid_gen/driver.hera.sh
@@ -70,12 +70,12 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_
       -o $LOG_FILE1 -e $LOG_FILE1 ./c96.uniform.sh)
 
 #-----------------------------------------------------------------------------
-# C96 uniform grid using viirs vegetation data.
+# C96 uniform grid using viirs vegetation and bnu soil data.
 #-----------------------------------------------------------------------------
 
 LOG_FILE2=${LOG_FILE}02
-TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \
-      --partition=bigmem -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \
+      --partition=bigmem -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh)
 
 #-----------------------------------------------------------------------------
 # gfdl regional grid

diff --git a/reg_tests/grid_gen/driver.jet.sh b/reg_tests/grid_gen/driver.jet.sh
@@ -68,12 +68,12 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_
       --partition=xjet -o $LOG_FILE1 -e $LOG_FILE1 ./c96.uniform.sh)
 
 #-----------------------------------------------------------------------------
-# C96 uniform grid using viirs vegetation type data.
+# C96 uniform grid using viirs vegetation type and bnu soil type data.
 #-----------------------------------------------------------------------------
 
 LOG_FILE2=${LOG_FILE}02
-TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \
-      --partition=xjet -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \
+      --partition=xjet -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh)
 
 #-----------------------------------------------------------------------------
 # gfdl regional grid

diff --git a/reg_tests/grid_gen/driver.orion.sh b/reg_tests/grid_gen/driver.orion.sh
@@ -66,12 +66,12 @@ TEST1=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_
       -o $LOG_FILE1 -e $LOG_FILE1 ./c96.uniform.sh)
 
 #-----------------------------------------------------------------------------
-# C96 uniform grid using viirs vegetation type data.
+# C96 uniform grid using viirs vegetation and bnu soil type data.
 #-----------------------------------------------------------------------------
 
 LOG_FILE2=${LOG_FILE}02
-TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.vegt \
-      -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.vegt.sh)
+TEST2=$(sbatch --parsable --ntasks-per-node=24 --nodes=1 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.viirs.bnu \
+      -o $LOG_FILE2 -e $LOG_FILE2 ./c96.viirs.bnu.sh)
 
 #-----------------------------------------------------------------------------
 # GFDL regional grid

diff --git a/reg_tests/grid_gen/driver.wcoss2.sh b/reg_tests/grid_gen/driver.wcoss2.sh
@@ -71,12 +71,12 @@ TEST1=$(qsub -V -o $LOG_FILE1 -e $LOG_FILE1 -q $QUEUE -A $PROJECT_CODE -l wallti
         -N c96.uniform -l select=1:ncpus=30:mem=40GB $PWD/c96.uniform.sh)
 
 #-----------------------------------------------------------------------------
-# C96 uniform grid using viirs vegetation data.
+# C96 uniform grid using viirs vegetation and bnu soil type data.
 #-----------------------------------------------------------------------------
 
 LOG_FILE2=${LOG_FILE}02
-TEST2=$(qsub -V -o $LOG_FILE2 -e $LOG_FILE2 -q $QUEUE -A $PROJECT_CODE -l walltime=00:10:00 \
-        -N c96.viirs.vegt -l select=1:ncpus=30:mem=40GB $PWD/c96.viirs.vegt.sh)
+TEST2=$(qsub -V -o $LOG_FILE2 -e $LOG_FILE2 -q $QUEUE -A $PROJECT_CODE -l walltime=00:15:00 \
+        -N c96.viirs.bnu -l select=1:ncpus=30:mem=250GB $PWD/c96.viirs.bnu.sh)
 
 #-----------------------------------------------------------------------------
 # gfdl regional grid