feature/gdas_init.v16

Update Dell driver script to work with v16 data (thanks, Russ). After 2020082018, the v16 tarballs include an 'atmos' subdirectory. Account for this in 'run_v16.chgres.sh'. Issue ufs-community#102
GeorgeGayno-NOAA · Dec 1, 2020 · 924c71a · 924c71a
1 parent f28a0bf
commit 924c71a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/util/gdas_init/driver.dell.sh b/util/gdas_init/driver.dell.sh
@@ -63,6 +63,10 @@ if [ $EXTRACT_DATA == yes ]; then
         -R "affinity[core(1)]" -M $MEM "./get_v15.data.sh grp8"
       DEPEND="-w ended(get.data.*)"
       ;;
+    v16)
+      bsub -o log.data.hires -e log.data.hires -q $QUEUE -P $PROJECT_CODE -J get.data.hires -W $WALLT \
+        -R "affinity[core(1)]" -M $MEM "./get_v16.data.sh"
+      DEPEND="-w ended(get.data.hires)"
  esac
 
 else
@@ -72,7 +76,7 @@ else
 fi
 
 if [ $RUN_CHGRES == yes ]; then
-  QUEUE=dev
+  QUEUE=dev2
   MEMBER=hires
   WALLT="0:15"
   export OMP_NUM_THREADS=1
@@ -102,10 +106,22 @@ if [ $RUN_CHGRES == yes ]; then
         -x $NODES -R "affinity[core(1):distribute=balance]" $DEPEND \
         "./run_v15.chgres.sh ${MEMBER}"
       ;;
+    v16)
+      bsub -e log.${MEMBER} -o log.${MEMBER} -q $QUEUE -P $PROJECT_CODE -J chgres_${MEMBER} -W $WALLT \
+        -x $NODES -R "affinity[core(1):distribute=balance]" $DEPEND \
+        "./run_v16.chgres.sh ${MEMBER}"
+     ;;
   esac
 
   NODES="-n 18 -R "span[ptile=9]""
   WALLT="0:15"
+  case $gfs_ver in
+      v16)
+        bsub -e log.enkf -o log.enkf -q $QUEUE -P $PROJECT_CODE -J chgres_enkf -W $WALLT \
+          -x $NODES -R "affinity[core(1):distribute=balance]" $DEPEND \
+          "./run_v16.chgres.sh enkf"
+        ;;
+      *)
   MEMBER=1
   while [ $MEMBER -le 80 ]; do
     if [ $MEMBER -lt 10 ]; then
@@ -130,8 +146,10 @@ if [ $RUN_CHGRES == yes ]; then
         bsub -e log.${MEMBER_CH} -o log.${MEMBER_CH} -q $QUEUE -P $PROJECT_CODE -J chgres_${MEMBER_CH} -W $WALLT \
           -x $NODES -R "affinity[core(1):distribute=balance]" $DEPEND \
           "./run_v15.chgres.sh ${MEMBER_CH}"
-      ;;
+        ;;
     esac
     MEMBER=$(( $MEMBER + 1 ))
   done
+  ;;
+esac
 fi
diff --git a/util/gdas_init/run_v16.chgres.sh b/util/gdas_init/run_v16.chgres.sh
@@ -38,11 +38,15 @@ WORKDIR=$OUTDIR/work.$MEMBER
 if [ ${MEMBER} == 'hires' ]; then
   CINP=C768
   CTAR=${CRES_HIRES}
-  INPUT_DATA_DIR="${EXTRACT_DIR}/gdas.${yy_d}${mm_d}${dd_d}/${hh_d}/RESTART"
 else  
   CINP=C768
   CTAR=${CRES_ENKF}
+fi
+
+if [ ${yy_d}${mm_d}${dd_d}${hh_d} -lt 2020082018 ]; then
   INPUT_DATA_DIR="${EXTRACT_DIR}/gdas.${yy_d}${mm_d}${dd_d}/${hh_d}/RESTART"
+else
+  INPUT_DATA_DIR="${EXTRACT_DIR}/gdas.${yy_d}${mm_d}${dd_d}/${hh_d}/atmos/RESTART"
 fi
 
 rm -fr $WORKDIR