Additional fixes for downstream jobs

ci/cases/yamls/gfs_extended_ci.yaml

@@ -6,7 +6,7 @@ base:
   DO_GOES: "YES"
   DO_BUFRSND: "YES"
   DO_GEMPAK: "YES"
-  DO_AWIPS: "NO"
+  DO_AWIPS: "YES"
   DO_NPOESS: "YES"
   DO_GENESIS_FSU: "NO"
   FCST_BREAKPOINTS: 192

env/HERA.env

@@ -133,11 +133,6 @@ elif [[ "${step}" = "marinebmat" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
     export APRUN_MARINEBMAT="${APRUN_default}"
 
-elif [[ "${step}" = "marinebmat" ]]; then
-
-    export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-    export APRUN_MARINEBMAT="${APRUN_default}"
-
 elif [[ "${step}" = "marineanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"

parm/archive/gfs_downstream.yaml.j2

@@ -3,8 +3,10 @@ gfs_downstream:
     name: "GFS_DOWNSTREAM"
     target: "{{ ATARDIR }}/{{ cycle_YMDH }}/gfs_downstream.tar"
     required:
+        {% if DO_GEMPAK %}
         - "{{ COMIN_ATMOS_GEMPAK | relpath(ROTDIR) }}/gfs_{{ cycle_YMDH }}.sfc"
         - "{{ COMIN_ATMOS_GEMPAK | relpath(ROTDIR) }}/gfs_{{ cycle_YMDH }}.snd"
+        {% endif %}
         {% for i in range(1, NUM_SND_COLLECTIVES) %}
         - "{{ COMIN_ATMOS_BUFR | relpath(ROTDIR) }}/gfs_collective{{ i }}.fil"
         {% endfor %}

parm/config/gfs/config.resources

@@ -1288,6 +1288,7 @@ case ${step} in
     ntasks=1
     threads_per_task=1
     memory="4GB"
+    tasks_per_node=1
     ;;
 
   "mos_stn_prep")

scripts/exgfs_atmos_postsnd.sh

@@ -117,7 +117,7 @@ for fhr in "${hour_list[@]}"; do
     echo "File ${filename} is required but not found."
     err_exit "FATAL ERROR: logf${fhr} not found."
   else
-    echo "${runscript} \"${fhr}\" \"${fhr_p}\" \"${FINT}\" \"${F00FLAG}\" \"${DATA}/${fhr}\"" >> "${DATA}/poescript_bufr"
+    echo "${runscript} ${fhr} ${fhr_p} ${FINT} ${F00FLAG} ${DATA}/${fhr}" >> "${DATA}/poescript_bufr"
   fi
 done
 

scripts/exglobal_archive.py

@@ -40,7 +40,7 @@ def main():
             'NMEM_ENS', 'DO_JEDIATMVAR', 'DO_VRFY_OCEANDA', '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']
+            'ARCH_DIFFS', 'SDATE', 'EDATE', 'HOMEgfs', 'DO_GEMPAK']
 
     archive_dict = AttrDict()
     for key in keys:

ush/gfs_bufr.sh

@@ -21,16 +21,17 @@
 # 2024-08-08 Bo Cui: Update to handle one forecast at a time
 # echo "History: February 2003 - First implementation of this utility script"
 #
-fhr="$1"
-fhr_p="$2"
-FINT="$3"
-F00FLAG="$4"
-workdir="$5"
-
-cd "${workdir}" || exit 2
 
 source "${USHgfs}/preamble.sh"
 
+fhr="${1}"
+fhr_p="${2}"
+FINT="${3}"
+F00FLAG="${4}"
+workdir="${5}"
+
+cd "${workdir}" || exit 2
+
 if [[ "${F00FLAG}" == "YES" ]]; then
    f00flag=".true."
 else

workflow/applications/gfs_cycled.py

@@ -119,7 +119,7 @@ def _get_app_configs(self, run):
             configs += ['postsnd']
 
         if options['do_awips']:
-            configs += ['awips']
+            configs += ['awips', 'fbwind']
 
         if options['do_wave']:
             configs += ['waveinit', 'waveprep', 'wavepostsbs', 'wavepostpnt']

workflow/applications/gfs_forecast_only.py

@@ -61,7 +61,7 @@ def _get_app_configs(self, run):
                 configs += ['gempak']
 
             if options['do_awips']:
-                configs += ['awips']
+                configs += ['awips', 'fbwind']
 
         if options['do_ocean'] or options['do_ice']:
             configs += ['oceanice_products']

workflow/hosts/hera.yaml

@@ -24,6 +24,7 @@ LOCALARCH: 'NO'
 ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}'
 MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
+DO_AWIPS: 'NO'
 SUPPORTED_RESOLUTIONS: ['C1152', 'C768', 'C384', 'C192', 'C96', 'C48']
 COMINecmwf: /scratch1/NCEPDEV/global/glopara/data/external_gempak/ecmwf
 COMINnam: /scratch1/NCEPDEV/global/glopara/data/external_gempak/nam

workflow/hosts/hercules.yaml

@@ -26,6 +26,7 @@ MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
 DO_TRACKER: 'NO'
 DO_GENESIS: 'NO'
+DO_AWIPS: 'NO'
 SUPPORTED_RESOLUTIONS: ['C1152', 'C768', 'C384', 'C192', 'C96', 'C48']
 COMINecmwf: /work/noaa/global/glopara/data/external_gempak/ecmwf
 COMINnam: /work/noaa/global/glopara/data/external_gempak/nam

workflow/hosts/orion.yaml

@@ -26,6 +26,7 @@ MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
 DO_TRACKER: 'NO'
 DO_GENESIS: 'NO'
+DO_AWIPS: 'NO'
 SUPPORTED_RESOLUTIONS: ['C1152', 'C768', 'C384', 'C192', 'C96', 'C48']
 COMINecmwf: /work/noaa/global/glopara/data/external_gempak/ecmwf
 COMINnam: /work/noaa/global/glopara/data/external_gempak/nam

workflow/rocoto/gfs_tasks.py

@@ -1410,7 +1410,7 @@ def fbwind(self):
         deps.append(rocoto.add_dependency(dep_dict))
         dependencies = rocoto.create_dependency(dep=deps, dep_condition='and')
 
-        resources = self.get_resource('awips')
+        resources = self.get_resource('fbwind')
         # TODO: It would be better to use task dependencies on the
         # individual post jobs rather than data dependencies to avoid
         # prematurely starting with partial files. Unfortunately, the