update reg

ufs-community · Oct 16, 2024 · f63fbbe · f63fbbe
1 parent 89db7a9
commit f63fbbe
Showing 1 changed file with 30 additions and 57 deletions.
diff --git a/reg_tests/chgres_cube/driver.jet.sh b/reg_tests/chgres_cube/driver.jet.sh
@@ -7,15 +7,15 @@
 # Set WORK_DIR to a general working location outside the UFS_UTILS directory.
 # The exact working directory (OUTDIR) will be WORK_DIR/reg_tests/chgres-cube. 
 # Set the PROJECT_CODE and QUEUE as appropriate.  To see which projects you 
-#are authorized to use, type "account_params".
+# are authorized to use, type "account_params".
 #
 # Invoke the script with no arguments.  A series of daisy-
 # chained jobs will be submitted.  To check the queue, type:
 # "squeue -u USERNAME".
 #
-# The run output will be stored in OUTDIR.  Log output from the suite
-# will be in LOG_FILE.  Once the suite has completed, a summary is
-# placed in SUM_FILE.
+# The run output will be stored in OUTDIR.  Standard output from
+# each test will be placed in its own log file. Once the suite
+# has completed, a summary of results is placed in SUM_FILE.
 #
 # A test fails when its output does not match the baseline files as
 # determined by the "nccmp" utility.  The baseline files are stored in
@@ -33,7 +33,7 @@ module list
 export OUTDIR="${WORK_DIR:-/lfs5/HFIP/emcda/$LOGNAME/stmp}"
 export OUTDIR="${OUTDIR}/reg-tests/chgres-cube"
 
-PROJECT_CODE="rtwbl" #"${PROJECT_CODE:-hfv3gfs}"
+PROJECT_CODE="${PROJECT_CODE:-hfv3gfs}"
 QUEUE="${QUEUE:-batch}"
 
 export machine="jet"
@@ -84,139 +84,112 @@ export OMP_NUM_THREADS=1
 TEST2=$(sbatch --parsable --partition=xjet --nodes=2 --ntasks-per-node=6 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c192.fv3.history \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./c192.fv3.history.sh)
 
-#-----------------------------------------------------------------------------
-# Initialize C96 using FV3 gaussian nemsio files.
-#-----------------------------------------------------------------------------
-
-LOG_FILE=consistency.log03
-export OMP_NUM_THREADS=1
-TEST3=$(sbatch --parsable --partition=xjet --nodes=2 --ntasks-per-node=6 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.nemsio \
-      --exclusive -o $LOG_FILE -e $LOG_FILE ./c96.fv3.nemsio.sh)
-
-#-----------------------------------------------------------------------------
-# Initialize C96 using spectral GFS sigio/sfcio files.
-#-----------------------------------------------------------------------------
-
-LOG_FILE=consistency.log04
-export OMP_NUM_THREADS=6   # should match cpus-per-task
-TEST4=$(sbatch --parsable --partition=xjet --nodes=4 --ntasks-per-node=3 --cpus-per-task=6 -t 0:25:00 \
-      --exclusive -A $PROJECT_CODE -q $QUEUE -J c96.gfs.sigio -o $LOG_FILE -e $LOG_FILE ./c96.gfs.sigio.sh)
-
-#-----------------------------------------------------------------------------
-# Initialize C96 using spectral GFS gaussian nemsio files.
-#-----------------------------------------------------------------------------
-
-LOG_FILE=consistency.log05
-export OMP_NUM_THREADS=1
-TEST5=$(sbatch --parsable --partition=xjet --nodes=1 --ntasks-per-node=6 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.gfs.nemsio \
-      --exclusive -o $LOG_FILE -e $LOG_FILE ./c96.gfs.nemsio.sh)
-
 #-----------------------------------------------------------------------------
 # Initialize C96 using FV3 gaussian netcdf files.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log06
+LOG_FILE=consistency.log03
 export OMP_NUM_THREADS=1
-TEST6=$(sbatch --parsable --partition=xjet --nodes=2 --ntasks-per-node=6 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.netcdf \
+TEST3=$(sbatch --parsable --partition=xjet --nodes=2 --ntasks-per-node=6 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.netcdf \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./c96.fv3.netcdf.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize C192 using GFS GRIB2 data.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log07
+LOG_FILE=consistency.log04
 export OMP_NUM_THREADS=1
-TEST7=$(sbatch --parsable --partition=xjet --nodes=1 --ntasks-per-node=6 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gfs.grib2 \
+TEST4=$(sbatch --parsable --partition=xjet --nodes=1 --ntasks-per-node=6 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c192.gfs.grib2 \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./c192.gfs.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 25-KM USING GFS GRIB2 files.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log08
+LOG_FILE=consistency.log05
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST8=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 25km.conus.gfs.grib2.conus \
+TEST5=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 25km.conus.gfs.grib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./25km.conus.gfs.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 3-KM USING HRRR GRIB2 file WITH GFS PHYSICS.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log09
+LOG_FILE=consistency.log06
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST9=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=2 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J 3km.conus.hrrr.gfssdf.grib2.conus \
+TEST6=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=2 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J 3km.conus.hrrr.gfssdf.grib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./3km.conus.hrrr.gfssdf.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 3-KM USING HRRR GRIB2 file WITH GSD PHYSICS AND SFC VARS FROM FILE.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log10
+LOG_FILE=consistency.log07
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST10=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=3 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J 3km.conus.hrrr.newsfc.grib2.conus \
+TEST7=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=3 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J 3km.conus.hrrr.newsfc.grib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./3km.conus.hrrr.newsfc.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 13-KM USING NAM GRIB2 file WITH GFS PHYSICS .
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log11
+LOG_FILE=consistency.log08
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST11=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 13km.conus.nam.grib2.conus \
+TEST8=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 13km.conus.nam.grib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./13km.conus.nam.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 13-KM USING RAP GRIB2 file WITH GSD PHYSICS .
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log12
+LOG_FILE=consistency.log09
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST12=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 13km.conus.rap.grib2.conus \
+TEST9=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 13km.conus.rap.grib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./13km.conus.rap.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 13-KM NA USING NCEI GFS GRIB2 file WITH GFS PHYSICS .
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log13
+LOG_FILE=consistency.log10
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST13=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=2 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J 13km.na.gfs.ncei.grib2.conus \
+TEST10=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=2 -t 0:10:00 -A $PROJECT_CODE -q $QUEUE -J 13km.na.gfs.ncei.grib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./13km.na.gfs.ncei.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize C96 WAM IC using FV3 gaussian netcdf files.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log14
+LOG_FILE=consistency.log11
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST14=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=2 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.netcdf2wam \
+TEST11=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=2 -t 0:15:00 -A $PROJECT_CODE -q $QUEUE -J c96.fv3.netcdf2wam \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./c96.fv3.netcdf2wam.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 25-KM USING GFS PGRIB2+BGRIB2 files.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log15
+LOG_FILE=consistency.log12
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST15=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 25km.conus.gfs.pbgrib2.conus \
+TEST12=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 25km.conus.gfs.pbgrib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./25km.conus.gfs.pbgrib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize C96 using GEFS GRIB2 data.
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log16
+LOG_FILE=consistency.log13
 export OMP_NUM_THREADS=1
-TEST16=$(sbatch --parsable --partition=xjet --nodes=1 --ntasks-per-node=6 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c96.gefs.grib2 \
+TEST13=$(sbatch --parsable --partition=xjet --nodes=1 --ntasks-per-node=6 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J c96.gefs.grib2 \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./c96.gefs.grib2.sh)
 
 #-----------------------------------------------------------------------------
 # Initialize CONUS 13-KM USING RAP-SMOKE GRIB2 file WITH GSD PHYSICS .
 #-----------------------------------------------------------------------------
 
-LOG_FILE=consistency.log17
+LOG_FILE=consistency.log14
 export OMP_NUM_THREADS=1   # should match cpus-per-task
-TEST17=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 13km.conus.rap-smoke.grib2.conus \
+TEST14=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:05:00 -A $PROJECT_CODE -q $QUEUE -J 13km.conus.rap-smoke.grib2.conus \
       --exclusive -o $LOG_FILE -e $LOG_FILE ./13km.conus.rap-smoke.grib2.sh)
 
 #-----------------------------------------------------------------------------
@@ -226,7 +199,7 @@ TEST17=$(sbatch --parsable --partition=xjet --ntasks-per-node=6 --nodes=1 -t 0:0
 LOG_FILE=consistency.log
 sbatch --partition=xjet --nodes=1  -t 0:01:00 -A $PROJECT_CODE -J chgres_summary -o $LOG_FILE -e $LOG_FILE \
        --open-mode=append -q $QUEUE -d\
-       afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6:$TEST7:$TEST8:$TEST9:$TEST10:$TEST11:$TEST12:$TEST13:$TEST14:$TEST15:$TEST16:$TEST17 << EOF
+       afterok:$TEST1:$TEST2:$TEST3:$TEST4:$TEST5:$TEST6:$TEST7:$TEST8:$TEST9:$TEST10:$TEST11:$TEST12:$TEST13:$TEST14 << EOF
 #!/bin/bash
 grep -a '<<<' $LOG_FILE*  > $SUM_FILE
 EOF