Ref #265

Update dev DE script.
EdwardSafford-NOAA · Dec 20, 2021 · d5b2c30 · d5b2c30
1 parent af4fec9
commit d5b2c30
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 44 deletions.
diff --git a/util/Minimization_Monitor/data_xtrct/ush/MinMon_DE.sh b/util/Minimization_Monitor/data_xtrct/ush/MinMon_DE.sh
@@ -13,7 +13,7 @@ function usage {
   echo "            -r | --run   the gdas|gfs run to be processed"
   echo "              use only if data in TANKdir stores both runs"
   echo "            -c | --comin the base directory to the gsistat files"
-  edho "              This does not include any date-derived subdirectories."
+  echo "              This does not include any date-derived subdirectories."
   echo " "
 }
 
@@ -108,18 +108,11 @@ if [[ ${RUN} = "gdas" ]]; then
    export HOMEgfs=${HOMEgdas}
 fi
 
-#-------------------------------------------
-#  expand M_TANKverf for this MINMON_SUFFIX
-#
 NEWtank=${M_TANKverf}/stats/${MINMON_SUFFIX}
 if [[ $GLB_AREA -eq 0 ]]; then
    NEWtank=${M_TANKverf}/stats/regional/${MINMON_SUFFIX}
 fi
 
-export M_TANKverf=$NEWtank
-echo "M_TANKverf = $M_TANKverf"
-echo "NDATE      = $NDATE"
-
 #---------------------------------------------------------
 #  Determine next cycle
 #    If PDATE wasn't supplied as an argument then call 
@@ -128,15 +121,25 @@ echo "NDATE      = $NDATE"
 #
 if [[ ${#PDATE} -le 0 ]]; then  
    echo "PDATE not specified:  setting PDATE using last cycle"
-   date=`${M_DE_SCRIPTS}/find_cycle.pl --run $RUN --cyc 1 --dir ${M_TANKverf}`
+   date=`${M_DE_SCRIPTS}/find_cycle.pl --run $RUN --cyc 1 --dir ${NEWtank}`
    export PDATE=`$NDATE +6 $date`
 else
    echo "PDATE was specified:  $PDATE"
 fi
 
 export PDY=`echo $PDATE|cut -c1-8`
 export cyc=`echo $PDATE|cut -c9-10`
-echo "PDY, cyc = $PDY, $cyc "
+
+prev_cycle=`$NDATE -6 $PDATE`
+p_pdy=`echo $prev_cycle|cut -c1-8`
+p_cyc=`echo $prev_cycle|cut -c9-10`
+
+#--------------------------------
+#  expand M_TANKverf and define
+#  M_TANKverfM1 (previous cycle)
+#
+export M_TANKverf=${NEWtank}/${RUN}.${PDY}/${cyc}/minmon
+export M_TANKverfM1=${NEWtank}/${RUN}.${p_pdy}/${p_cyc}/minmon
 
 #-----------------------------------------
 # Expand COMIN with date specific subdirs

diff --git a/util/Minimization_Monitor/nwprod/gdas/jobs/JGDAS_ATMOS_VMINMON b/util/Minimization_Monitor/nwprod/gdas/jobs/JGDAS_ATMOS_VMINMON
@@ -44,15 +44,6 @@ export EXECminmon=${EXECminmon:-$HOMEminmon/exec}
 export USHminmon=${USHminmon:-$HOMEminmon/ush}
 
 
-#############################################
-# Run setpdy and initialize PDY variables
-#############################################
-if [[ $MY_MACHINE != "hera" ]]; then
-   export cycle=t${cyc}z
-   setpdy.sh
-   . ./PDY
-fi
-
 #############################################
 #  determine PDY and cyc for previous cycle
 #############################################
@@ -69,10 +60,8 @@ export p_cyc=`echo ${cdate} | cut -c9-10`
 #############################################
 export COM_IN=${COM_IN:-${COMROOT}/${NET}/${envir}}
 
-M_TANKverf=${M_TANKverf:-${COM_IN}}
-M_TANKverfM0=${M_TANKverfM0:-${M_TANKverf}/${RUN}.${PDY}/${cyc}/$COMPONENT/minmon}
-export M_TANKverfM1=${M_TANKverfM1:-${M_TANKverf}/${RUN}.${P_PDY}/${p_cyc}/$COMPONENT/minmon}
-export M_TANKverf=$M_TANKverfM0
+M_TANKverf=${M_TANKverf:-${COM_IN}/${RUN}.${PDY}/${cyc}/${COMPONENT}/minmon}
+export M_TANKverfM1=${M_TANKverfM1:-${M_TANKverf}/${RUN}.${P_PDY}/${p_cyc}/${COMPONENT}/minmon}
 
 export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}/$COMPONENT}
 

diff --git a/util/Minimization_Monitor/nwprod/gfs/jobs/JGFS_ATMOS_VMINMON b/util/Minimization_Monitor/nwprod/gfs/jobs/JGFS_ATMOS_VMINMON
@@ -35,28 +35,13 @@ export m_job=${m_job:-${MINMON_SUFFIX}_mmDE}
 # Specify Package Areas
 ##############################################
 export HOMEgfs=${HOMEgfs:-${NWROOT}/gfs.${gfs_ver}}
-#export PARMmon=${PARMmon:-$HOMEgfs/parm/mon}
 export SCRgfs=${SCRgfs:-$HOMEgfs/scripts}
 export M_FIXgfs=${M_FIXgfs:-$HOMEgfs/fix/product}
 
 export HOMEminmon=${HOMEminmon:-${HOMEgfs}}
 export EXECminmon=${EXECminmon:-$HOMEminmon/exec}
 export USHminmon=${USHminmon:-$HOMEminmon/ush}
 
-###################################
-# source the parm file
-###################################
-#.  ${PARMmon}/da_mon.parm
-
-
-#############################################
-# Run setpdy and initialize PDY variables
-#############################################
-if [[ $MY_MACHINE != "hera" ]]; then
-   export cycle=t${cyc}z
-   setpdy.sh
-   . ./PDY
-fi
 
 #############################################
 #  determine PDY and cyc for previous cycle
@@ -72,14 +57,10 @@ export p_cyc=`echo ${cdate} | cut -c9-10`
 #############################################
 # TANKverf - WHERE OUTPUT DATA WILL RESIDE
 #############################################
-TANK_USE_RUN=${TANK_USE_RUN:-1}
-
 export COM_IN=${COM_IN:-${COMROOT}/${NET}/${envir}}
 
-M_TANKverf=${M_TANKverf:-${COM_IN}}
-M_TANKverfM0=${M_TANKverfM0:-${M_TANKverf}/${RUN}.${PDY}/${cyc}/$COMPONENT/minmon}
-export M_TANKverfM1=${M_TANKverfM1:-${M_TANKverf}/${RUN}.${P_PDY}/${p_cyc}/$COMPONENT/minmon}
-export M_TANKverf=$M_TANKverfM0
+M_TANKverf=${M_TANKverf:-${COM_IN}/${RUN}.${PDY}/${cyc}/${COMPONENT}/minmon}
+export M_TANKverfM1=${M_TANKverfM1:-${COM_IN}/${RUN}.${P_PDY}/${p_cyc}/${COMPONENT}/minmon}
 
 export COMIN=${COMIN:-$COM_IN/${RUN}.${PDY}/${cyc}/$COMPONENT}