Merge pull request #35 from NOAA-EMC/feature/operations_gda

Issue #34 - update GDA DMPDIR paths and associated scripts. Issue #36 - Update DA tag in operations branch for v15.2.9.
NOAA-EMC · Mar 16, 2020 · 7eb0e82 · 7eb0e82
2 parents 8b177b6 + 9939d8b
commit 7eb0e82
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 30 deletions.
diff --git a/jobs/rocoto/prep.sh b/jobs/rocoto/prep.sh
@@ -30,7 +30,7 @@ export COMOUT="$ROTDIR/$CDUMP.$PDY/$cyc"
 ###############################################################
 # If ROTDIR_DUMP=YES, copy dump files to rotdir 
 if [ $ROTDIR_DUMP = "YES" ]; then
-    $HOMEgfs/ush/getdump.sh $CDATE $CDUMP $DMPDIR/${CDATE}/${CDUMP}${DUMP_SUFFIX} $COMOUT
+    $HOMEgfs/ush/getdump.sh $CDATE $CDUMP $DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc} $COMOUT
     status=$?
     [[ $status -ne 0 ]] && exit $status
 
@@ -41,7 +41,7 @@ if [ $ROTDIR_DUMP = "YES" ]; then
     GDUMP=gdas
     gCOMOUT="$ROTDIR/$GDUMP.$gPDY/$gcyc"
     if [ ! -s $gCOMOUT/$GDUMP.t${gcyc}z.updated.status.tm00.bufr_d ]; then
-     $HOMEgfs/ush/getdump.sh $GDATE $GDUMP $DMPDIR/${GDATE}/${GDUMP}${DUMP_SUFFIX} $gCOMOUT
+     $HOMEgfs/ush/getdump.sh $GDATE $GDUMP $DMPDIR/${GDUMP}${DUMP_SUFFIX}.${gPDY}/${gcyc} $gCOMOUT
      status=$?
      [[ $status -ne 0 ]] && exit $status
     fi
@@ -75,7 +75,7 @@ if [ $PROCESS_TROPCY = "YES" ]; then
     [[ $status -ne 0 ]] && exit $status
 
 else
-    [[ $ROTDIR_DUMP = "NO" ]] && cp $DMPDIR/$CDATE/$CDUMP/${CDUMP}.t${cyc}z.syndata.tcvitals.tm00 $COMOUT/
+    [[ $ROTDIR_DUMP = "NO" ]] && cp $DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}/${CDUMP}.t${cyc}z.syndata.tcvitals.tm00 $COMOUT/
 fi
 
 
@@ -87,31 +87,26 @@ if [ $DO_MAKEPREPBUFR = "YES" ]; then
 	rm $COMOUT/${OPREFIX}prepbufr.acft_profiles
 	rm $COMOUT/${OPREFIX}nsstbufr
     fi
-    if [ $machine = "WCOSS_C" -o $machine = "WCOSS_DELL_P3" -o $machine = "THEIA" ]; then
 
-        export job="j${CDUMP}_prep_${cyc}"
-        export DATAROOT="$RUNDIR/$CDATE/$CDUMP/prepbufr"
-        if [ $ROTDIR_DUMP = "NO" ]; then
-          COMIN_OBS=${COMIN_OBS:-$DMPDIR/$CDATE/$CDUMP}
-          export COMSP=${COMSP:-$COMIN_OBS/$CDUMP.t${cyc}z.}
-        fi
-        export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc}
-        export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc}
-        export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc}
+    export job="j${CDUMP}_prep_${cyc}"
+    export DATAROOT="$RUNDIR/$CDATE/$CDUMP/prepbufr"
+    if [ $ROTDIR_DUMP = "NO" ]; then
+      COMIN_OBS=${COMIN_OBS:-$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}}
+      export COMSP=${COMSP:-$COMIN_OBS/$CDUMP.t${cyc}z.}
+    fi
+    export COMIN=${COMIN:-$ROTDIR/$CDUMP.$PDY/$cyc}
+    export COMINgdas=${COMINgdas:-$ROTDIR/gdas.$PDY/$cyc}
+    export COMINgfs=${COMINgfs:-$ROTDIR/gfs.$PDY/$cyc}
 
-        $HOMEobsproc_network/jobs/JGLOBAL_PREP
-        status=$?
-        [[ $status -ne 0 ]] && exit $status
+    $HOMEobsproc_network/jobs/JGLOBAL_PREP
+    status=$?
+    [[ $status -ne 0 ]] && exit $status
 
-    else
-        echo "WARNING:  prep step is not supported on $machine, exit"
-        exit 1
-    fi
 else
     if [ $ROTDIR_DUMP = "NO" ]; then
-	$NCP $DMPDIR/$CDATE/$CDUMP/${OPREFIX}prepbufr               $COMOUT/${OPREFIX}prepbufr
-	$NCP $DMPDIR/$CDATE/$CDUMP/${OPREFIX}prepbufr.acft_profiles $COMOUT/${OPREFIX}prepbufr.acft_profiles
-	[[ $DONST = "YES" ]] && $NCP $DMPDIR/$CDATE/$CDUMP/${OPREFIX}nsstbufr $COMOUT/${OPREFIX}nsstbufr
+	$NCP $DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}/${OPREFIX}prepbufr               $COMOUT/${OPREFIX}prepbufr
+	$NCP $DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}/${OPREFIX}prepbufr.acft_profiles $COMOUT/${OPREFIX}prepbufr.acft_profiles
+	[[ $DONST = "YES" ]] && $NCP $DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}/${OPREFIX}nsstbufr $COMOUT/${OPREFIX}nsstbufr
     fi
 fi
 

diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -50,24 +50,22 @@ if [ $machine = "THEIA" ]; then
 elif [ $machine = "WCOSS_C" ]; then
 
     export NWPROD="/gpfs/hps/nco/ops/nwprod"
+    export DMPDIR="/gpfs/dell3/emc/global/dump"
     if [ -d /gpfs/tp1 ]; then
         export SITE="LUNA"
-        export DMPDIR="/gpfs/tp1/emc/globaldump"
     elif [ -d /gpfs/gp1 ]; then
         export SITE="SURGE"
-        export DMPDIR="/gpfs/gp1/emc/globaldump"
     fi
     export RTMFIX=$CRTM_FIX
 
 elif [ $machine = "WCOSS_DELL_P3" ]; then
 
     export NWPROD="/gpfs/dell1/nco/ops/nwprod"
+    export DMPDIR="/gpfs/dell3/emc/global/dump"
     if [ -d /gpfs/tp1 ]; then
         export SITE="MARS"
-        export DMPDIR="/gpfs/tp1/emc/globaldump"
     elif [ -d /gpfs/gp1 ]; then
         export SITE="VENUS"
-        export DMPDIR="/gpfs/gp1/emc/globaldump"
     fi
     export RTMFIX=$CRTM_FIX
 fi

diff --git a/sorc/checkout.sh b/sorc/checkout.sh
@@ -21,7 +21,7 @@ if [[ ! -d gsi.fd ]] ; then
     rm -f ${topdir}/checkout-gsi.log
     git clone --recursive gerrit:ProdGSI gsi.fd >> ${topdir}/checkout-gsi.log 2>&1
     cd gsi.fd
-    git checkout fv3da_gfsv15.2.0
+    git checkout fv3da_gfsv15.2.9
     git submodule update
     cd ${topdir}
 else

diff --git a/ush/drive_makeprepbufr.sh b/ush/drive_makeprepbufr.sh
@@ -53,7 +53,7 @@ GSUFFIX=".nemsio"
 APREFIX="${CDUMP}.t${chh}z."
 ASUFFIX=".nemsio"
 
-COMIN_OBS=${COMIN_OBS:-"$DMPDIR/$CDATE/$CDUMP"}
+COMIN_OBS=${COMIN_OBS:-"$DMPDIR/${CDUMP}${DUMP_SUFFIX}.${PDY}/${cyc}"}
 COMIN_GES=${COMIN_GES:-"$ROTDIR/gdas.$gymd/$ghh"}
 COMOUT=${COMOUT:-"$ROTDIR/$CDUMP.$cymd/$chh"}
 [[ ! -d $COMOUT ]] && mkdir -p $COMOUT

diff --git a/ush/rocoto/setup_workflow.py b/ush/rocoto/setup_workflow.py
@@ -359,7 +359,7 @@ def get_gdasgfs_tasks(dict_configs, cdump='gdas'):
     data = '&ROTDIR;/gdas.@Y@m@d/@H/gdas.t@Hz.atmf009.nemsio'
     dep_dict = {'type': 'data', 'data': data, 'offset': '-06:00:00'}
     deps.append(rocoto.add_dependency(dep_dict))
-    data = '&DMPDIR;/@Y@m@d@H/%s%s/%s.t@Hz.updated.status.tm00.bufr_d' % (cdump, dumpsuffix, cdump)
+    data = '&DMPDIR;/%s%s.@Y@m@d/@H/%s.t@Hz.updated.status.tm00.bufr_d' % (cdump, dumpsuffix, cdump)
     dep_dict = {'type': 'data', 'data': data}
     deps.append(rocoto.add_dependency(dep_dict))
     dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)