Rename dtfanl to dtfinc

dev/jobs/JGLOBAL_ENKF_SELECT_OBS

@@ -67,7 +67,7 @@ export PREPQCPF="${COMIN_OBS}/${OPREFIX}prepbufr.acft_profiles"
 
 # Deterministic analysis and increment files
 export SFCANL="${COMOUT_ATMOS_ANALYSIS_DET}/${APREFIX_DET}analysis.sfc.a006.nc"
-export DTFANL="${COMOUT_ATMOS_ANALYSIS_DET}/${APREFIX_DET}increment.dtf.i006.nc"
+export DTFINC="${COMOUT_ATMOS_ANALYSIS_DET}/${APREFIX_DET}increment.dtf.i006.nc"
 export ATMANL="${COMOUT_ATMOS_ANALYSIS_DET}/${APREFIX_DET}analysis.atm.a006.nc"
 export ATMINC="${COMOUT_ATMOS_ANALYSIS_DET}/${APREFIX_DET}increment.atm.i006.nc"
 

dev/scripts/exglobal_atmos_analysis.sh

@@ -191,7 +191,7 @@ GSISTAT=${GSISTAT:-${COMOUT_ATMOS_ANALYSIS}/${APREFIX}gsistat.txt}
 
 # Increment files
 ATMINC=${ATMINC:-${COMOUT_ATMOS_ANALYSIS}/${APREFIX}increment.atm.i006.nc}
-DTFANL=${DTFANL:-${COMOUT_ATMOS_ANALYSIS}/${APREFIX}increment.dtf.i006.nc}
+DTFINC=${DTFINC:-${COMOUT_ATMOS_ANALYSIS}/${APREFIX}increment.dtf.i006.nc}
 
 # Obs diag
 RUN_SELECT=${RUN_SELECT:-"NO"}
@@ -640,7 +640,7 @@ ${NLN} "${ABIASPC}" satbias_pc.out
 ${NLN} "${ABIASAIR}" aircftbias_out
 
 if [[ "${DONST}" == "YES" ]]; then
-    ${NLN} "${DTFANL}" dtfanl
+    ${NLN} "${DTFINC}" dtfanl
 fi
 
 # If requested, link (and if tarred, de-tar obsinput.tar) into obs_input.* files

dev/scripts/exglobal_atmos_analysis_calc.sh

@@ -80,7 +80,7 @@ ATMANL=${ATMANL:-"${COMOUT_ATMOS_ANALYSIS}/${APREFIX}analysis.atm.a006.nc"}
 
 # Increment files
 ATMINC=${ATMINC:-"${COMOUT_ATMOS_ANALYSIS}/${APREFIX}increment.atm.i006.nc"}
-DTFANL=${DTFANL:-"${COMOUT_ATMOS_ANALYSIS}/${APREFIX}increment.dtf.i006.nc"}
+DTFINC=${DTFINC:-"${COMOUT_ATMOS_ANALYSIS}/${APREFIX}increment.dtf.i006.nc"}
 if [[ "${RUN}" == "gcdas" ]]; then
     AEROINC=${AEROINC:-"${COMIN_CHEM_ANALYSIS}/${APREFIX}aeroinc.nc"}
 fi

dev/scripts/exglobal_atmos_products.sh

@@ -40,6 +40,9 @@ IFS=':' read -ra grids <<< "${grid_string}"
 # Files needed by ${USHgfs}/interp_atmos_master.sh
 MASTER_FILE="${COMIN_ATMOS_MASTER}/${PREFIX}master.${fhr3}.grib2"
 
+# Create an index file for the master
+${WGRIB2} -s "${MASTER_FILE}" > "${MASTER_FILE}.idx"
+
 for ((nset = 1; nset <= downset; nset++)); do
 
     echo "INFO: Begin processing nset = ${nset}"

dev/scripts/exglobal_atmos_sfcanl.sh

@@ -113,8 +113,8 @@ done
 if [[ "${DONST}" == "YES" ]]; then
     export NST_FILE=${NST_FILE:-${COMIN_ATMOS_ANALYSIS}/${APREFIX}increment.dtf.i006.nc}
     if [[ -s "${NST_FILE}" ]]; then
-        cpreq "${NST_FILE}" "${DATA}/dtfanl"
-        export NST_FILE="dtfanl"
+        cpreq "${NST_FILE}" "${DATA}/dtfinc"
+        export NST_FILE="dtfinc"
     else
         export NST_FILE="NULL"
     fi

dev/ush/make_ee2_links.sh

@@ -111,8 +111,8 @@ for dir in "${gdas_list[@]}" "${gfs_list[@]}" "${gcdas_list[@]}" "${gcafs_list[@
             if [[ -f "${system_prefix}.t${cyc}z.cnvstat" ]]; then
                 link_file "${system_prefix}.t${cyc}z.cnvstat" "${system_prefix}.t${cyc}z.cnvstat.tar"
             fi
-            if [[ -f "${system_prefix}.t${cyc}z.dtfanl.nc" ]]; then
-                link_file "${system_prefix}.t${cyc}z.dtfanl.nc" "${system_prefix}.t${cyc}z.increment.dtf.i006.nc"
+            if [[ -f "${system_prefix}.t${cyc}z.dtfinc.nc" ]]; then
+                link_file "${system_prefix}.t${cyc}z.dtfinc.nc" "${system_prefix}.t${cyc}z.increment.dtf.i006.nc"
             fi
             if [[ -f "${system_prefix}.t${cyc}z.gsistat" ]]; then
                 link_file "${system_prefix}.t${cyc}z.gsistat" "${system_prefix}.t${cyc}z.gsistat.txt"

parm/archive/gfs_arcdir.yaml.j2

@@ -109,5 +109,5 @@ copy_opt:
     - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ head }}abias_int.txt",
        "{{ ARCDIR }}/abias_int.{{ RUN }}.{{ cycle_YMDH }}"]
     - ["{{ COMIN_ATMOS_ANALYSIS }}/{{ head }}increment.dtf.i006.nc",
-       "{{ ARCDIR }}/dtfanl.{{ RUN }}.{{ cycle_YMDH }}.nc"]
+       "{{ ARCDIR }}/dtfinc.{{ RUN }}.{{ cycle_YMDH }}.nc"]
 {% endif %}

ush/python/pygfs/task/offline_analysis.py

@@ -140,7 +140,7 @@ def initialize(self) -> None:
                 "j_output": self.task_config.nlat_interp,
                 "sfcanl_file": "sfcanl.input.nc",
                 "sfcf006_file": "sfcges_mem001",
-                "output_file": "dtfanl.nc",
+                "output_file": "dtfinc.nc",
             }
         }
 
@@ -260,7 +260,7 @@ def finalize(self) -> None:
                                os.path.join(self.task_config.COMOUT_OBS, f"{self.task_config.APREFIX}snogrb_t1534.3072.1536")])
         # TODO: Re-stage the inputs for the GCDAS offline analysis on HPSS following EE2-compliant filenames, then update this line
         transfer_files.append([
-            os.path.join(self.task_config.DATA, "dtfanl.nc"),
+            os.path.join(self.task_config.DATA, "dtfinc.nc"),
             os.path.join(self.task_config.COMOUT_ATMOS_ANALYSIS,
                          f"{self.task_config.APREFIX}increment.dtf.i006.nc")
         ])