From f0f99171f6285c5585097ece1be39e3e3559860e Mon Sep 17 00:00:00 2001 From: AndrewEichmann-NOAA <58948505+AndrewEichmann-NOAA@users.noreply.github.com> Date: Mon, 10 Feb 2025 13:22:44 -0500 Subject: [PATCH] Remove marineanlvrfy task from global-workflow (#3314) Removes marineanlvrfy from global-workflow, as this capacity has been set up to run off-line as desired. --- .github/CODEOWNERS | 1 - ci/cases/gfsv17/marine3dvar.yaml | 1 - ci/cases/gfsv17/marinehyb.yaml | 1 - jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY | 55 --------------------------- jobs/rocoto/ocnanalvrfy.sh | 19 --------- parm/archive/gdas.yaml.j2 | 3 -- parm/config/gfs/config.base | 1 - parm/config/gfs/config.ocnanalvrfy | 10 ----- parm/config/gfs/yaml/defaults.yaml | 1 - scripts/exglobal_archive_tars.py | 2 +- workflow/applications/gfs_cycled.py | 5 --- workflow/rocoto/gfs_tasks.py | 24 ------------ 12 files changed, 1 insertion(+), 122 deletions(-) delete mode 100755 jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY delete mode 100755 jobs/rocoto/ocnanalvrfy.sh delete mode 100644 parm/config/gfs/config.ocnanalvrfy diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 81e387d361..6a9cf9d47c 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -29,7 +29,6 @@ jobs/JGDAS_ATMOS_VERFRAD @EdwardSafford-NOAA jobs/JGDAS_ENKF_* @RussTreadon-NOAA @CoryMartin-NOAA @CatherineThomas-NOAA jobs/JGDAS_FIT2OBS @jack-woollen jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_ECEN @guillaumevernieres -jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY @guillaumevernieres jobs/JGFS_ATMOS_AWIPS_20KM_1P0DEG @GwenChen-NOAA jobs/JGFS_ATMOS_CYCLONE_GENESIS @JiayiPeng-NOAA jobs/JGFS_ATMOS_CYCLONE_TRACKER @JiayiPeng-NOAA diff --git a/ci/cases/gfsv17/marine3dvar.yaml b/ci/cases/gfsv17/marine3dvar.yaml index abf86f0aa8..17d867d5d0 100644 --- a/ci/cases/gfsv17/marine3dvar.yaml +++ b/ci/cases/gfsv17/marine3dvar.yaml @@ -12,7 +12,6 @@ base: DO_FIT2OBS: "YES" DO_VERFOZN: "YES" DO_VERFRAD: "YES" - DO_VRFY_OCEANDA: "NO" FHMAX_GFS: 240 ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }} DO_TEST_MODE: "YES" diff --git a/ci/cases/gfsv17/marinehyb.yaml b/ci/cases/gfsv17/marinehyb.yaml index ed62e607a8..061c4cd34b 100644 --- a/ci/cases/gfsv17/marinehyb.yaml +++ b/ci/cases/gfsv17/marinehyb.yaml @@ -12,7 +12,6 @@ base: DO_FIT2OBS: "YES" DO_VERFOZN: "YES" DO_VERFRAD: "YES" - DO_VRFY_OCEANDA: "NO" FHMAX_GFS: 240 ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }} diff --git a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY b/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY deleted file mode 100755 index 31df1e45c7..0000000000 --- a/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash -source "${HOMEgfs}/ush/preamble.sh" -source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlinit" -c "base ocnanal marineanlinit" - - -############################################## -# Set variables used in the script -############################################## -export GDUMP=${GDUMP:-"gdas"} -# Ignore possible spelling error (nothing is misspelled) -# shellcheck disable=SC2153 -GDATE=$(date --utc +%Y%m%d%H -d "${PDY} ${cyc} - ${assim_freq} hours") -export gPDY=${GDATE:0:8} -export gcyc=${GDATE:8:2} - -RUN=${GDUMP} YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_OCEAN_ANALYSIS -RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx COM_OCEAN_HISTORY_PREV:COM_OCEAN_HISTORY_TMPL -RUN=${GDUMP} YMD=${gPDY} HH=${gcyc} declare_from_tmpl -rx COM_ICE_HISTORY_PREV:COM_ICE_HISTORY_TMPL -# To allow extraction of statistics from diag files -YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COM_ATMOS_ANALYSIS - - -############################################## -# Begin JOB SPECIFIC work -############################################## - -# Add UFSDA to PYTHONPATH -export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush/:${HOMEgfs}/sorc/gdas.cd/ush/eva:${PYTHONPATH} -export PYTHONPATH=${HOMEgfs}/sorc/gdas.cd/ush/soca:${PYTHONPATH} - -############################################################### -# Run relevant script - -EXSCRIPT=${GDASOCNVRFYPY:-${HOMEgfs}/sorc/gdas.cd/scripts/exgdas_global_marine_analysis_vrfy.py} -${EXSCRIPT} -status=$? -[[ ${status} -ne 0 ]] && exit "${status}" - -############################################## -# End JOB SPECIFIC work -############################################## - -############################################## -# Final processing -############################################## -if [[ -e "${pgmout}" ]] ; then - cat "${pgmout}" -fi - -########################################## -# Do not remove the Temporary working directory (do this in POST) -########################################## -cd "${DATAROOT}" || exit 1 - -exit 0 diff --git a/jobs/rocoto/ocnanalvrfy.sh b/jobs/rocoto/ocnanalvrfy.sh deleted file mode 100755 index d8e9bbb805..0000000000 --- a/jobs/rocoto/ocnanalvrfy.sh +++ /dev/null @@ -1,19 +0,0 @@ -#! /usr/bin/env bash - -export STRICT="NO" -source "${HOMEgfs}/ush/preamble.sh" - -############################################################### -# Source UFSDA workflow modules -. "${HOMEgfs}/ush/load_ufsda_modules.sh" --eva -status=$? -[[ ${status} -ne 0 ]] && exit "${status}" - -export job="ocnanalvrfy" -export jobid="${job}.$$" - -############################################################### -# Execute the JJOB -"${HOMEgfs}/jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY" -status=$? -exit "${status}" diff --git a/parm/archive/gdas.yaml.j2 b/parm/archive/gdas.yaml.j2 index 140631feb5..f3db8b98f1 100644 --- a/parm/archive/gdas.yaml.j2 +++ b/parm/archive/gdas.yaml.j2 @@ -30,9 +30,6 @@ gdas: - "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalecen.log" {% endif %} {% endif %} - {% if DO_VRFY_OCEANDA %} - - "logs/{{ cycle_YMDH }}/{{ RUN }}_ocnanalvrfy.log" - {% endif %} # Analysis GRIB2 (sub-sampled) data - "{{ COMIN_ATMOS_GRIB_0p25 | relpath(ROTDIR) }}/{{ head }}pgrb2.0p25.anl" diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base index e28e7ef226..586029f785 100644 --- a/parm/config/gfs/config.base +++ b/parm/config/gfs/config.base @@ -469,7 +469,6 @@ export DO_CA="YES" # Verification options export DO_METP="@DO_METP@" # Run METPLUS jobs - set METPLUS settings in config.metp export DO_FIT2OBS="YES" # Run fit to observations package -export DO_VRFY_OCEANDA="@DO_VRFY_OCEANDA@" # Run SOCA Ocean and Seaice DA verification tasks #--online archive of netcdf files for fit2obs verification export FHMAX_FITS=132 diff --git a/parm/config/gfs/config.ocnanalvrfy b/parm/config/gfs/config.ocnanalvrfy deleted file mode 100644 index 4eda451853..0000000000 --- a/parm/config/gfs/config.ocnanalvrfy +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -########## config.ocnanalvrfy ########## -# Pre Ocn Analysis specific - -echo "BEGIN: config.ocnanalvrfy" - -# Get task specific resources -. "${EXPDIR}/config.resources" ocnanalvrfy -echo "END: config.ocnanalvrfy" diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml index 55f4b03f50..e0b4b49e33 100644 --- a/parm/config/gfs/yaml/defaults.yaml +++ b/parm/config/gfs/yaml/defaults.yaml @@ -18,7 +18,6 @@ base: FHMAX_GFS: 120 FHMAX_HF_GFS: 0 FCST_BREAKPOINTS: "" - DO_VRFY_OCEANDA: "NO" GSI_SOILANAL: "NO" EUPD_CYC: "gdas" FHMAX_ENKF_GFS: 12 diff --git a/scripts/exglobal_archive_tars.py b/scripts/exglobal_archive_tars.py index dc8b39050c..7d69e04b2c 100755 --- a/scripts/exglobal_archive_tars.py +++ b/scripts/exglobal_archive_tars.py @@ -37,7 +37,7 @@ def main(): 'FHOUT_HF_WAV', 'FHMAX_WAV', 'FHMAX_HF_WAV', 'FHMAX_WAV_GFS', 'restart_interval_gdas', 'restart_interval_gfs', 'DO_ARCHTAR', 'DO_AERO_ANL', 'DO_AERO_FCST', 'DO_CA', 'DOIBP_WAV', 'DO_JEDIOCNVAR', 'DOHYBVAR_OCN', - 'NMEM_ENS', 'DO_JEDIATMVAR', 'DO_VRFY_OCEANDA', 'FHMAX_FITS', 'waveGRD', + 'NMEM_ENS', 'DO_JEDIATMVAR', 'FHMAX_FITS', 'waveGRD', 'IAUFHRS', 'DO_FIT2OBS', 'NET', 'FHOUT_HF_GFS', 'FHMAX_HF_GFS', 'REPLAY_ICS', 'OFFSET_START_HOUR', 'ARCH_EXPDIR', 'EXPDIR', 'ARCH_EXPDIR_FREQ', 'ARCH_HASHES', 'ARCH_DIFFS', 'SDATE', 'EDATE', 'HOMEgfs', 'DO_GEMPAK', 'WAVE_OUT_GRIDS'] diff --git a/workflow/applications/gfs_cycled.py b/workflow/applications/gfs_cycled.py index b348bb4273..5717634175 100644 --- a/workflow/applications/gfs_cycled.py +++ b/workflow/applications/gfs_cycled.py @@ -48,7 +48,6 @@ def _get_run_options(self, conf: Configuration) -> Dict[str, Any]: run_options[run]['do_jediocnvar'] = base.get('DO_JEDIOCNVAR', False) run_options[run]['do_jedisnowda'] = base.get('DO_JEDISNOWDA', False) run_options[run]['do_mergensst'] = base.get('DO_MERGENSST', False) - run_options[run]['do_vrfy_oceanda'] = base.get('DO_VRFY_OCEANDA', False) return run_options @@ -70,8 +69,6 @@ def _get_app_configs(self, run): if options['do_hybvar']: configs += ['marineanlletkf', 'ocnanalecen'] configs += ['marineanlchkpt', 'marineanlfinal'] - if options['do_vrfy_oceanda']: - configs += ['ocnanalvrfy'] if options['do_ocean'] or options['do_ice']: configs += ['oceanice_products'] @@ -186,8 +183,6 @@ def get_task_names(self): if options['do_hybvar']: task_names[run] += ['marineanlletkf', 'ocnanalecen'] task_names[run] += ['marineanlchkpt', 'marineanlfinal'] - if options['do_vrfy_oceanda']: - task_names[run] += ['ocnanalvrfy'] task_names[run] += ['sfcanl', 'analcalc'] diff --git a/workflow/rocoto/gfs_tasks.py b/workflow/rocoto/gfs_tasks.py index 6615706e10..da50f5d93d 100644 --- a/workflow/rocoto/gfs_tasks.py +++ b/workflow/rocoto/gfs_tasks.py @@ -855,30 +855,6 @@ def marineanlfinal(self): return task - def ocnanalvrfy(self): - - deps = [] - dep_dict = {'type': 'task', 'name': f'{self.run}_marineanlfinal'} - deps.append(rocoto.add_dependency(dep_dict)) - dependencies = rocoto.create_dependency(dep_condition='and', dep=deps) - - resources = self.get_resource('ocnanalvrfy') - task_name = f'{self.run}_ocnanalvrfy' - task_dict = {'task_name': task_name, - 'resources': resources, - 'dependency': dependencies, - 'envars': self.envars, - 'cycledef': self.run.replace('enkf', ''), - 'command': f'{self.HOMEgfs}/jobs/rocoto/ocnanalvrfy.sh', - 'job_name': f'{self.pslot}_{task_name}_@H', - 'log': f'{self.rotdir}/logs/@Y@m@d@H/{task_name}.log', - 'maxtries': '&MAXTRIES;' - } - - task = rocoto.create_task(task_dict) - - return task - def fcst(self): fcst_map = {'forecast-only': self._fcst_forecast_only,