Issue #46 - fix to verification switches and fix to COMINsyn path on …

…Hera
NOAA-EMC · Apr 2, 2020 · 81f6114 · 81f6114
1 parent def5de0
commit 81f6114
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 28 deletions.
diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh
@@ -98,38 +98,20 @@ fi
 ###############################################################
 echo
 echo "=============== START TO RUN VSDB STEP1, VERIFY PRCIP AND GRID2OBS ==============="
-if [ $CDUMP = "gfs" ]; then
-
-    if [ $VRFY_PCKG2RUN = "VSDB" -o $VRFY_PCKG2RUN = "BOTH" ]; then
-        if [ $VSDB_STEP1 = "YES" -o $VRFYPRCP = "YES" -o $VRFYG2OBS = "YES" ]; then
+if [ $CDUMP = "gfs" -a $DO_VSDB = "YES" ]; then
+    if [ $VSDB_STEP1 = "YES" -o $VRFYPRCP = "YES" -o $VRFYG2OBS = "YES" ]; then
 
-            xdate=$(echo $($NDATE -${BACKDATEVSDB} $CDATE) | cut -c1-8)
-            export ARCDIR1="$NOSCRUB/archive"
-            export rundir="$RUNDIR/$CDUMP/$CDATE/vrfy/vsdb_exp"
-            export COMROT="$ARCDIR1/dummy"
+        xdate=$(echo $($NDATE -${BACKDATEVSDB} $CDATE) | cut -c1-8)
+        export ARCDIR1="$NOSCRUB/archive"
+        export rundir="$RUNDIR/$CDUMP/$CDATE/vrfy/vsdb_exp"
+        export COMROT="$ARCDIR1/dummy"
 
-            $VSDBSH $xdate $xdate $vlength $cyc $PSLOT $CDATE $CDUMP $gfs_cyc $rain_bucket
+        $VSDBSH $xdate $xdate $vlength $cyc $PSLOT $CDATE $CDUMP $gfs_cyc $rain_bucket
 
-        fi
     fi
 fi
 
 
-###############################################################
-echo
-echo "=============== START TO RUN METPLUS VERIFICATION ==============="
-if [ $CDUMP = "gfs" ]; then
-
-    if [ $VRFY_PCKG2RUN = "METPLUS" -o $VRFY_PCKG2RUN = "BOTH" ]; then
-        if [ $RUN_METPLUS_GRID2GRID_STEP1 = "YES" -o $RUN_METPLUS_GRID2OBS_STEP1 = "YES" -o $RUN_METPLUS_PRECIP_STEP1 = "YES" ]; then
-
-            $VERIF_GLOBALSH 
-
-        fi
-     fi
- fi
-
-
 ###############################################################
 echo
 echo "=============== START TO RUN RADMON DATA EXTRACTION ==============="

diff --git a/parm/config/config.base.emc.dyn b/parm/config/config.base.emc.dyn
@@ -200,7 +200,8 @@ export nst_anl=.true.
 export INCREMENTS_TO_ZERO="'delz_inc','clwmr_inc','icmr_inc'"
 
 # Verification options
-export DO_METP="YES"                  # Run MET+ jobs
+export DO_METP="YES"                  # Run METPLUS jobs - set METPLUS settings in config.metp
+export DO_VSDB="YES"                  # Run VSDB package - set VSDB settings in config.vrfy
 
 # Archiving options
 export HPSSARCH="NO"         # save data to HPSS archive

diff --git a/parm/config/config.vrfy b/parm/config/config.vrfy
@@ -142,9 +142,10 @@ if [ "$VRFYTRAK" = "YES" ]; then
         export FHOUT_CYCLONE=6            
         export FHMAX_CYCLONE=$(( FHMAX_GFS<240 ? FHMAX_GFS : 240 ))
     fi
-    export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
     if [ $machine = "HERA" ]; then
-       export COMINsyn="${COMROOT}/arch/prod/syndat"
+        export COMINsyn="${COMROOT}/arch/prod/syndat"
+    else
+        export COMINsyn=${COMINsyn:-$(compath.py gfs/prod/syndat)}
     fi
 fi