Skip to content

Commit e0ab34c

Browse files
Update wcoss2 driver script for new consistency test.
Fixes ufs-community#709.
1 parent eccfe40 commit e0ab34c

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

reg_tests/grid_gen/driver.wcoss2.sh

+12-3
Original file line numberDiff line numberDiff line change
@@ -87,27 +87,36 @@ TEST3=$(qsub -V -o $LOG_FILE3 -e $LOG_FILE3 -q $QUEUE -A $PROJECT_CODE -l wallti
8787
-N gfdl.regional -l select=1:ncpus=30:mem=40GB $PWD/gfdl.regional.sh)
8888

8989
#-----------------------------------------------------------------------------
90-
# esg regional grid
90+
# ESG regional grid (output dominate soil/vegetation type).
9191
#-----------------------------------------------------------------------------
9292

9393
LOG_FILE4=${LOG_FILE}04
9494
TEST4=$(qsub -V -o $LOG_FILE4 -e $LOG_FILE4 -q $QUEUE -A $PROJECT_CODE -l walltime=00:07:00 \
9595
-N esg.regional -l select=1:ncpus=30:mem=40GB $PWD/esg.regional.sh)
9696

9797
#-----------------------------------------------------------------------------
98-
# Regional GSL gravity wave drag test.
98+
# ESG regional grid (output percent of each soil and vegetation type and
99+
# the dominate category).
99100
#-----------------------------------------------------------------------------
100101

101102
LOG_FILE5=${LOG_FILE}05
102103
TEST5=$(qsub -V -o $LOG_FILE5 -e $LOG_FILE5 -q $QUEUE -A $PROJECT_CODE -l walltime=00:07:00 \
104+
-N esg.regional.pct.cat -l select=1:ncpus=30:mem=40GB $PWD/esg.regional.pct.cat.sh)
105+
106+
#-----------------------------------------------------------------------------
107+
# Regional GSL gravity wave drag test.
108+
#-----------------------------------------------------------------------------
109+
110+
LOG_FILE6=${LOG_FILE}06
111+
TEST6=$(qsub -V -o $LOG_FILE6 -e $LOG_FILE6 -q $QUEUE -A $PROJECT_CODE -l walltime=00:07:00 \
103112
-N rsg.gsl.gwd -l select=1:ncpus=30:mem=40GB $PWD/regional.gsl.gwd.sh)
104113

105114
#-----------------------------------------------------------------------------
106115
# Create summary log.
107116
#-----------------------------------------------------------------------------
108117

109118
qsub -V -o ${LOG_FILE} -e ${LOG_FILE} -q $QUEUE -A $PROJECT_CODE -l walltime=00:02:00 \
110-
-N grid_summary -l select=1:ncpus=1:mem=100MB -W depend=afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5 << EOF
119+
-N grid_summary -l select=1:ncpus=1:mem=100MB -W depend=afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6 << EOF
111120
#!/bin/bash
112121
cd ${this_dir}
113122
grep -a '<<<' ${LOG_FILE}* | grep -v echo > $SUM_FILE

0 commit comments

Comments
 (0)