From 62d8e99e77ffe44784f4c61c3f2296c6d1a72413 Mon Sep 17 00:00:00 2001 From: Kate Friedman Date: Fri, 17 Nov 2023 20:25:50 -0500 Subject: [PATCH] Retire vrfy job (#2080) Retires the `vrfy` job from the global-workflow system. All associated scripts, configs, and references to the job are removed. Additionally, the switches listed in RTD were updated to reflect new ones added in other PRs for issue #235. Resolves #2069 Refs #235 --- docs/source/configure.rst | 99 ++++++++++++---------- docs/source/jobs.rst | 6 +- env/AWSPW.env | 2 +- env/CONTAINER.env | 2 +- env/HERA.env | 2 +- env/JET.env | 2 +- env/ORION.env | 2 +- env/S4.env | 2 +- env/WCOSS2.env | 2 +- jobs/rocoto/vrfy.sh | 61 ------------- parm/config/gefs/config.base.emc.dyn | 3 +- parm/config/gefs/config.resources | 16 +--- parm/config/gfs/config.base.emc.dyn | 5 +- parm/config/gfs/config.resources | 12 +-- parm/config/gfs/config.vrfy | 27 ------ ush/hpssarch_gen.sh | 2 +- workflow/applications/applications.py | 1 - workflow/applications/gfs_cycled.py | 3 +- workflow/applications/gfs_forecast_only.py | 5 +- workflow/rocoto/gfs_tasks.py | 17 ---- workflow/rocoto/tasks.py | 2 +- 21 files changed, 73 insertions(+), 200 deletions(-) delete mode 100755 jobs/rocoto/vrfy.sh delete mode 100644 parm/config/gfs/config.vrfy diff --git a/docs/source/configure.rst b/docs/source/configure.rst index 6b2d115c15..12c2f75a48 100644 --- a/docs/source/configure.rst +++ b/docs/source/configure.rst @@ -4,47 +4,58 @@ Configure Run The global-workflow configs contain switches that change how the system runs. Many defaults are set initially. Users wishing to run with different settings should adjust their $EXPDIR configs and then rerun the ``setup_xml.py`` script since some configuration settings/switches change the workflow/xml ("Adjusts XML" column value is "YES"). -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| Switch | What | Default | Adjusts XML | More Details | -+================+==============================+===============+=============+===================================================+ -| APP | Model application | ATM | YES | See case block in config.base for options | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DOIAU | Enable 4DIAU for control | YES | NO | Turned off for cold-start first half cycle | -| | with 3 increments | | | | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DOHYBVAR | Run EnKF | YES | YES | Don't recommend turning off | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DONST | Run NSST | YES | NO | If YES, turns on NSST in anal/fcst steps, and | -| | | | | turn off rtgsst | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DO_AWIPS | Run jobs to produce AWIPS | NO | YES | downstream processing, ops only | -| | products | | | | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DO_BUFRSND | Run job to produce BUFR | NO | YES | downstream processing | -| | sounding products | | | | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DO_GEMPAK | Run job to produce GEMPAK | NO | YES | downstream processing, ops only | -| | products | | | | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DO_VRFY | Run vrfy job | NO | YES | Whether to include vrfy job (GSI monitoring, | -| | | | | tracker, VSDB, fit2obs) | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| DO_METP | Run METplus jobs | YES | YES | One cycle spinup | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| EXP_WARM_START | Is experiment starting warm | .false. | NO | Impacts IAU settings for initial cycle. Can also | -| | (.true.) or cold (.false)? | | | be set when running ``setup_expt.py`` script with | -| | | | | the ``--start`` flag (e.g. ``--start warm``) | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| HPSSARCH | Archive to HPPS | NO | Possibly | Whether to save output to tarballs on HPPS | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| LOCALARCH | Archive to a local directory | NO | Possibly | Instead of archiving data to HPSS, archive to a | -| | | | | local directory, specified by ATARDIR. If | -| | | | | LOCALARCH=YES, then HPSSARCH must =NO. Changing | -| | | | | HPSSARCH from YES to NO will adjust the XML. | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| QUILTING | Use I/O quilting | .true. | NO | If .true. choose OUTPUT_GRID as cubed_sphere_grid | -| | | | | in netcdf or gaussian_grid | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ -| WRITE_DOPOST | Run inline post | .true. | NO | If .true. produces master post output in forecast | -| | | | | job | -+----------------+------------------------------+---------------+-------------+---------------------------------------------------+ ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| Switch | What | Default | Adjusts XML | More Details | ++================+==================================+===============+=============+===================================================+ +| APP | Model application | ATM | YES | See case block in config.base for options | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DOIAU | Enable 4DIAU for control | YES | NO | Turned off for cold-start first half cycle | +| | with 3 increments | | | | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DOHYBVAR | Run EnKF | YES | YES | Don't recommend turning off | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DONST | Run NSST | YES | NO | If YES, turns on NSST in anal/fcst steps, and | +| | | | | turn off rtgsst | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_AWIPS | Run jobs to produce AWIPS | NO | YES | downstream processing, ops only | +| | products | | | | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_BUFRSND | Run job to produce BUFR | NO | YES | downstream processing | +| | sounding products | | | | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_GEMPAK | Run job to produce GEMPAK | NO | YES | downstream processing, ops only | +| | products | | | | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_FIT2OBS | Run FIT2OBS job | YES | YES | Whether to run the FIT2OBS job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_TRACKER | Run tracker job | YES | YES | Whether to run the tracker job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_GENESIS | Run genesis job | YES | YES | Whether to run the genesis job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_GENESIS_FSU | Run FSU genesis job | YES | YES | Whether to run the FSU genesis job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_VERFOZN | Run GSI monitor ozone job | YES | YES | Whether to run the GSI monitor ozone job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_VERFRAD | Run GSI monitor radiance job | YES | YES | Whether to run the GSI monitor radiance job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_VMINMON | Run GSI monitor minimization job | YES | YES | Whether to run the GSI monitor minimization job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| DO_METP | Run METplus jobs | YES | YES | One cycle spinup | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| EXP_WARM_START | Is experiment starting warm | .false. | NO | Impacts IAU settings for initial cycle. Can also | +| | (.true.) or cold (.false)? | | | be set when running ``setup_expt.py`` script with | +| | | | | the ``--start`` flag (e.g. ``--start warm``) | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| HPSSARCH | Archive to HPPS | NO | Possibly | Whether to save output to tarballs on HPPS | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| LOCALARCH | Archive to a local directory | NO | Possibly | Instead of archiving data to HPSS, archive to a | +| | | | | local directory, specified by ATARDIR. If | +| | | | | LOCALARCH=YES, then HPSSARCH must =NO. Changing | +| | | | | HPSSARCH from YES to NO will adjust the XML. | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| QUILTING | Use I/O quilting | .true. | NO | If .true. choose OUTPUT_GRID as cubed_sphere_grid | +| | | | | in netcdf or gaussian_grid | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ +| WRITE_DOPOST | Run inline post | .true. | NO | If .true. produces master post output in forecast | +| | | | | job | ++----------------+----------------------------------+---------------+-------------+---------------------------------------------------+ diff --git a/docs/source/jobs.rst b/docs/source/jobs.rst index 67863bb9a2..0e3700bf20 100644 --- a/docs/source/jobs.rst +++ b/docs/source/jobs.rst @@ -18,10 +18,10 @@ An experimental run is different from operations in the following ways: * Addition steps in experimental mode: - - verification (vrfy) - - archive (arch) + - cleanup (cleanup) + Downstream jobs (e.g. awips, gempak, etc.) are not included in the diagram. Those jobs are not normally run in developmental tests. ============================= @@ -71,8 +71,6 @@ Jobs in the GFS Configuration +-------------------+-----------------------------------------------------------------------------------------------------------------------+ | postN | Runs the post processor. | +-------------------+-----------------------------------------------------------------------------------------------------------------------+ -| vrfy | Runs the verification tasks. | -+-------------------+-----------------------------------------------------------------------------------------------------------------------+ | waveinit | Runs wave initialization step. | +-------------------+-----------------------------------------------------------------------------------------------------------------------+ | waveprep | Runs wave prep step. | diff --git a/env/AWSPW.env b/env/AWSPW.env index 79ad52d460..894cce2343 100755 --- a/env/AWSPW.env +++ b/env/AWSPW.env @@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input argument to set runtime environment variables!" echo "argument can be any one of the following:" echo "atmanlrun atmensanlrun aeroanlrun landanlrun" - echo "anal sfcanl fcst post vrfy metp" + echo "anal sfcanl fcst post metp" echo "eobs eupd ecen efcs epos" echo "postsnd awips gempak" exit 1 diff --git a/env/CONTAINER.env b/env/CONTAINER.env index 1b8dfab6e3..bfeb6dd6da 100755 --- a/env/CONTAINER.env +++ b/env/CONTAINER.env @@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input argument to set runtime environment variables!" echo "argument can be any one of the following:" echo "atmanlrun atmensanlrun aeroanlrun landanl" - echo "anal sfcanl fcst post vrfy metp" + echo "anal sfcanl fcst post metp" echo "eobs eupd ecen efcs epos" echo "postsnd awips gempak" exit 1 diff --git a/env/HERA.env b/env/HERA.env index e8ff6da08a..ddb2ae13ca 100755 --- a/env/HERA.env +++ b/env/HERA.env @@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input argument to set runtime environment variables!" echo "argument can be any one of the following:" echo "atmanlrun atmensanlrun aeroanlrun landanl" - echo "anal sfcanl fcst post vrfy metp" + echo "anal sfcanl fcst post metp" echo "eobs eupd ecen efcs epos" echo "postsnd awips gempak" exit 1 diff --git a/env/JET.env b/env/JET.env index 0c5d7185d1..5f0f95202a 100755 --- a/env/JET.env +++ b/env/JET.env @@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input argument to set runtime environment variables!" echo "argument can be any one of the following:" echo "atmanlrun atmensanlrun aeroanlrun landanl" - echo "anal sfcanl fcst post vrfy metp" + echo "anal sfcanl fcst post metp" echo "eobs eupd ecen efcs epos" echo "postsnd awips gempak" exit 1 diff --git a/env/ORION.env b/env/ORION.env index 66b1bf3509..688b5cb790 100755 --- a/env/ORION.env +++ b/env/ORION.env @@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input argument to set runtime environment variables!" echo "argument can be any one of the following:" echo "atmanlrun atmensanlrun aeroanlrun landanl" - echo "anal sfcanl fcst post vrfy metp" + echo "anal sfcanl fcst post metp" echo "eobs eupd ecen efcs epos" echo "postsnd awips gempak" exit 1 diff --git a/env/S4.env b/env/S4.env index 1c81f72f6e..8f01e61a7e 100755 --- a/env/S4.env +++ b/env/S4.env @@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input argument to set runtime environment variables!" echo "argument can be any one of the following:" echo "atmanlrun atmensanlrun aeroanlrun landanl" - echo "anal sfcanl fcst post vrfy metp" + echo "anal sfcanl fcst post metp" echo "eobs eupd ecen efcs epos" echo "postsnd awips gempak" exit 1 diff --git a/env/WCOSS2.env b/env/WCOSS2.env index ae5ceaa022..9d8f459aa1 100755 --- a/env/WCOSS2.env +++ b/env/WCOSS2.env @@ -5,7 +5,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input argument to set runtime environment variables!" echo "argument can be any one of the following:" echo "atmanlrun atmensanlrun aeroanlrun landanl" - echo "anal sfcanl fcst post vrfy metp" + echo "anal sfcanl fcst post metp" echo "eobs eupd ecen esfc efcs epos" echo "postsnd awips gempak" exit 1 diff --git a/jobs/rocoto/vrfy.sh b/jobs/rocoto/vrfy.sh deleted file mode 100755 index 1c0cf61d3b..0000000000 --- a/jobs/rocoto/vrfy.sh +++ /dev/null @@ -1,61 +0,0 @@ -#! /usr/bin/env bash - -source "${HOMEgfs}/ush/preamble.sh" - -############################################################### -# Source FV3GFS workflow modules -source "${HOMEgfs}/ush/load_fv3gfs_modules.sh" -status=$? -(( status != 0 )) && exit "${status}" - -export job="vrfy" -export jobid="${job}.$$" - -# TODO (#235) - This job is calling multiple j-jobs and doing too much in general -# Also, this forces us to call the config files here instead of the j-job -source "${HOMEgfs}/ush/jjob_header.sh" -e "vrfy" -c "base vrfy" - -############################################################### -export CDUMP="${RUN/enkf}" - -CDATEm1=$(${NDATE} -24 "${PDY}${cyc}") -export CDATEm1 -export PDYm1=${CDATEm1:0:8} - -############################################################### -# TODO: We can likely drop support for these dev-only grib1 precip files -echo -echo "=============== START TO GENERATE QUARTER DEGREE GRIB1 FILES ===============" -if [[ ${MKPGB4PRCP} = "YES" && ${CDUMP} == "gfs" ]]; then - YMD=${PDY} HH=${cyc} generate_com -x COM_ATMOS_MASTER - if [ ! -d ${ARCDIR} ]; then mkdir -p ${ARCDIR} ; fi - nthreads_env=${OMP_NUM_THREADS:-1} # get threads set in env - export OMP_NUM_THREADS=1 - cd "${COM_ATMOS_MASTER}" || exit 9 - fhmax=${vhr_rain:-${FHMAX_GFS}} - for (( fhr=0; fhr <= fhmax; fhr+=6 )); do - fhr2=$(printf %02i "${fhr}") - fhr3=$(printf %03i "${fhr}") - fname=${RUN}.t${cyc}z.sfluxgrbf${fhr3}.grib2 - fileout=${ARCDIR}/pgbq${fhr2}.${RUN}.${PDY}${cyc}.grib2 - ${WGRIB2} "${fname}" -match "(:PRATE:surface:)|(:TMP:2 m above ground:)" -grib "${fileout}" - done - export OMP_NUM_THREADS=${nthreads_env} # revert to threads set in env -fi - - -############################################################### -echo -echo "=============== START TO RUN MOS ===============" -if [[ "${RUNMOS}" == "YES" && "${CDUMP}" == "gfs" ]]; then - ${RUNGFSMOSSH} "${PDY}${cyc}" -fi - - -############################################################### -# Force Exit out cleanly -cd "${DATAROOT}" -if [[ ${KEEPDATA:-"NO"} = "NO" ]] ; then rm -rf "${DATA}" ; fi - - -exit 0 diff --git a/parm/config/gefs/config.base.emc.dyn b/parm/config/gefs/config.base.emc.dyn index b9e640d732..fbe0937dc7 100644 --- a/parm/config/gefs/config.base.emc.dyn +++ b/parm/config/gefs/config.base.emc.dyn @@ -55,12 +55,11 @@ export BASE_GIT="@BASE_GIT@" export DO_BUFRSND="NO" # BUFR sounding products export DO_GEMPAK="NO" # GEMPAK products export DO_AWIPS="NO" # AWIPS products -export DO_VRFY="NO" # VRFY step # NO for retrospective parallel; YES for real-time parallel # arch.sh uses REALTIME for MOS. Need to set REALTIME=YES # if want MOS written to HPSS. Should update arch.sh to -# use RUNMOS flag (currently in config.vrfy) +# use RUNMOS flag export REALTIME="YES" # Experiment mode (cycled or forecast-only) diff --git a/parm/config/gefs/config.resources b/parm/config/gefs/config.resources index 74e9854084..d033ec8d42 100644 --- a/parm/config/gefs/config.resources +++ b/parm/config/gefs/config.resources @@ -9,7 +9,7 @@ if [[ $# -ne 1 ]]; then echo "Must specify an input task argument to set resource variables!" echo "argument can be any one of the following:" echo "stage_ic aerosol_init" - echo "sfcanl analcalc analdiag fcst post vrfy fit2obs metp arch echgres" + echo "sfcanl analcalc analdiag fcst post fit2obs metp arch echgres" echo "ecen esfc efcs epos earc" echo "init_chem mom6ic ocnpost" echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt" @@ -347,20 +347,6 @@ elif [[ ${step} = "post" ]]; then if [[ "${npe_node_post_gfs}" -gt "${npe_node_max}" ]]; then export npe_node_post_gfs=${npe_node_max} ; fi export is_exclusive=True -elif [[ ${step} = "vrfy" ]]; then - - export wtime_vrfy="03:00:00" - export wtime_vrfy_gfs="06:00:00" - export npe_vrfy=3 - export nth_vrfy=1 - export npe_node_vrfy=1 - export npe_vrfy_gfs=1 - export npe_node_vrfy_gfs=1 - if [[ ${machine} == "HERA" ]]; then - export memory_vrfy="16384M" - fi - export is_exclusive=True - elif [[ "${step}" = "fit2obs" ]]; then export wtime_fit2obs="00:20:00" diff --git a/parm/config/gfs/config.base.emc.dyn b/parm/config/gfs/config.base.emc.dyn index adfa0257ab..48a5befc00 100644 --- a/parm/config/gfs/config.base.emc.dyn +++ b/parm/config/gfs/config.base.emc.dyn @@ -56,7 +56,6 @@ export BASE_GIT="@BASE_GIT@" export DO_BUFRSND="NO" # BUFR sounding products export DO_GEMPAK="NO" # GEMPAK products export DO_AWIPS="NO" # AWIPS products -export DO_VRFY="YES" # VRFY step export DO_TRACKER="YES" # Hurricane track verification export DO_GENESIS="YES" # Cyclone genesis verification export DO_GENESIS_FSU="NO" # Cyclone genesis verification (FSU) @@ -67,7 +66,7 @@ export DO_VMINMON="YES" # GSI minimization monitoring # NO for retrospective parallel; YES for real-time parallel # arch.sh uses REALTIME for MOS. Need to set REALTIME=YES # if want MOS written to HPSS. Should update arch.sh to -# use RUNMOS flag (currently in config.vrfy) +# use RUNMOS flag export REALTIME="YES" # Experiment mode (cycled or forecast-only) @@ -370,7 +369,7 @@ export INCVARS_EFOLD="5" # Swith to generate netcdf or binary diagnostic files. If not specified, # script default to binary diagnostic files. Set diagnostic file -# variables here since used in both DA and vrfy jobs +# variables here since used in DA job export netcdf_diag=".true." export binary_diag=".false." diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources index 1139fdc9a7..2bd73d0a2f 100644 --- a/parm/config/gfs/config.resources +++ b/parm/config/gfs/config.resources @@ -16,7 +16,7 @@ if [[ $# -ne 1 ]]; then echo "aeroanlinit aeroanlrun aeroanlfinal" echo "anal sfcanl analcalc analdiag fcst post echgres" echo "tracker genesis genesis_fsu" - echo "verfozn verfrad vminmon vrfy fit2obs metp arch cleanup" + echo "verfozn verfrad vminmon fit2obs metp arch cleanup" echo "eobs ediag eomg eupd ecen esfc efcs epos earc" echo "init_chem mom6ic ocnpost" echo "waveinit waveprep wavepostsbs wavepostbndpnt wavepostbndpntbll wavepostpnt" @@ -774,16 +774,6 @@ elif [[ ${step} = "genesis_fsu" ]]; then export npe_node_genesis_fsu=1 export memory_genesis_fsu="4G" -elif [[ ${step} = "vrfy" ]]; then - - export wtime_vrfy="00:10:00" - export wtime_vrfy_gfs="00:10:00" - export npe_vrfy=1 - export nth_vrfy=1 - export npe_node_vrfy=1 - export npe_vrfy_gfs=1 - export npe_node_vrfy_gfs=1 - elif [[ "${step}" = "fit2obs" ]]; then export wtime_fit2obs="00:20:00" diff --git a/parm/config/gfs/config.vrfy b/parm/config/gfs/config.vrfy deleted file mode 100644 index 945d0ecfba..0000000000 --- a/parm/config/gfs/config.vrfy +++ /dev/null @@ -1,27 +0,0 @@ -#! /usr/bin/env bash - -########## config.vrfy ########## -# Verification step specific - -echo "BEGIN: config.vrfy" - -# Get task specific resources -. "${EXPDIR}/config.resources" vrfy - -export CDFNL="gdas" # Scores verification against GDAS/GFS analysis -export MKPGB4PRCP="YES" # Make 0.25-deg pgb files in ARCDIR for precip verification -export RUNMOS="NO" # whether to run entire MOS package - -if [[ "${RUNMOS}" == "YES" && "${RUN}" == "gfs" ]]; then - - if [[ "${machine}" = "HERA" ]] ; then - export RUNGFSMOSSH="${HOMEgfs}/scripts/run_gfsmos_master.sh.hera" - else - echo "WARNING: MOS package is not enabled on ${machine}!" - export RUNMOS="NO" - export RUNGFSMOSSH="" - fi -fi - - -echo "END: config.vrfy" diff --git a/ush/hpssarch_gen.sh b/ush/hpssarch_gen.sh index 07f3c0c8bd..0a027c7537 100755 --- a/ush/hpssarch_gen.sh +++ b/ush/hpssarch_gen.sh @@ -361,7 +361,7 @@ if [[ ${type} == "gdas" ]]; then if [[ -s "${COM_ATMOS_ANALYSIS}/${head}radstat" ]]; then echo "${COM_ATMOS_ANALYSIS/${ROTDIR}\//}/${head}radstat" fi - for fstep in prep anal fcst vrfy verfozn verfrad vminmon; do + for fstep in prep anal fcst verfozn verfrad vminmon; do if [[ -s "${ROTDIR}/logs/${PDY}${cyc}/gdas${fstep}.log" ]]; then echo "./logs/${PDY}${cyc}/gdas${fstep}.log" fi diff --git a/workflow/applications/applications.py b/workflow/applications/applications.py index e517783291..620a79cf48 100644 --- a/workflow/applications/applications.py +++ b/workflow/applications/applications.py @@ -55,7 +55,6 @@ def __init__(self, conf: Configuration) -> None: self.do_gempak = _base.get('DO_GEMPAK', False) self.do_awips = _base.get('DO_AWIPS', False) self.do_wafs = _base.get('WAFSF', False) - self.do_vrfy = _base.get('DO_VRFY', True) self.do_verfozn = _base.get('DO_VERFOZN', True) self.do_verfrad = _base.get('DO_VERFRAD', True) self.do_vminmon = _base.get('DO_VMINMON', True) diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py index 3dc199c5ec..e3dc651409 100644 --- a/workflow/applications/gfs_cycled.py +++ b/workflow/applications/gfs_cycled.py @@ -47,7 +47,7 @@ def _get_app_configs(self): if self.do_ocean: configs += ['ocnpost'] - configs += ['sfcanl', 'analcalc', 'fcst', 'post', 'vrfy', 'arch', 'cleanup'] + configs += ['sfcanl', 'analcalc', 'fcst', 'post', 'arch', 'cleanup'] if self.do_hybvar: if self.do_jediatmens: @@ -125,7 +125,6 @@ def get_task_names(self): gdas_gfs_common_tasks_after_fcst = ['postanl', 'post'] # if self.do_ocean: # TODO: uncomment when ocnpost is fixed in cycled mode # gdas_gfs_common_tasks_after_fcst += ['ocnpost'] - gdas_gfs_common_tasks_after_fcst += ['vrfy'] gdas_gfs_common_cleanup_tasks = ['arch', 'cleanup'] diff --git a/workflow/applications/gfs_forecast_only.py b/workflow/applications/gfs_forecast_only.py index a130baf6e9..c1141c8eb6 100644 --- a/workflow/applications/gfs_forecast_only.py +++ b/workflow/applications/gfs_forecast_only.py @@ -18,7 +18,7 @@ def _get_app_configs(self): configs = ['stage_ic', 'fcst', 'arch', 'cleanup'] if self.do_atm: - configs += ['post', 'vrfy'] + configs += ['post'] if self.do_aero: configs += ['aerosol_init'] @@ -91,9 +91,6 @@ def get_task_names(self): if self.do_ocean: tasks += ['ocnpost'] - if self.do_atm: - tasks += ['vrfy'] - if self.do_atm and self.do_tracker: tasks += ['tracker'] diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index cde0c96771..e8b5ab4611 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -934,20 +934,6 @@ def genesis_fsu(self): return task - def vrfy(self): - deps = [] - dep_dict = {'type': 'metatask', 'name': f'{self.cdump}post'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep=deps) - - cycledef = 'gdas_half,gdas' if self.cdump in ['gdas'] else self.cdump - - resources = self.get_resource('vrfy') - task = create_wf_task('vrfy', resources, cdump=self.cdump, envar=self.envars, dependency=dependencies, - cycledef=cycledef) - - return task - def fit2obs(self): deps = [] dep_dict = {'type': 'metatask', 'name': f'{self.cdump}post'} @@ -1022,9 +1008,6 @@ def arch(self): if self.cdump in ['gfs'] and self.app_config.do_genesis_fsu: dep_dict = {'type': 'task', 'name': f'{self.cdump}genesis_fsu'} deps.append(rocoto.add_dependency(dep_dict)) - if self.app_config.do_vrfy: - dep_dict = {'type': 'task', 'name': f'{self.cdump}vrfy'} - deps.append(rocoto.add_dependency(dep_dict)) # Post job dependencies dep_dict = {'type': 'metatask', 'name': f'{self.cdump}post'} deps.append(rocoto.add_dependency(dep_dict)) diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py index fd66ee2031..845fd35937 100644 --- a/workflow/rocoto/tasks.py +++ b/workflow/rocoto/tasks.py @@ -20,7 +20,7 @@ class Tasks: 'aeroanlinit', 'aeroanlrun', 'aeroanlfinal', 'preplandobs', 'landanl', 'fcst', 'post', 'ocnpost', - 'verfozn', 'verfrad', 'vminmon', 'vrfy', 'metp', + 'verfozn', 'verfrad', 'vminmon', 'metp', 'tracker', 'genesis', 'genesis_fsu', 'postsnd', 'awips', 'gempak', 'waveawipsbulls', 'waveawipsgridded', 'wavegempak', 'waveinit',