Address reviewer comments with changes

Refs NOAA-EMC#1925
KateFriedman-NOAA · Nov 27, 2023 · b6cd965 · b6cd965
1 parent 2e76dbc
commit b6cd965
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/jobs/JGDAS_ATMOS_VERFOZN b/jobs/JGDAS_ATMOS_VERFOZN
@@ -25,9 +25,9 @@ export USHoznmon=${USHoznmon:-${HOMEoznmon}/ush}
 #############################################
 #  determine PDY and cyc for previous cycle
 #############################################
-pdate=$(${NDATE} -6 ${PDY}${cyc})
-export P_PDY=${pdate:0:8}
-export p_cyc=${pdate:8:2}
+GDATE=$(${NDATE} -"${assim_freq}" "${PDY}${cyc}")
+export gPDY=${GDATE:0:8}
+export gcyc=${GDATE:8:2}
 
 #---------------------------------------------
 # OZN_TANKDIR - WHERE OUTPUT DATA WILL RESIDE

diff --git a/jobs/JGDAS_ATMOS_VERFRAD b/jobs/JGDAS_ATMOS_VERFRAD
@@ -6,10 +6,6 @@
 source "${HOMEgfs}/ush/preamble.sh"
 source "${HOMEgfs}/ush/jjob_header.sh" -e "verfrad" -c "base verfrad"
 
-export RADMON_SUFFIX=${RADMON_SUFFIX:-${RUN}}
-export CYCLE_INTERVAL=${CYCLE_INTERVAL:-6}
-export VERBOSE=${VERBOSE:-YES}
-
 ##############################################
 # Specify Execution Areas
 ##############################################
@@ -33,17 +29,17 @@ parm_file=${parm_file:-${PARMmon}/da_mon.parm}
 #############################################
 #  determine PDY and cyc for previous cycle
 #############################################
-pdate=$(${NDATE} -6 ${PDY}${cyc})
-export P_PDY=${pdate:0:8}
-export p_cyc=${pdate:8:2}
+GDATE=$(${NDATE} -"${assim_freq}" "${PDY}${cyc}")
+export gPDY=${GDATE:0:8}
+export gcyc=${GDATE:8:2}
 
 #############################################
 # COMOUT - WHERE GSI OUTPUT RESIDES
 # TANKverf - WHERE OUTPUT DATA WILL RESIDE
 #############################################
 YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS
 YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_RADMON
-YMD=${P_PDY} HH=${p_cyc} generate_com -rx COM_ATMOS_RADMON_PREV:COM_ATMOS_RADMON_TMPL
+YMD=${gPDY} HH=${gcyc} generate_com -rx COM_ATMOS_RADMON_PREV:COM_ATMOS_RADMON_TMPL
 
 export TANKverf_rad=${TANKverf_rad:-${COM_ATMOS_RADMON}}
 export TANKverf_radM1=${TANKverf_radM1:-${COM_ATMOS_RADMON_PREV}}
@@ -66,6 +62,10 @@ export PDATE=${PDY}${cyc}
 export DO_DIAG_RPT=${DO_DIAG_RPT:-1}
 export DO_DATA_RPT=${DO_DATA_RPT:-1}
 
+export RADMON_SUFFIX=${RADMON_SUFFIX:-${RUN}}
+export CYCLE_INTERVAL=${assim_freq:-6}
+export VERBOSE=${VERBOSE:-YES}
+
 ########################################################
 # Execute the script.
 ${RADMONSH:-${SCRgfs}/exgdas_atmos_verfrad.sh} ${PDY} ${cyc}

diff --git a/jobs/JGLOBAL_ATMOS_VMINMON b/jobs/JGLOBAL_ATMOS_VMINMON
@@ -11,21 +11,21 @@ source "${HOMEgfs}/ush/jjob_header.sh" -e "vminmon" -c "base vminmon"
 ##############################################
 export M_FIX=${M_FIX:-${HOMEgfs}/fix/mon}
 export SCRgfs=${SCRgfs:-${HOMEgfs}/scripts}
-export USHminmon=${USHminmon:-${HOMEgfs}/ush}
+export USHgfs=${USHgfs:-${HOMEgfs}/ush}
 
 #############################################
 # Determine PDY and cyc for previous cycle
 #############################################
-pdate=$(${NDATE} -6 ${PDY}${cyc})
-export P_PDY=${pdate:0:8}
-export p_cyc=${pdate:8:2}
+GDATE=$(${NDATE} -"${assim_freq}" "${PDY}${cyc}")
+export gPDY=${GDATE:0:8}
+export gcyc=${GDATE:8:2}
 
 #############################################
 # TANKverf - WHERE OUTPUT DATA WILL RESIDE
 #############################################
 YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_ANALYSIS
 YMD=${PDY} HH=${cyc} generate_com -rx COM_ATMOS_MINMON
-YMD=${P_PDY} HH=${p_cyc} generate_com -rx COM_ATMOS_MINMON_PREV:COM_ATMOS_MINMON_TMPL
+YMD=${gPDY} HH=${gcyc} generate_com -rx COM_ATMOS_MINMON_PREV:COM_ATMOS_MINMON_TMPL
 
 export M_TANKverf=${M_TANKverf:-${COM_ATMOS_MINMON}}
 export M_TANKverfM1=${M_TANKverfM1:-${COM_ATMOS_MINMON_PREV}}
@@ -37,7 +37,7 @@ if [[ ! -d ${M_TANKverfM1} ]]; then mkdir -p -m 775 ${M_TANKverfM1} ; fi
 # Set necessary environment variables
 ########################################
 export MINMON_SUFFIX=${MINMON_SUFFIX:-${NET}}
-export CYCLE_INTERVAL=6
+export CYCLE_INTERVAL=${assim_freq}
 
 ########################################
 #  Filenames

diff --git a/scripts/exglobal_atmos_vminmon.sh b/scripts/exglobal_atmos_vminmon.sh
@@ -44,15 +44,15 @@ if [[ -s ${gsistat} ]]; then
    #------------------------------------------------------------------
    #   Run the child sccripts.
    #------------------------------------------------------------------
-   ${USHminmon}/minmon_xtrct_costs.pl ${MINMON_SUFFIX} ${PDY} ${cyc} ${gsistat} dummy
+   ${USHgfs}/minmon_xtrct_costs.pl ${MINMON_SUFFIX} ${PDY} ${cyc} ${gsistat} dummy
    rc_costs=$?
    echo "rc_costs = $rc_costs"
 
-   ${USHminmon}/minmon_xtrct_gnorms.pl ${MINMON_SUFFIX} ${PDY} ${cyc} ${gsistat} dummy
+   ${USHgfs}/minmon_xtrct_gnorms.pl ${MINMON_SUFFIX} ${PDY} ${cyc} ${gsistat} dummy
    rc_gnorms=$?
    echo "rc_gnorms = $rc_gnorms"
 
-   ${USHminmon}/minmon_xtrct_reduct.pl ${MINMON_SUFFIX} ${PDY} ${cyc} ${gsistat} dummy
+   ${USHgfs}/minmon_xtrct_reduct.pl ${MINMON_SUFFIX} ${PDY} ${cyc} ${gsistat} dummy
    rc_reduct=$?
    echo "rc_reduct = $rc_reduct"