feature/g2_reg_test: This commit references ufs-community#64.

Update Cray regression test driver for new grib2 test. Remove unused variables.
GeorgeGayno-NOAA · Feb 22, 2020 · a968aa5 · a968aa5
1 parent 60b288e
commit a968aa5
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/reg_tests/chgres_cube/driver.cray.sh b/reg_tests/chgres_cube/driver.cray.sh
@@ -64,7 +64,6 @@ export KMP_AFFINITY=disabled
 
 export OMP_NUM_THREADS=1
 export APRUN="aprun -j 1 -n 6 -N 6 -d ${OMP_NUM_THREADS} -cc depth"
-export INPUT_DATA=${HOMEreg}/input_data/fv3.restart
 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.fv3.restart -M 1000 -W 0:15 -extsched 'CRAYLINUX[]' \
         "export NODES=1; $PWD/c96.fv3.restart.sh"
 
@@ -74,7 +73,6 @@ bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.fv3.restart -M
 
 export OMP_NUM_THREADS=1
 export APRUN="aprun -j 1 -n 6 -N 6 -d ${OMP_NUM_THREADS} -cc depth"
-export INPUT_DATA=${HOMEreg}/input_data/fv3.history
 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c192.fv3.history -M 1000 -W 0:15 -extsched 'CRAYLINUX[]' \
         -w 'ended(c96.fv3.restart)' "export NODES=1; $PWD/c192.fv3.history.sh"
 
@@ -84,7 +82,6 @@ bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c192.fv3.history -M
 
 export OMP_NUM_THREADS=1
 export APRUN="aprun -j 1 -n 6 -N 6 -d ${OMP_NUM_THREADS} -cc depth"
-export INPUT_DATA=${HOMEreg}/input_data/fv3.nemsio
 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.fv3.nemsio -M 1000 -W 0:15 -extsched 'CRAYLINUX[]' \
         -w 'ended(c192.fv3.history)' "export NODES=1; $PWD/c96.fv3.nemsio.sh"
 
@@ -94,7 +91,6 @@ bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.fv3.nemsio -M 1
 
 export OMP_NUM_THREADS=4
 export APRUN="aprun -j 1 -n 6 -N 6 -d ${OMP_NUM_THREADS} -cc depth"
-export INPUT_DATA=${HOMEreg}/input_data/gfs.sigio
 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.gfs.sigio -M 1000 -W 0:15 -extsched 'CRAYLINUX[]' \
         -w 'ended(c96.fv3.nemsio)' "export NODES=1; $PWD/c96.gfs.sigio.sh"
 
@@ -104,7 +100,6 @@ bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.gfs.sigio -M 10
 
 export OMP_NUM_THREADS=1
 export APRUN="aprun -j 1 -n 6 -N 6 -d ${OMP_NUM_THREADS} -cc depth"
-export INPUT_DATA=${HOMEreg}/input_data/gfs.nemsio
 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.gfs.nemsio -M 1000 -W 0:15 -extsched 'CRAYLINUX[]' \
         -w 'ended(c96.gfs.sigio)' "export NODES=1; $PWD/c96.gfs.nemsio.sh"
 
@@ -114,14 +109,22 @@ bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.gfs.nemsio -M 1
 
 export OMP_NUM_THREADS=1
 export APRUN="aprun -j 1 -n 6 -N 6 -d ${OMP_NUM_THREADS} -cc depth"
-export INPUT_DATA=${HOMEreg}/input_data/fv3.nemsio
 bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c96.regional -M 1000 -W 0:15 -extsched 'CRAYLINUX[]' \
         -w 'ended(c96.gfs.nemsio)' "export NODES=1; $PWD/c96.regional.sh"
 
+#-----------------------------------------------------------------------------
+# Initialize global C192 using GFS GRIB2 data.
+#-----------------------------------------------------------------------------
+
+export OMP_NUM_THREADS=1
+export APRUN="aprun -j 1 -n 6 -N 6 -d ${OMP_NUM_THREADS} -cc depth"
+bsub -e $LOG_FILE -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J c192.gfs.grib2 -M 1000 -W 0:05 -extsched 'CRAYLINUX[]' \
+        -w 'ended(c96.regional)' "export NODES=1; $PWD/c192.gfs.grib2.sh"
+
 #-----------------------------------------------------------------------------
 # Create summary log.
 #-----------------------------------------------------------------------------
 
-bsub -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J summary -R "rusage[mem=100]" -W 0:01 -w 'ended(c96.regional)' "grep -a '<<<' $LOG_FILE >> $SUM_FILE"
+bsub -o $LOG_FILE -q $QUEUE -P $PROJECT_CODE -J summary -R "rusage[mem=100]" -W 0:01 -w 'ended(c192.gfs.grib2)' "grep -a '<<<' $LOG_FILE >> $SUM_FILE"
 
 exit