From b7af315bb9dea77b37c6d030b71060b87bedf33e Mon Sep 17 00:00:00 2001 From: Walter Kolczynski - NOAA Date: Wed, 28 Feb 2024 22:20:58 +0000 Subject: [PATCH] Fix rocoto forecast hour determination for GEFS (#2351) The function that generates the list of forecast hours for rocoto was trying to use variables that are not defined for GEFS, causing workflow generation to fail. The function is updated to not try to load these variables before loading the ones actually used for GFS/ GEFS. Also turns GEFS CI test back on and adds an entry to stage C192 ICs (note: these have not been placed in the centralized location.) --- ci/cases/pr/C48_S2SWA_gefs.yaml | 5 ----- parm/config/gfs/config.stage_ic | 2 +- workflow/rocoto/tasks.py | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/ci/cases/pr/C48_S2SWA_gefs.yaml b/ci/cases/pr/C48_S2SWA_gefs.yaml index de677a70b6..d42f4cd15b 100644 --- a/ci/cases/pr/C48_S2SWA_gefs.yaml +++ b/ci/cases/pr/C48_S2SWA_gefs.yaml @@ -16,8 +16,3 @@ arguments: idate: 2021032312 edate: 2021032312 yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_ci_defaults.yaml - -skip_ci_on_hosts: - - hera - - orion - - hercules diff --git a/parm/config/gfs/config.stage_ic b/parm/config/gfs/config.stage_ic index dc224b72db..63d0e4a5cf 100644 --- a/parm/config/gfs/config.stage_ic +++ b/parm/config/gfs/config.stage_ic @@ -8,7 +8,7 @@ echo "BEGIN: config.stage_ic" source "${EXPDIR}/config.resources" stage_ic case "${CASE}" in - "C48" | "C96") + "C48" | "C96" | "C192") export CPL_ATMIC="workflow_${CASE}_refactored" export CPL_ICEIC="workflow_${CASE}_refactored" export CPL_OCNIC="workflow_${CASE}_refactored" diff --git a/workflow/rocoto/tasks.py b/workflow/rocoto/tasks.py index 5e66e37fdc..ac70c6e4fc 100644 --- a/workflow/rocoto/tasks.py +++ b/workflow/rocoto/tasks.py @@ -132,12 +132,12 @@ def _get_forecast_hours(cdump, config, component='atmos') -> List[str]: local_config['FHOUT'] = config['FHOUT_OCNICE'] fhmin = local_config['FHMIN'] - fhmax = local_config['FHMAX'] - fhout = local_config['FHOUT'] # Get a list of all forecast hours fhrs = [] if cdump in ['gdas']: + fhmax = local_config['FHMAX'] + fhout = local_config['FHOUT'] fhrs = list(range(fhmin, fhmax + fhout, fhout)) elif cdump in ['gfs', 'gefs']: fhmax = local_config['FHMAX_GFS']