Update Snow filenames to comply with EE2

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "sorc/ufs_model.fd"]
   path = sorc/ufs_model.fd
   url = https://github.com/ufs-community/ufs-weather-model
+  ignore = dirty
 [submodule "sorc/wxflow"]
   path = sorc/wxflow
   url = https://github.com/NOAA-EMC/wxflow

dev/parm/config/gfs/config.cleanup

@@ -12,7 +12,7 @@ export CLEANUP_COM="YES"   # NO=retain ROTDIR.  YES default in cleanup.sh
 export RMOLDSTD=144
 export RMOLDEND=24
 
-if [[ "${DO_GEMPAK}" == "YES" ]]; then
+if [[ "${DO_GEMPAK}" == "YES" && "${RUN}" == "gfs" ]]; then
     export RMOLDSTD=346
     export RMOLDEND=222
 fi

docs/source/index.rst

@@ -9,7 +9,7 @@ Status
 ======
 
 * State of develop (HEAD) branch: GFSv17+ development
-* State of operations (dev/gfs.v16 branch): GFS v16.3.24 `tag: [gfs.v16.3.24] <https://github.com/NOAA-EMC/global-workflow/releases/tag/gfs.v16.3.24>`_
+* State of operations (dev/gfs.v16 branch): GFS v16.3.28 `tag: [gfs.v16.3.28] <https://github.com/NOAA-EMC/global-workflow/releases/tag/gfs.v16.3.28>`_
 
 =============
 Code managers

jobs/JGLOBAL_ANALYSIS_STATS

@@ -30,7 +30,7 @@ YMD=${PDY} HH=${cyc} declare_from_tmpl -rx COMIN_OBS:COM_OBS_TMPL \
 # Run relevant script
 
 EXSCRIPT=${ANLSTATSPY:-${SCRgfs}/exglobal_analysis_stats.py}
-${EXSCRIPT}
+${EXSCRIPT} && true
 export err=$?
 if [[ ${err} -ne 0 ]]; then
     err_exit

parm/archive/enkf.yaml.j2

@@ -96,10 +96,10 @@ enkf:
         {% endfor %}
 
         {% if DO_JEDISNOWDA %}
-        - "{{ COMIN_SNOW_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}snowstat.tgz"
+        - "{{ COMIN_SNOW_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.ensmean.tar"
             {% for itile in range(1,7) %}
         # Snow analysis is 3dvar
-        - "{{ COMIN_SNOW_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc"
+        - "{{ COMIN_SNOW_ANALYSIS_ENSSTAT | relpath(ROTDIR) }}/{{ cycle_YMD }}.{{ cycle_HH }}0000.snow_increment.sfc_data.tile{{ itile }}.nc"
             {% endfor %}
         {% endif %}
 

parm/archive/gdas.yaml.j2

@@ -103,11 +103,11 @@ gdas:
         # Snow analysis data
             {% if DO_JEDISNOWDA %}
                 {% for itile in range(1,7) %}
-        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc"
+        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ itile }}.nc"
                 {% endfor %}
-        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat.tgz"
+        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.tar"
         - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml"
-        - "{{ COMIN_SNOW_ANLMON | relpath(ROTDIR) }}/{{ head }}snow_iodastat.tgz"
+        - "{{ COMIN_SNOW_ANLMON | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx_stats.tar.gz"
             {% endif %}
 
         # Ozone verification

parm/archive/gfs_arcdir.yaml.j2

@@ -46,8 +46,8 @@
     {% endif %}
 
     {% if DO_JEDISNOWDA == True %}
-        {% do det_anl_files.append([COMIN_SNOW_ANALYSIS ~ "/" ~ head ~ "snowstat.tgz",
-                                    ARCDIR ~ "/snowstat." ~ RUN ~ "." ~ cycle_YMDH ~ ".tgz"]) %}
+        {% do det_anl_files.append([COMIN_SNOW_ANALYSIS ~ "/" ~ head ~ "snow_analysis.ioda_hofx.tar",
+                                    ARCDIR ~ "/snowstat." ~ RUN ~ "." ~ cycle_YMDH ~ ".tar"]) %}
     {% endif %}
 
     {% if DO_AERO_ANL %}

parm/archive/gfsa.yaml.j2

@@ -52,9 +52,9 @@ gfsa:
         # Snow analysis data
         {% if DO_JEDISNOWDA %}
             {% for itile in range(1,7) %}
-        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/snowinc.{{ cycle_YMD }}.{{ cycle_HH }}0000.sfc_data.tile{{ itile }}.nc"
+        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ current_cycle | to_fv3time }}.snow_increment.sfc_data.tile{{ itile }}.nc"
             {% endfor %}
-        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snowstat.tgz"
+        - "{{ COMIN_SNOW_ANALYSIS | relpath(ROTDIR) }}/{{ head }}snow_analysis.ioda_hofx.tar"
         - "{{ COMIN_CONF | relpath(ROTDIR) }}/{{ head }}snowanlvar.yaml"
         {% endif %}
 

scripts/exgdas_enkf_sfc.sh

@@ -186,16 +186,18 @@ if [[ "$DOIAU" == "YES" ]]; then
                 COMIN_SNOW_ANALYSIS_MEM:COM_SNOW_ANALYSIS_TMPL
 
             # determine where the input snow restart files come from
+            snow_prefix=""
             if [[ "${DO_JEDISNOWDA:-}" == "YES" ]]; then
                 sfcdata_dir="${COMIN_SNOW_ANALYSIS_MEM}"
+                snow_prefix="snow_analysis."
             else
                 sfcdata_dir="${COMIN_ATMOS_RESTART_MEM_PREV}"
             fi
 
             if [[ ${TILE_NUM} -eq 1 ]]; then
                 mkdir -p "${COMOUT_ATMOS_RESTART_MEM}"
             fi
-            cpreq "${sfcdata_dir}/${bPDY}.${bcyc}0000.sfc_data.tile${n}.nc" \
+            cpreq "${sfcdata_dir}/${bPDY}.${bcyc}0000.${snow_prefix}sfc_data.tile${n}.nc" \
                 "${DATA}/fnbgsi.${cmem}"
             cpreq "${DATA}/fnbgsi.${cmem}" "${DATA}/fnbgso.${cmem}"
             cpreq "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc"     "${DATA}/fngrid.${cmem}"
@@ -264,13 +266,15 @@ if [[ "${DOSFCANL_ENKF}" == "YES" ]]; then
                 COMIN_ATMOS_ANALYSIS_MEM:COM_ATMOS_ANALYSIS_TMPL
 
             # determine where the input snow restart files come from
+            snow_prefix=""
             if [[ "${DO_JEDISNOWDA:-}" == "YES" ]]; then
                 sfcdata_dir="${COMIN_SNOW_ANALYSIS_MEM}"
+                snow_prefix="snow_analysis."
             else
                 sfcdata_dir="${COMIN_ATMOS_RESTART_MEM_PREV}"
             fi
 
-            cpreq "${sfcdata_dir}/${PDY}.${cyc}0000.sfc_data.tile${n}.nc" \
+            cpreq "${sfcdata_dir}/${PDY}.${cyc}0000.${snow_prefix}sfc_data.tile${n}.nc" \
                 "${DATA}/fnbgsi.${cmem}"
             cpreq "${DATA}/fnbgsi.${cmem}" "${DATA}/fnbgso.${cmem}"
             cpreq "${FIXgfs}/orog/${CASE}/${CASE}_grid.tile${n}.nc"      "${DATA}/fngrid.${cmem}"

scripts/exglobal_atmos_sfcanl.sh

@@ -90,8 +90,10 @@ else
 fi
 
 # determine where the input snow restart files come from
+snow_prefix=""
 if [[ "${DO_JEDISNOWDA:-}" == "YES" ]]; then
     sfcdata_dir="${COMIN_SNOW_ANALYSIS}"
+    snow_prefix="snow_analysis."
 else
     sfcdata_dir="${COMIN_ATMOS_RESTART_PREV}"
 fi
@@ -165,7 +167,7 @@ for hr in "${!gcycle_dates[@]}"; do
 
   # Copy inputs from COMIN to DATA
   for (( nn=1; nn <= ntiles; nn++ )); do
-    cpreq "${sfcdata_dir}/${datestr}.sfc_data.tile${nn}.nc" "${DATA}/fnbgsi.00${nn}"
+    cpreq "${sfcdata_dir}/${datestr}.${snow_prefix}sfc_data.tile${nn}.nc" "${DATA}/fnbgsi.00${nn}"
     cpreq "${DATA}/fnbgsi.00${nn}"                       "${DATA}/fnbgso.00${nn}"
   done
 

ush/python/pygfs/task/analysis_stats.py

@@ -189,7 +189,7 @@ def finalize(self, jedi_dict_key: str) -> None:
         FileHandler({'copy_opt': copy_list}).sync()
 
         # path of output tar statfile
-        iodastatzipfile = os.path.join(outdir, f"{self.task_config.APREFIX}{jedi_dict_key}_iodastat.tgz")
+        iodastatzipfile = os.path.join(outdir, f"{self.task_config.APREFIX}{jedi_dict_key}_analysis.ioda_hofx_stats.tar.gz")
 
         logger.info(f"Compressing ioda-stats generated files to {iodastatzipfile}")
 
@@ -301,7 +301,7 @@ def convert_gsi_diags(self) -> None:
 
         # Tar up the ioda files
         iodastatzipfile = os.path.join(self.task_config.DATA, 'atmos_gsi_ioda',
-                                       f"{self.task_config.APREFIX}atmos_gsi_ioda_diags.tgz")
+                                       f"{self.task_config.APREFIX}atmos_gsi_ioda_diags.tar.gz")
         logger.info(f"Compressing GSI IODA files to {iodastatzipfile}")
         # get list of iodastat files to put in tarball
         iodastatfiles = glob.glob(os.path.join(output_dir_path, '*nc4'))

ush/python/pygfs/task/snow_analysis.py

@@ -148,7 +148,7 @@ def finalize(self) -> None:
 
         # Compress and tar diag files into COM directory
         self.tar_diag_files(self.task_config.COMOUT_SNOW_ANALYSIS,
-                            f"{self.task_config.APREFIX}snowstat.tgz")
+                            f"{self.task_config.APREFIX}snow_analysis.ioda_hofx.tar")
 
         # Save files to COM
         logger.info(f"Saving files to COM")

ush/python/pygfs/task/snowens_analysis.py

@@ -152,7 +152,7 @@ def finalize(self) -> None:
 
         # Compress and tar diag files into COM directory
         self.tar_diag_files(self.task_config.COMOUT_SNOW_ANALYSIS,
-                            f"{self.task_config.APREFIX_ENS}snowstat.tgz")
+                            f"{self.task_config.APREFIX_ENS}snow_analysis.ioda_hofx.ensmean.tar")
 
         # Save files to COM
         logger.info(f"Saving files to COM")